This commit was manufactured by cvs2svn to create tagfix_bug132_fin

'fix_bug132_fin'.

1461 files changed, 120968 insertions, 142734 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 954c0792ed6..a24c56267a5 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -64,7 +64,8 @@ an enhancement, then use our
   </tr>
   <tr valign=top bgcolor="#AFAFAF">
    <td><b>Nearly fully supported, i.e., periodically tested</b></td>
-   <td>Windows 95, MVS, Chorus, PharLap TNT Embedded ToolSuite 9.1
+   <td>Windows 95, MVS, DEC Alpha Windows NT (MSVC++ 5.0, 6.0), Chorus,
+     PharLap TNT Embedded ToolSuite 9.1
    </td>
   </tr>
   <tr valign=top>
@@ -93,7 +94,7 @@ try to help you fix the problems.
 <H3><A NAME="installnotes">Installation Notes for Supported Platforms</A></H3>
 
 <UL>
-  <LI><B>Win32 (Windows NT/i386 and Windows '95) </B><P>
+  <LI><B>Win32 (Windows NT/i386, NT/Alpha and Windows '95) </B><P>
 
       All of ACE has been ported to the Win32 API (which includes
       Windows NT, Windows 2000, and Windows '95/98).  The entire
@@ -1172,7 +1173,7 @@ these compilers but probably not without a bit of effort. <P>
       <BR>
   <LI>Each project will contain several different configurations.  These
       are a mixture of Debug/Release, MFC/Non-MFC, and Static/Dynamic 
-      library versions.
+      library versions for both i386 and sometimes Alpha machines.
       Make sure you are building the one you'll use (for example, the 
       debug tests need the debug version of ACE, and so on).  All these
       different configurations are provided for your convenience.  You
@@ -1298,15 +1299,18 @@ card.  This is one method:<P>
       MS Loopback Adapter<P>
 </OL>
 
-<B>WIN32 ALPHA CONFIGURATIONS</B>
+<B>NT ALPHA CONFIGURATIONS</B>
 
-<P>The project files for Visual C++ no longer contain any configurations 
-targetted to Windows NT on the DEC Alpha.  Below are the steps needed to
-recreate the Alpha configurations:</P>
+<P>CUrrently some of the project files in ACE support Alpha configurations, 
+but they are somewhat out of date.  Since the file list is global between i386
+and Alpha, they have a good chance of working.  If not, they might need to
+be created as below.</P>
+
+<P>Here are the steps we use to add an Alpha Configuration.</P>
 
 <OL>
   <LI>Load the project on the Alpha machine.
-  <LI>Go to the Build menu and then select Configurations.
+  <LI>Go to the Build menu and then Configurations.
   <LI>Select the project that you want to convert.
   <LI>Click on Add.
   <LI>Select the x86 configuration to &quot;Copy settings from&quot;
@@ -1317,7 +1321,7 @@ recreate the Alpha configurations:</P>
   <LI>Close the &quot;Configurations&quot; window.
   <LI>Now go to the Project settings.
   <LI>For the General Settings, change the output directories to standard ACE
-      output directories. Intermediate Directories are &quot;Debug&quot; and
+      output directores. Intermediate Directories are &quot;Debug&quot; and
           &quot;Release&quot; in most cases.  The Output Directories are blank,
           except for Release versions of executables, in which it is also
           &quot;Release&quot;.
diff --git a/ChangeLog b/ChangeLog
index f94010c6b8e..72551df7ac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1604 +1,57 @@
-Mon Mar  5 11:29:36 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * docs/ACE-categories.html:
-          Fixed links to the doxygen files.
-
-        * ace/Pipe.cpp:
-          Fixed what looks like a typo, we want to *disable* the stream
-          pipes under QNX, not to enable them just on that platform.
-
-Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/RMCast/RMCast_Fragment_Test.cpp:
-        * tests/RMCast/RMCast_Reassembly_Test.cpp:
-          Undo Doug's changes.  They broke the test.
-
-Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/RMCast/RMCast_Fragment_Test.cpp,
-        * tests/RMCast/RMCast_Reassembly_Test.cpp,
-        * tests/Dynamic_Priority_Test.cpp,
-        * tests/Thread_Pool_Test.cpp: Make sure to write into the
-          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
-          <Gonzalo.Diethelm@sonda.com> for reporting this.
-
-Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/nightlybuilds/builds.lst:
-
-          Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
-
-Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Updated to detect missing ACE_TRY_ENV parameters in
-          ORB::resolve_initial_references() calls when emulated exceptions
-          are used.  Thanks to Darrell for providing this update.
-
-Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * tests/Makefile.bor:
-
-          Added missing Refcounted_Auto_Ptr_Test to the build
-
-Sun Mar  4 19:31:16 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Added the run_test_mt.pl for Leader_Follers.
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          Added a destructor to detect if a process wasn't explicitly
-          killed before the object went out of scope. Will print out
-          an error and kill it.
-
-        * bin/PerlACE/Run_Test.pm:
-
-          Turned on autoflush for all scripts.
-
-        * docs/run_test.txt:
-
-          Updated run_test.pl instructions to fit all the changes I
-          just made.
-
-        * examples/Export/run_test.pl:
-        * performance-tests/RPC/run_test.pl:
-        * performance-tests/TCP/run_test.pl:
-        * performance-tests/UDP/run_test.pl:
-
-          Updated to use PerlACE::Run_Test;
-
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Auto_IncDec_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Array_Test.dsp:
-        * tests/CDR_File_Test.dsp:
-        * tests/CDR_Test.dsp:
-        * tests/Cache_Map_Manager_Test.dsp:
-        * tests/Cached_Accept_Conn_Test.dsp:
-        * tests/Cached_Conn_Test.dsp:
-        * tests/Capabilities_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Config_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLL_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dirent_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Set_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Lazy_Map_Manager_Test.dsp:
-        * tests/Log_Msg_Test.dsp:
-        * tests/MEM_Stream_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Malloc_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/Message_Queue_Test_Ex.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OS_Test.dsp:
-        * tests/Object_Manager_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Manager_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Refcounted_Auto_Ptr_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-        * tests/Upgradable_RW_Test.dsp:
-        * tests/version_tests/Atomic_Op_Test.dsp: (removed)
-        * tests/version_tests/Auto_IncDec_Test.dsp: (removed)
-        * tests/version_tests/Barrier_Test.dsp: (removed)
-        * tests/version_tests/Basic_Types_Test.dsp: (removed)
-        * tests/version_tests/Buffer_Stream_Test.dsp: (removed)
-        * tests/version_tests/CDR_Array_Test.dsp: (removed)
-        * tests/version_tests/CDR_File_Test.dsp: (removed)
-        * tests/version_tests/CDR_Test.dsp: (removed)
-        * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed)
-        * tests/version_tests/Cached_Conn_Test.dsp: (removed)
-        * tests/version_tests/Capabilities_Test.dsp: (removed)
-        * tests/version_tests/Collection_Test.dsp: (removed)
-        * tests/version_tests/Config_Test.dsp: (removed)
-        * tests/version_tests/Conn_Test.dsp: (removed)
-        * tests/version_tests/DLL_Test.dsp: (removed)
-        * tests/version_tests/DLList_Test.dsp: (removed)
-        * tests/version_tests/Dirent_Test.dsp: (removed)
-        * tests/version_tests/Dynamic_Priority_Test.dsp: (removed)
-        * tests/version_tests/Enum_Interfaces_Test.dsp: (removed)
-        * tests/version_tests/Env_Value_Test.dsp: (removed)
-        * tests/version_tests/Future_Set_Test.dsp: (removed)
-        * tests/version_tests/Future_Test.dsp: (removed)
-        * tests/version_tests/Handle_Set_Test.dsp: (removed)
-        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed)
-        * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/High_Res_Timer_Test.dsp: (removed)
-        * tests/version_tests/IOStream_Test.dsp: (removed)
-        * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Log_Msg_Test.dsp: (removed)
-        * tests/version_tests/MEM_Stream_Test.dsp: (removed)
-        * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed)
-        * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed)
-        * tests/version_tests/MT_SOCK_Test.dsp: (removed)
-        * tests/version_tests/Malloc_Test.dsp: (removed)
-        * tests/version_tests/Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Map_Test.dsp: (removed)
-        * tests/version_tests/Mem_Map_Test.dsp: (removed)
-        * tests/version_tests/Message_Block_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed)
-        * tests/version_tests/Naming_Test.dsp: (removed)
-        * tests/version_tests/New_Fail_Test.dsp: (removed)
-        * tests/version_tests/Notify_Performance_Test.dsp: (removed)
-        * tests/version_tests/OS_Test.dsp: (removed)
-        * tests/version_tests/Object_Manager_Test.dsp: (removed)
-        * tests/version_tests/OrdMultiSet_Test.dsp: (removed)
-        * tests/version_tests/Pipe_Test.dsp: (removed)
-        * tests/version_tests/Priority_Buffer_Test.dsp: (removed)
-        * tests/version_tests/Priority_Reactor_Test.dsp: (removed)
-        * tests/version_tests/Priority_Task_Test.dsp: (removed)
-        * tests/version_tests/Process_Manager_Test.dsp: (removed)
-        * tests/version_tests/Process_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Process_Strategy_Test.dsp: (removed)
-        * tests/version_tests/RB_Tree_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Notify_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Performance_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Timer_Test.dsp: (removed)
-        * tests/version_tests/Reactors_Test.dsp: (removed)
-        * tests/version_tests/Reader_Writer_Test.dsp: (removed)
-        * tests/version_tests/Recursive_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed)
-        * tests/version_tests/Reverse_Lock_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Connector_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Test.dsp: (removed)
-        * tests/version_tests/SPIPE_Test.dsp: (removed)
-        * tests/version_tests/SString_Test.dsp: (removed)
-        * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed)
-        * tests/version_tests/Semaphore_Test.dsp: (removed)
-        * tests/version_tests/Service_Config_Test.dsp: (removed)
-        * tests/version_tests/Sigset_Ops_Test.dsp: (removed)
-        * tests/version_tests/Simple_Message_Block_Test.dsp: (removed)
-        * tests/version_tests/Svc_Handler_Test.dsp: (removed)
-        * tests/version_tests/TSS_Test.dsp: (removed)
-        * tests/version_tests/Task_Test.dsp: (removed)
-        * tests/version_tests/Thread_Manager_Test.dsp: (removed)
-        * tests/version_tests/Thread_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed)
-        * tests/version_tests/Thread_Pool_Test.dsp: (removed)
-        * tests/version_tests/Time_Service_Test.dsp: (removed)
-        * tests/version_tests/Time_Value_Test.dsp: (removed)
-        * tests/version_tests/Timeprobe_Test.dsp: (removed)
-        * tests/version_tests/Timer_Queue_Test.dsp: (removed)
-        * tests/version_tests/Tokens_Test.dsp: (removed)
-        * tests/version_tests/UPIPE_SAP_Test.dsp: (removed)
-        * tests/version_tests/Upgradable_RW_Test.dsp: (removed)
-        * tests/version_tests/run_all_tests.bat: (removed)
-        * tests/version_tests/version_tests.dsw: (removed)
-
-          Moved the version_tests back into the tests/*.dsp files.  The
-          reason they were originally moved is because it was easier to
-          select all the debug versions during a batch build.  But now
-          we have pippen.pl and msvc_auto_compile.pl, so this is no
-          longer an issue, while this strange setup would compilicate the
-          nightly builds.  Thus, it was standardized back.
-
-        * bin/create_vt_dsps.pl: (removed)
-
-          No need for this anymore.
-
-Sun Mar  4 19:27:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/Log_Msg.cpp:
-        * ace/Log_Msg_NT_Event_Log.h:
-        * ace/OS.cpp:
-
-          Disabled Log_Msg_NT_Event_Log on Windows CE.
-
-Sun Mar 04 13:19:35 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao.doxygen:
-          Add .txt files, so we can add web pages to the basic TAO
-          documentation.
-
-Sun Mar 04 10:58:08 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT
-          project files.
-
-Sun Mar  4 10:41:57 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Log_Msg.cpp,
-          ace/Log_Msg.h,
-          ace/Logging_Strategy.cpp,
-          ace/Makefile.bor,
-          ace/OS.cpp,
-          ace/OS.h,
-          ace/OS.i,
-          ace/ace.rc: Added support for the new NT event logging capability.
-          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-        * ace/Log_Msg_NT_Event_Log.cpp
-          ace/Log_Msg_NT_Event_Log.h
-          ace/ace_message_table.bin:  Added these files to support the new
-          NT event logging capability.
-          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing
-          this.
-
-Sun Mar  4 04:46:44 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/nightlybuilds/builds.lst:
-
-          Added new Windows CE nightly build.
-
-Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
-          typed in as ACE_STATIC_LIBS.
-
-        * ace/svc_export.h:
-        * ace/RMCast/RMCast_Export.h:
-        * ace/SSL/SSL_Export.h:
-        * websvcs/lib/websvcs_export.h: These files didn't check for
-          ACE_AS_STATIC_LIBS to determine if they should define their
-          export macros for static build.  Thanks to Chris Kohlhoff
-          <chris@kohlhoff.com> for reporting this.       [Bug 813]
-
-Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * ace/QoS/QoS_Session_Impl.cpp:
-        * ace/QoS/QoS_Session_Impl.i:
-        * examples/QOS/Fill_ACE_QoS.cpp:
-        * examples/QOS/Fill_ACE_QoS.h:
-        * examples/QOS/Makefile:
-        * examples/QOS/QoS_Util.cpp:
-        * examples/QOS/Receiver_QoS_Event_Handler.cpp:
-        * examples/QOS/Sender_QoS_Event_Handler.cpp:
-          Fixed various compile warnings when compiling with rapi=1 on
-          Redhat Linux 6.2
-
-Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Changed the detection pattern a bit to pick up
-          stuff like:
-
-          void
-          operator < (...)
-
-          better.
-
-        * ace/Auto_Ptr.i:
-        * ace/Base_Thread_Adapter.cpp:
-        * ace/Based_Pointer_T.i:
-        * ace/Connector.cpp:
-        * ace/Containers_T.cpp:
-        * ace/DEV_Addr.i:
-        * ace/Dynamic.i:
-        * ace/FILE.cpp:
-        * ace/Flag_Manip.i:
-        * ace/Handle_Set.i:
-        * ace/Hash_Map_Manager_T.cpp:
-        * ace/Lib_Find.cpp:
-        * ace/Local_Name_Space_T.cpp:
-        * ace/Local_Tokens.cpp:
-        * ace/MEM_Addr.i:
-        * ace/Malloc.cpp:
-        * ace/Malloc_Allocator.cpp:
-        * ace/Malloc_T.cpp:
-        * ace/Memory_Pool.cpp:
-        * ace/Message_Block.cpp:
-        * ace/Message_Block.i:
-        * ace/Message_Block_T.cpp:
-        * ace/Message_Queue.i:
-        * ace/Message_Queue_T.cpp:
-        * ace/Message_Queue_T.i:
-        * ace/Naming_Context.cpp:
-        * ace/OS.cpp:
-        * ace/OS.i:
-        * ace/PI_Malloc.cpp:
-        * ace/POSIX_Asynch_IO.cpp:
-        * ace/Process_Manager.cpp:
-        * ace/QtReactor.cpp:
-        * ace/RB_Tree.i:
-        * ace/RW_Process_Mutex.cpp:
-        * ace/Reactor.cpp:
-        * ace/Remote_Name_Space.cpp:
-        * ace/Remote_Tokens.cpp:
-        * ace/SOCK_Dgram.i:
-        * ace/SString.cpp:
-        * ace/SUN_Proactor.cpp:
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Service_Object.i:
-        * ace/Service_Repository.cpp:
-        * ace/Signal.cpp:
-        * ace/Signal.i:
-        * ace/Svc_Handler.cpp:
-        * ace/Synch.cpp:
-        * ace/Synch_T.cpp:
-        * ace/Thread_Adapter.cpp:
-        * ace/Thread_Manager.cpp:
-        * ace/Timer_Heap_T.cpp:
-        * ace/TkReactor.cpp:
-        * ace/Token.cpp:
-        * ace/Token_Manager.cpp:
-        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
-        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
-        * netsvcs/ACE-netsvcs.html:
-        * netsvcs/lib/Server_Logging_Handler_T.cpp:
-        * netsvcs/lib/Token_Handler.cpp:
-
-          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
-
-        * docs/ACE-categories.html:
-        * docs/ACE-porting.html:
-        * docs/ACE-subsets.html:
-        * docs/tutorials/new-tutorials.html:
-
-          Changed references to
-          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
-          relative paths instead (Fixes the last of the fuzz errors).
-
-Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
-          Added macros tha expand to multiple libraries
-          on QNX RTP to fix most of the link problems.
-
-Fri Mar  2 16:35:58 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/config-win32-borland.h:
-
-          Added /**/ to #include <vcl.h> so it isn't picked up by
-          MSVC-based dependency generators.
-
-Fri Mar 02 19:36:22 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and
-          errno is EAGAIN, change it to EWOULDBLOCK. Improve portability
-          for platforms where EAGAIN and EWOULDBLOCK are different values
-          and both used, like HP-UX.  Thanks to Mike Snowy
-          <snowymike@aol.com> for reporting this problem.
-
-        * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX.
-          This makes it pick up the EAGAIN->EWOULDBLOCK change.
-
-        * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where
-          ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless
-          ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree
-          will get ENOTSUP anyway.
-
-Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
-
-        * ace/QtReactor.cpp:
-          Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting
-          and fixing the problem - crashing of TAO/tests/QtTests/ client
-          example after moving the slider.
-
-Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/MEM_Acceptor.cpp:
-        * ace/MEM_Acceptor.h:
-        * ace/MEM_Addr.cpp:
-        * ace/MEM_Addr.h:
-        * ace/MEM_Connector.cpp:
-        * ace/MEM_Connector.h:
-        * ace/MEM_IO.cpp:
-        * ace/MEM_IO.h:
-        * ace/MEM_SAP.cpp:
-        * ace/MEM_SAP.h:
-        * ace/MEM_Stream.cpp:
-        * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
-          not to support position independent pointers.
-
-Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
-
-        * examples/IOStream/server/iostream_server.cpp (main): Removed the
-          call to register peer_acceptor with the reactor. The acceptor::open
-          call already registers for ACCEPT_MASK. Prevents leaving a hanging
-          READ_MASK registered after the acceptor is destroyed when main()
-          returns. This fixes Bugzilla # 801. Thanks to Pim Philipse
-          <pph@rogan-medical.com> for reporting this.
-
-        * THANKS: Added Pim Philipse to the Hall of Fame.
-
-Fri Mar 02 12:24:27 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions
-          (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set
-          ACE_NEW_THROWS_EXCEPTIONS either).
-
-        * ace/Thread_Manager.cpp (join_thr): Moved the code for
-          ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here
-          to ACE_OS::thr_join (which this function calls) so that
-          ACE_Thread::join also causes a pthread_detach. This is needed
-          on Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread
-          storage and avoid leaking memory. Thanks to Vladimir Kondratiev
-          <vladimir.kondratiev@intel.com> for reporting this and providing
-          excellent test cases to help resolve it quickly.
-
-        * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from
-          ACE_Thread_Manager::join_thr, above.
-
-        * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard
-          around purge_pending_notifications to prevent against an
-          ENOTSUP from purge_pending_notifications.
-
-Thu Mar  1 17:02:10 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          Fixed up the Spawn code to use the Executable ()
-          instead of {EXECUTABLE}, since that's how we get the
-          adjusted name (with .exe and stuff).  And also
-          skipped the file existance with IgnoreExeSubDir, since
-          IgnoreExeSubDir is often used when you need to find
-          the program in the path.
-
-Thu Mar  1 15:48:10 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Fuzz was being a bit to eager with the class matching in
-          the TRACE test.  It was having problems with something like:
-
-          char *foo::bar ()
-
-          since it thought the class was "char *foo" instead of just
-          "foo".
-
-          But it is feeling muuuuuuch better now.
-
-Thu Mar  1 13:18:07 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Added two new tests:
-
-          - absolute ACE_wrappers test:
-
-            Check for ~schmidt/ACE_wrappers in html files.  These should
-            be relative links since these html files already exist in
-            their own ACE_wrappers tree.
-
-          - TRACE test:
-
-            Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually
-            refers to the function/method it is in.
-
-          And expanded the checks in the bad run_test test (level 6)
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          - Added checks for file existence before running.
-          - Added IgnoreExeSubDir option.
-          - Added TerminateWaitKill method.
-
-        * bin/pippen.pl: (added)
-        * bin/PerlACE/MSProject.pm: (added)
-        * bin/PerlACE/MSProject/DSP.pm: (added)
-        * bin/PerlACE/MSProject/VCP.pm: (added)
-
-          There is nothing to see here...please be on your way.
-
-          It isn't like this is a super top secret project to
-          replace msvc_auto_compile.pl with something that works
-          better and also has a cool code-name that is shorter
-          than "msvc_auto_compile.pl".
-
-          But remember, you didn't hear that from me.
-
-Thu Mar  1 10:54:23 2001  Ossama Othman  <ossama@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Added the TAO Codec to the list of tests to run.
-
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Fixed all incorrect uses of CFLAGS and CCFLAGS where
-          preprocessor macros were defined.  Preprocessor macros should be
-          defined in the CPPFLAGS variable.
-
-          Define ACE_USE_RCSID in non-debug builds (i.e. debug=0).
-
-Thu Mar 01 07:29:58 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_run_tests.lst:
-          Fixed typos in the Service_Context_Manipulation test.  It was
-          running in platforms where it shouldn't.
-
-Thu Mar 01 07:07:03 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * include/makeinclude/recurse.bor:
-          Added support for makefiles which contain multiple targets.
-
-        * examples/IPC_SAP/SOCK_SAP/Makefile.bor:
-        * examples/Log_Msg/Makefile.bor:
-        * examples/Map_Manager/Makefile.bor:
-        * examples/Mem_Map/file-reverse/Makefile.bor:
-        * examples/RMCast/Send_File/Makefile.bor:
-        * examples/Service_Configurator/IPC-tests/client/Makefile.bor:
-        * examples/Threads/Makefile.bor:
-        * netsvcs/clients/Logger/Makefile.bor:
-        * tests/Makefile.bor:
-        * tests/RMCast/Makefile.bor:
-          Updated to work with new multi-target makefile support.
-
-Wed Feb 28 22:58:50 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * html/index.html:
-          Reference */index.html directly, instead of assuming that the
-          web browser will use index.html as the default file, this also
-          works better when browsing locally.  Thanks to Alain Decamps
-          <Alain.Decamps@pidpa.be> for pointing this out.
-
-Wed Feb 28 16:41:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * docs/bugzilla-build-setup.html:
-
-          Updated the section about the scoreboard and added a
-          placeholder for Win32 nightly build information.
-
-Wed Feb 28 16:04:14 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and
-          Messaging support disabled for the nightly builds.
-
-Wed Feb 28 15:35:59 2001  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * docs/bugzilla-build-setup.html:
-          Added html file outlining steps for adding a bugzilla
-          nightly build.
-
-Wed Feb 28 00:25:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          The examples/POA/Adapter_Activator/run_test.pl test was being run
-          twice.  In fairness to all the other tests that only get to run once,
-          I removed the second instance.
-
-Tue Feb 27 17:31:48 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for
-          the threads=0 build - this enables the reentrant functions which
-          are present, threads or not. It does not turn on threads, which
-          are instead enabled by -D_POSIX_C_SOURCE=199506L.
-
-        * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-        * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to
-          the POSIX.1c-conformant version of rand_r. Allows clean compile
-          on HP-UX 11 without thread support.
-          Also lined up some misaligned #if/else/endif lines to make it
-          easier to find one's way through.
-
-        * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the
-          ways to get the POSIX.1c-conformant version of readdir_r. Allows
-          clean compile on HP-UX 11 without thread support.
-
-Tue Feb 27 11:38:38 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * performance-tests/TCP/tcp_test.cpp (main): Zapped the
-          non-existent '-f' option.  Thanks to Mike Curtis for reporting
-          this.
-
-        * performance-tests/TCP/tcp_test.cpp (main): Check for improper
-          bufsz.  Thanks to Mike Curtis for reporting this.
-
-        * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t'
-          option, which specifies the number of threads.
-
-        * performance-tests/TCP/README: Fixed a typo.  Thanks to
-          Mike Curtis for reporting this.
-
-Tue Feb 27 10:51:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * bin/auto_run_tests.lst: Added the AMI tests to the daily
-          builds.
-
-Tue Feb 27 10:23:20 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES
-          to ChangeLog*. This should help us to avoid missing ChangeLog
-          entries in the beta distribution, just about every time we split
-          and add a ChangeLog.
-
-Mon Feb 27 07:39:16 2001  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-
-          Removed suppression of Future Error 129.
-          Removed the use of CFLAGS.
-
-        * ace/OS.h:
-        * ace/config-hpux-11.00.h:
-
-          Modification to remove system header macro definition conflicts.
-          This change does not suppress the conflicts, but does an undef
-          of the two conflicting macros before includeing tcp.h.  Thanks
-          to Sam Chong <sam@i2i-inc.com> for reporting this problem.
-
-Mon Feb 26 19:01:16 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Logging_Strategy.{h,cpp}: Added a new -k option to
-          set the logging key via the ACE_Logging_Strategy.  Thanks to
-          Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-Mon Feb 26 18:18:38 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/SString.i
-          (ACE_CString::find (const char *s, int pos) const):
-          (ACE_CString::find (char c, int pos) const):
-          (ACE_SString::find (const char *s, int pos) const):
-          (ACE_SString::find (char c, int pos) const):
-          (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const):
-          If match is found, return index from start of string, not from
-          'pos'. Matches the C++ string standard, which was the model for
-          these classes.
-          Thanks to Glen Osterhout <gosterho@elronsw.com> for this fix.
-
-        * ace/SString.h: Clarified comments on return value for above
-          functions.
-
-        * tests/SString_Test.cpp: Changed to look for the correct return
-          from the npos tests of the functions above.
-
-        * THANKS: Added Glen Osterhout to the Hall of Fame.
-
-Mon Feb 26 15:01:55 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test_Impl.dsp:
-        * tests/version_tests/DLL_Test_Impl.dsp: (removed)
-
-          Me thinks that the Release and Static configurations should
-          also compile, and me thinks that it is now fixed.
-
-Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
-          method assumes ownership of <next_arg>, rather than copying it.
-          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
-          Fixes [Bug 807].
-
-          The generated version_tests dsp didn't work (since DLL_Test_Impl
-          creates a library).  Manually created the configurations in the
-          tests/DLL_Test_Impl.dsp version instead.
-
-Mon Feb 26 15:54:33 2001  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b)
-
-        * docs/tutorials/013/message_queue.cpp:
-        * tests/Malloc_Test.cpp:
-
-        Fixed errors in #pragma instiate lines including removal of ';',
-        mispellings
-
-        * ace/config-all.h:
-
-        Added definition of Unixware UDK for definition of ACE_NOTREACHED()
-
-        * ace/config-unixware-7.1.0.udk.h:
-        * include/makeinclude/platform_unixware_udk.GNU:
-
-        New configuration files for building on Unixware 7 with UDK CC.
-
-Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
-          method assumes ownership of <next_arg>, rather than copying it.
-          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
-          Fixes [Bug 807].
-
-Mon Feb 26 12:27:46 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.i:
-
-          Added method to reset the byte order in class OuputCDR.  This
-          will be used by a gateway to set the byte order of a reply to a
-          reqest it has handled to one different than the gateway's own
-          byte order, if necessary. It should be called while the stream
-          is still empty, that is, before any part of the reply, including
-          the header, has been marshaled.
-
-Mon Feb 26 12:07:00 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before
-          setting the MAP_FIXED flag.  Thanks to <rhuber@amadeus.net> for
-          reporting this. [Bug 752]
-
-Mon Feb 26 09:29:36 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/RB_Tree.h:
-          Fully qualified enum name. This fixes problems on gcc-272 builds.
-
-Mon Feb 26 00:19:28 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        Time to do some spring cleaning...
-
-        * tests/version_tests/Config_Test.dsp: (added)
-        * tests/version_tests/DLL_Test_Impl.dsp: (added)
-        * tests/version_tests/Log_Msg_Test.dsp: (added)
-        * tests/version_tests/Message_Queue_Test_Ex.dsp: (added)
-        * tests/version_tests/version_tests.dsw:
-
-          Updated the version_tests dir with create_vt_dsps.pl.
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-        * netsvcs/lib/netsvcs.dsp:
-        * netsvcs/servers/servers.dsp:
-        * tests/ACE_Init_Test.dsp:
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Auto_IncDec_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Array_Test.dsp:
-        * tests/CDR_File_Test.dsp:
-        * tests/CDR_Test.dsp:
-        * tests/Cache_Map_Manager_Test.dsp:
-        * tests/Cached_Accept_Conn_Test.dsp:
-        * tests/Cached_Conn_Test.dsp:
-        * tests/Capabilities_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Config_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLL_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dirent_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Set_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Lazy_Map_Manager_Test.dsp:
-        * tests/Log_Msg_Test.dsp:
-        * tests/MEM_Stream_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Malloc_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/Message_Queue_Test_Ex.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OS_Test.dsp:
-        * tests/Object_Manager_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Manager_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Refcounted_Auto_Ptr_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-        * tests/Upgradable_RW_Test.dsp:
-
-          Removed the Alpha configurations.  I don't think we've
-          actually looked at these for over a year, and they are
-          missing from a lot of projects.  Thankfully, they are easy
-          to recreate if they are needed.
-
-        * ACE-INSTALL.html:
-
-          Changed the Windows NT Alpha section to mention that we
-          no longer have configurations out of the box for Win32/Alpha,
-          they must be recreated if needed.
-
-        * WindozeCE/ACEApp.cpp: (removed)
-        * WindozeCE/ACEApp.h: (removed)
-        * WindozeCE/README: (removed)
-        * WindozeCE/StdAfx.cpp: (removed)
-        * WindozeCE/StdAfx.h: (removed)
-        * WindozeCE/WindozeCE.aps: (removed)
-        * WindozeCE/WindozeCE.clw: (removed)
-        * WindozeCE/WindozeCE.cpp: (removed)
-        * WindozeCE/WindozeCE.dsp: (removed)
-        * WindozeCE/WindozeCE.h: (removed)
-        * WindozeCE/WindozeCE.rc: (removed)
-        * WindozeCE/WindozeCEDlg.cpp: (removed)
-        * WindozeCE/WindozeCEDlg.h: (removed)
-        * WindozeCE/resource.h: (removed)
-        * WindozeCE/res/WindozeCE.ico: (removed)
-        * WindozeCE/res/WindozeCE.rc2: (removed)
-
-          No longer used.
-
-        * Makefile:
-
-          Removed WindozeCE from CONTROLLED_FILES.
-
-        * tests/WinCE/Atomic_Op_Test.dsp: (removed)
-        * tests/WinCE/Barrier_Test.dsp: (removed)
-        * tests/WinCE/Basic_Types_Test.dsp: (removed)
-        * tests/WinCE/Buffer_Stream_Test.dsp: (removed)
-        * tests/WinCE/Conn_Test.dsp: (removed)
-        * tests/WinCE/DLL_Test.dsp: (removed)
-        * tests/WinCE/Enum_Interfaces_Test.dsp: (removed)
-        * tests/WinCE/Future_Test.dsp: (removed)
-        * tests/WinCE/Handle_Set_Test.dsp: (removed)
-        * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed)
-        * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed)
-        * tests/WinCE/MT_SOCK_Test.dsp: (removed)
-        * tests/WinCE/Map_Manager_Test.dsp: (removed)
-        * tests/WinCE/Mem_Map_Test.dsp: (removed)
-        * tests/WinCE/Message_Block_Test.dsp: (removed)
-        * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed)
-        * tests/WinCE/Message_Queue_Test.dsp: (removed)
-        * tests/WinCE/Notify_Performance_Test.dsp: (removed)
-        * tests/WinCE/OrdMultiSet_Test.dsp: (removed)
-        * tests/WinCE/Priority_Buffer_Test.dsp: (removed)
-        * tests/WinCE/Priority_Task_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Notify_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Performance_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Timer_Test.dsp: (removed)
-        * tests/WinCE/Reactors_Test.dsp: (removed)
-        * tests/WinCE/Reader_Writer_Test.dsp: (removed)
-        * tests/WinCE/Recursive_Mutex_Test.dsp: (removed)
-        * tests/WinCE/SOCK_Connector_Test.dsp: (removed)
-        * tests/WinCE/SOCK_Test.dsp: (removed)
-        * tests/WinCE/SString_Test.dsp: (removed)
-        * tests/WinCE/Semaphore_Test.dsp: (removed)
-        * tests/WinCE/Sigset_Ops_Test.dsp: (removed)
-        * tests/WinCE/Simple_Message_Block_Test.dsp: (removed)
-        * tests/WinCE/TSS_Test.dsp: (removed)
-        * tests/WinCE/Task_Test.dsp: (removed)
-        * tests/WinCE/Thread_Manager_Test.dsp: (removed)
-        * tests/WinCE/Thread_Mutex_Test.dsp: (removed)
-        * tests/WinCE/Thread_Pool_Test.dsp: (removed)
-        * tests/WinCE/Time_Value_Test.dsp: (removed)
-        * tests/WinCE/Timer_Queue_Test.dsp: (removed)
-        * tests/WinCE/ce_tests.dsw: (removed)
-
-          Removed these Windows CE Toolkit for Visual C++ files.
-
-Mon Feb 26 00:15:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test_Impl.dsp:
-
-          Made sure the Code Generation settings were correct.
-
-Sun Feb 25 19:40:11 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/ACEutils.pm (CheckForConfig):
-          This routine was not removing all the -Config options from the
-          command-line, causing problems in some of the tests.
-
-Sun Feb 25 16:33:26 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test.cpp:
-
-          Left the DLL end with a d in debug mode, but changed
-          the test to add the d when _DEBUG and ACE_WIN32 is
-          defined.  Test should now work again on Win2000_Debug.
-
-Sun Feb 25 11:28:06 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/run_test.pl:
-
-          When there are errors in the log, print out the entire
-          log.  This should make it much easier to understand
-          problems in the nightly build logs.
-
-Sun Feb 25 09:04:43 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/DLL_Test.cpp:
-          Accidentally left the 'd' suffix in the name of the DLL.
-
-Sat Feb 24 22:58:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/msvc_auto_compile.pl:
-        * TAO/TAOACE.dsw:
-        * TAO/TAOACE_Static.dsw:
-        * Static_Performance.dsw:
-
-          Removed references to gperf_lib.dsp
-
-        * TAO/version_tests.dsw: (removed)
-
-          This was still referring to orbsvcs.dsp, which shows that
-          it is way out of date (and not used).  Zapped.
-
-Sat Feb 24 20:59:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * apps/gperf/src/gperf.dsp:
-        * apps/gperf/src/gperf.dsw:
-        * apps/gperf/src/gperf_lib.dsp: (removed)
-
-          Merged gperf into one project.  This will bring the
-          structure in line with the Makefiles.
-
-Sat Feb 24 19:28:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-
-          Fixed my recent changes to ACE_OS::dlsym () to work on
-          Windows CE.
-
-Sat Feb 24 17:50:38 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test.cpp:
-
-          OBJ_PREFIX was being created by attaching a char string to
-          a ACE_TCHAR string.  Needed to add ACE_TEXT to the first
-          string for compilation on ACE_USES_WCHAR.
-
-        * tests/DLL_Test_Impl.dsp:
-
-          Changed the internal name to "DLL_Test DLL" to make sure
-          this gets compiled in the first pass by msvc_auto_compile.pl.
-
-        * tests/run_test.pl:
-
-          Added a check for LM_WARNINGs in log files.  Let's see if
-          there have been any hidden (DLL_Test actually was producing
-          a warning on Windows, but Carlos's fix already got rid of it,
-          Yay!).
-
-Sat Feb 24 15:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/tests.dsw:
-        * tests/DLL_Test_Impl.dsp:
-          Add new project file for the shared library used in the test.
-
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test_Impl.cpp:
-          Change the Win32 version to load a shared library instead of the
-          exe.
-
-Sat Feb 24 14:07:11 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/Thread_Pool_Reactor_Test.cpp:
-
-          Did a careful study of what this test was doing in regards to
-          sending wide-character strings, and made it consistent.  The
-          most troublesome aspect was the fact that the length is encoded
-          in the shutdown string ("\011shutdown") which meant that I had
-          to send the length in characters, not in bytes.  This should
-          really fix [Bug 537].
-
-Sat Feb 24 14:37:00 2001  Craig Rodrigues <crodrigu@bbn.com>
-
-        * ace/config-g++-common.h
-          gcc 2.97 and higher require the use of the std namespace for
-          iostrams
-
-Sat Feb 24 10:27:04 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_run_tests.lst:
-          Disable the interceptor tests when the ORB is compiled without
-          interceptor support.
-
-        * tests/run_test.lst:
-          Disable the Reactor_Notify_Test on single threaded builds, it
-          uses threads.
-
-        * bin/nightlybuilds/scoreboard_update.pl:
-          Fixed usage message.
-
-Sat Feb 24 09:45:18 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/run_test.lst:
-          Disable the DLL_Test on KCC/Linux builds.  The test runs
-          normally, but crashes on shutdown(), it appears as if the
-          run-time system is invoking the destructors after the library is
-          unloaded.
-
-        * tests/Makefile:
-        * tests/Makefile.DLL_Test:
-        * tests/DLL_Test.h:
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test_Impl.h:
-        * tests/DLL_Test_Impl.cpp:
-          Cleanup code, and truly separate the shared library code to a
-          completely new separate file.
-
-Sat Feb 24 09:51:45 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_compile:
-          Pass the -Config options to each script, this helps the
-          $ACE_ROOT/bin/run_test.pl script that needs to disable some
-          tests in certain configurations.
-
-Sat Feb 24 08:21:48 2001  David L. Levine <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          added -fno-implicit-templates on Tornado II for Intel 386
-          family targets.  Thanks to Albert Wijnja <Albert.Wijnja@meco.nl>
-          for reporting that static template data members weren't really on
-          VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com>
-          for confirming that -fno-implicit-templates should work with
-          the Tornado II g++.  [Bug 658]
-
-Thu Feb 22 15:59:04 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the
-          function as "localtime".  This is now fixed.  Thanks to Mason
-          Deaver <mason.deaver@tripointglobal.com> for reporting this.
-
-Fri Feb 23 19:44:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ACE version 5.1.13 released.
-
-Thu Feb 22 12:28:15 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/TP_Reactor.cpp (handle_events): Here is the description of
-          how things were working and where the problem was: In the
-          TP_Reactor there is one leader thread waiting in select() and
-          the others waiting on the token.  During deactivation(), the
-          <deactivation_> flag is set on the reactor, signal_all_threads()
-          is called on the token, and an empty notification is send to the
-          current leader thread.  signal_all_threads() sets the
-          <signal_all_threads_> flag on the Token when there are waiters
-          on the Token (does nothing if there are no waiters).  This
-          scheme worked fine when there were leader and follower threads
-          waiting.  When a new leader is chosen, it returns the magic
-          number 2 from token.acquire_read() and hence exits gracefully
-          from the handle_events().  However, the problem was that when
-          some (or all) of the TP threads are busy running upcalls,
-          signal_all_threads() was a no-op and the magic number 2 was not
-          returned from token.acquire_read() and hence the exit from
-          handle_events() was flagged as an error.
-
-          The fix is as described below:
-
-          (1) ACE_Token::signal_all_threads() does not make sense.  The
-          token is a mutex, not a condition variable.  Therefore, it does
-          not make sense to have a signal_all_threads() methods.  Plus I
-          believe that the method does not do as advertised.  Therefore, I
-          removed this method from the token class.
-
-          (2) There is no need to signal all the threads in the
-          TP_Reactor.  Marking the Reactor as closed and signaling the
-          leader thread is enough.  The leader thread will wake up to
-          handle the empty event, the next leader will see that the
-          Reactor is closed and exit gracefully.  This will continue until
-          all the waiters are drained.
-
-          (3) With the above change, there is no need to check for an
-          magic returns from token.acquire_read().  When a thread gets the
-          token, it checks the deactivation flag before proceeding.  If
-          the Reactor is closed, it gracefully exits.  Otherwise, it
-          continues as leader.
-
-          (4) Since there is no need to call token.signal_all_threads(),
-          ACE_TP_Reactor::wakeup_all_threads() can be removed since it is
-          now the same as ACE_Select_Reactor_T::wakeup_all_threads().
-
-          Note that this change should help with making
-          Thread_Pool_Reactor_Test run without shutdown errors.
-
-        * ace/Select_Reactor_T.i (deactivate): The setting of the
-          <deactivated_> flag and waking up of all the threads should be
-          atomic.  I am being picky about this one but I think am I right.
-          Also added the guard to the accessor.
-
-Thu Feb 22 08:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-
-          Bleh.  Changed an && to || to make sure we get a symbolname
-          variable for non-Unicode Win32.
-
-          "He who lives without committing any folly is not so
-          wise as he thinks"  - La Rochefoucauld
-
-Thu Feb 22 08:43:30 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * include/makeinclude/rules.local.GNU:
-          Add SunWS_cache and ir.out to the list of files removed by
-          the realclean pseudo-target.  This directory is used by Sun/CC
-          5.0 (and Forte), if not removed the information there can become
-          stale, and break the builds.
-          This should fix the Sun/CC 5.0 nightly builds.
-
-Thu Feb 22 07:51:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
-          Krishnakumar B  <kitty@ace.cs.wustl.edu> ".
-
-Thu Feb 22 03:31:06 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
-
-        * ace/OS.i (dlsym):
-          Hopefully fixed the Win32 builds. Removed a extra ! in the
-          #ifdef.
-
-Thu Feb 22 02:58:36 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
-
-        * VERSION:
-        * PROBLEM-REPORT-FORM:
-        * ace/Version.h:
-        Reverted the changes and restored the old versions of
-        these files as the beta build script was killed. Pain :-(
-
-Wed Feb 21 20:10:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-        * tests/DLL_Test.cpp:
-        * tests/Thread_Pool_Reactor_Test.cpp:
-
-          Fixed the remaining problems with the Win2000_Unicode tests.
-          [Bug 537]
-
-Tue Feb 20 21:19:39 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * ace/Svc_Conf.h:
-          Add ACE_Export macro for ace_create_service_type() it is used
-          outside the library now.
-
-Tue Feb 20 06:34:26 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly
-          set ACE_HAS_GNUG_PRE_2_8.  Thanks to Christian von Mueffling
-          <cvm@aiss.de> for reporting this.
-
-        * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
-          the ACE_TRACE macro.  Thanks to Mike Curtis for reporting this.
-
-Mon Feb 19 16:38:08 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ace/Asynch_Acceptor.{h,cpp}:
-        Added method void handle (ACE_HANDLE) and made it call the base
-        class's handle(ACE_HANDLE) method to remove warning about
-        partial overloading. Fix suggested by Irfan.
-
-Sun Feb 18 21:55:16 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ace/OS.h:
-        Added an extern "C" void ace_mutex_lock_cleanup_adapter before
-        the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on
-        SunCC 5.x.
-
-Sun Feb 18 17:16:41 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * netsvcs/clients/Tokens/manual/manual.cpp (main),
-        * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
-          ACE_HAS_TOKENS_LIBRARY stuff.  Thanks to Kitty for reporting
-          this.
-
-Sun Feb 18 16:28:45 2001  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.h: Changed order of method declarations to (hopefully)
-          dodge an internal compiler error on VxWorks.
-
-Sun Feb 18 09:59:18 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * netsvcs/clients/Tokens:
-        * netsvcs/servers/main.cpp (main):
-        * netsvcs/servers/svc.conf:
-        * netsvcs/lib/Token_Handler: Only compile this stuff if the
-          ACE_HAS_TOKENS_LIBRARY macro is enabled.  Thanks to Carlos
-          for reporting this.
-
-        * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY
-          so we can skip initializing certain things if that macro is
-          undefined.
-
-        * ace/Token_Collection.*:
-        * ace/Token_Invariants.*:
-        * ace/Token_Manager.*:
-        * ace/Local_Tokens.*:
-        * ace/Remote_Tokens.*:
-        * ace/Token_Request_Reply.*:
-          Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled
-          since this functionality does not appear to be widely used and
-          yet it takes up space.
-
-        * tests/Tokens_Test.cpp (main): Only run this test if
-          ACE_HAS_TOKENS_LIBRARY is defined.
-
-Sat Feb 17 17:23:46 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-
-          Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com>
-          In effect, this reverts the multicast code changed on
-              Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
-          for all platforms except linux.
-
-Sat Feb 17 15:52:09 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/run_all_list.pm:
-        * tests/run_tests.pl:
-          Remove obsolete scripts.
-
-Sat Feb 17 13:26:17 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast
-          -1 to void * since that's the signature of the method.  Thanks
-          to Bala for reporting this.
-
-        * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused
-          result local variable and also changed the logic to bailout if
-          handle_events() returns -1.  This fixes a warning reported by
-          KCC.
-
-Fri Feb 16 17:39:16 2001  Mayur Deshpande  <mayur@ics.uci.edu>
-
-        * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
-
-        * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to
-          CCFLAGS and 'exceptions=1' at end of file.
-          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
-
-Fri Feb 16 05:37:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Logging_Strategy.h: Updated the documentation to explain what
-          the various options mean.
-
-        * tests/Log_Msg_Test.cpp (test_log_msg_features): Added
-          ACE_Log_Msg::PROCESS to a coupld or priority_mask() calls to
-          make the test work correctly.  Thanks to Kitty for reporting
-          this.
-
-Thu Feb 15 17:53:31 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Thread_Manager.i: Simplified casting in
-          ACE_Thread_Descriptor::get_next per suggestion from Carlos.
-
-Thu Feb 15 14:57:59 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next.
-
-Thu Feb 15 11:33:55 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0)
-          to make sure that this test terminates...
-
-        * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to
-          make certain compilers happy.
-
-        * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32.
-
-Thu Feb 15 08:49:44 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/nightlybuilds/builds.lst:
-          Rename WashU builds so all the Debian builds appear together.
-
-Thu Feb 15 07:15:39 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple
-          log files, rather than just two.  Thanks to Orlando Ribeiro
-          <oribeiro@inescporto.pt> for this fix.
-
-Thu Feb 15 03:36:46 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * bin/nightlybuilds/builds.lst (WEB):
-        Added a new build with TAO_MINIMUM linked statically.
-
-Wed Feb 14 05:28:59 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(),
-          task(), get_next(), and self().  Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for reporting this.
-
-Tue Feb 13 17:51:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS.
-          Thanks to Mike Curtis for reporting this.
-
-        * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run.
-          Thanks to Mike Curtis for reporting this.
-
-Wed Feb 14 12:08:10 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read.
-          If record was a multiple of BUFSIZ and the record was
-          terminated with an EOF instead of a "term" character,
-          rec_read would return 0 instead of the actual data read in.
-          The problem was that the partial buffer fill size was being
-          checked instead of the total number of bytes read in.  This
-          issue was noticed when trying to read in an IOR file in TAO
-          that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long.
-
-Tue Feb 13 14:44:28 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_wchar.inl: Changed several variable from type <size_t>
-          to type <int> as on 64-bit whistler, size_t and int are not the
-          same size which confuses 64-bit compiler.  (Per Kitty's
-          request.)
-
-Tue Feb 13 10:23:31 2001  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of
-          handle () method and handle_ member to ACE_Handler). Moved the
-          handle_ member to the JAWS_Synch_IO class - it needs it, and
-          JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left
-          the handle () methods in JAWS_IO, but made them pure virtual,
-          implemented in JAWS_Synch_IO (implementation moved from JAWS_IO)
-          and in JAWS_Asynch_IO, where they forward up to ACE_Handler's
-          handle () methods.
-
-Mon Feb 12 18:18:05 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * tests/Thread_Mutex_Test.cpp:
-          Modified test to use process mutexes for Win32 platforms
-          so that timed mutexes could be tested.
-
-Sun Feb 11 15:33:39 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/QoS/ACE_QoS_Export.h:
-
-          Added ACE_AS_STATIC_LIBS support.
-
-        * ace/QoS/ACE_QoS.dsp:
-        * ace/QoS/ACE_QoS_Lib.dsp:
-
-          Fixed to comply with ACE standards.
-
-Sun Feb 11 10:50:10 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_g++.GNU (exceptions):
-          Only set the -fno-exceptions option if we're *not* using GCC
-          2.7.2!  Thanks to Pradeep for explaining how to do this.
-
-Sun Feb 11 10:15:08 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * ace/Makefile.bor:
-        * ace/QoS/Makefile.bor:
-        * include/makeinclude/ace_flags.bor:
-          Added build support for QoS library with Borland compiler.
-
-Sat Feb 10 15:29:08 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * ace/Message_Block.h:
-          Improved documentation for the lenth(), size() and space()
-          methods.
-
-Sat Feb 10 07:19:37 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * include/makeinclude/outputdir.bor:
-          Removed the now out-of-date comment about pascal/non-pascal
-          build directories.
-
-        * ace/config-win32-borland.h:
-          Added support for new ACE_HAS_VCL define to enable inclusion
-          of VCL header files.
-
-Fri Feb  9 16:47:44 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * ace/Makefile.am:
-          Removed references to the AQoSA files.
-
-Fri Feb  9 16:42:10 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * examples/QOS/client.dsp:
-        * examples/QOS/server.dsp:
-          Updated the corrected project files.
-          Thanks to Darrell for pointing this out.
-
-Thu Feb  8 19:25:03 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * performance-tests/RPC/run_test.pl:
-        * performance-tests/TCP/run_test.pl:
-        * performance-tests/UDP/run_test.pl:
-          Add driver strings
-
-Thu Feb 08 19:18:36 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Removed comment from Exposed Policies test. The test has been fixed.
-
-Thu Feb  8 14:11:36 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/ws2tcpip.h:  [Removed]
-
-          I don't see any reason to have this file in ace; it is a system
-          header file.  And from [Bug 722], our version is out of date anyway.
-
-        * ace/OS.h:
-
-          Changed to include system version of ws2tcpip.h
-
-        * ace/Makefile.am:
-        * ace/ace-dll.icc:
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-
-          Removed references to ws2tcpip.h.
-
-        * ace/SOCK_Connect.cpp:
-
-          Changed get_ip_interfaces to remove a memory error.  Thanks to
-          Viatcheslav Batenine <slavikb@infra2000.com> for helping out with
-          this.
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-
-          It looks like the change made on:
-
-          Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
-
-          doesn't work on Win32.  Reverted back to the old scheme for Win32
-          only.
-
 Thu Feb  8 00:34:57 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * include/makeinclude/platform_sunos5_g++.GNU: Added support for
-          -fno-exception when exceptions=0 is given to the Makefile.
-          Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
-          this.
+	* include/makeinclude/platform_sunos5_g++.GNU: Added support for
+	  -fno-exception when exceptions=0 is given to the Makefile.
+  	  Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
+ 	  this.
 
 Wed Feb  7 23:02:46 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
-          new overridden cancel_aio() method.  Thanks to Alexander Libman
-          <Alibman@baltimore.com> for contributing this.
+	* ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
+	  new overridden cancel_aio() method.  Thanks to Alexander Libman
+ 	  <Alibman@baltimore.com> for contributing this.
 
 Thu Feb  8 02:09:05 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
-        * examples/QOS/Makefile:
-        * examples/QOS/client.dsp:
-        * examples/QOS/server.dsp:
-          Modified to use the ACE_QoS lib.
-        * Receiver_QoS_Event_Handler.cpp:
-        * Sender_QoS_Event_Handler.cpp:
-          Added missing Log_Msg.h for ACE_DEBUG.
-          Other files were modified to reflect changed directory location
-          of AQosA imclude files.
-
+	* examples/QOS/Makefile:
+	* examples/QOS/client.dsp:
+	* examples/QOS/server.dsp:
+	  Modified to use the ACE_QoS lib. 
+	* Receiver_QoS_Event_Handler.cpp:
+	* Sender_QoS_Event_Handler.cpp:
+	  Added missing Log_Msg.h for ACE_DEBUG.
+	  Other files were modified to reflect changed directory location
+	  of AQosA imclude files.
+	
 Thu Feb  8 00:17:43 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
-        * ace/QoS_Decorator.cpp:
-        * ace/QoS_Session_Factory.cpp:
-        * ace/SOCK_Dgram_Mcast_QoS.cpp:
-        * ace/QoS_Decorator.h:
-        * ace/QoS_Session_Factory.h:
-        * ace/SOCK_Dgram_Mcast_QoS.h:
-        * ace/QoS_Manager.cpp:
-        * ace/QoS_Session_Impl.cpp:
-        * ace/SOCK_Dgram_Mcast_QoS.i:
-        * ace/QoS_Manager.h:
-        * ace/QoS_Session_Impl.h:
-        * ace/QoS_Session_Impl.i:
-          Moved the AQoSA classes to ace/QoS directory.
-
-        * ace/Makefile:
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-          Removed the QoS related files, added QoS directory to build.
-
-        * ace/Qos/Makefile
-        * ace/QoS/ACE_QoS.dsw:
-        * ace/QoS/ACE_QoS.dsp:
-        * ace/QoS/ACE_QoS_Lib.dsp:
-        * ace/QoS/ACE_QoS_Export.h:
-          Added Makefile and MSVC project files.
-          Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this
-          change and providing the patch.
+	* ace/QoS_Decorator.cpp:
+	* ace/QoS_Session_Factory.cpp:
+	* ace/SOCK_Dgram_Mcast_QoS.cpp:
+	* ace/QoS_Decorator.h:
+	* ace/QoS_Session_Factory.h:
+	* ace/SOCK_Dgram_Mcast_QoS.h:
+	* ace/QoS_Manager.cpp:
+	* ace/QoS_Session_Impl.cpp:
+	* ace/SOCK_Dgram_Mcast_QoS.i:
+	* ace/QoS_Manager.h:
+	* ace/QoS_Session_Impl.h:
+	* ace/QoS_Session_Impl.i: 
+	  Moved the AQoSA classes to ace/QoS directory.
+
+	* ace/Makefile:
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp:
+	  Removed the QoS related files, added QoS directory to build.
+
+	* ace/Qos/Makefile
+	* ace/QoS/ACE_QoS.dsw:
+	* ace/QoS/ACE_QoS.dsp:	
+	* ace/QoS/ACE_QoS_Lib.dsp:
+	* ace/QoS/ACE_QoS_Export.h:
+	  Added Makefile and MSVC project files.
+	  Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this 
+	  change and providing the patch.
 
 Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
@@ -1607,15 +60,15 @@ Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Wed Feb  7 09:03:22 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
-          incorrect if/else branching.  Thanks to Lu Yunhai
-          <luyunhai@huawei.com> for reporting this.
+	* apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
+	  incorrect if/else branching.  Thanks to Lu Yunhai
+ 	  <luyunhai@huawei.com> for reporting this.
 
 Tue Feb  6 23:43:49 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
-          %s to be %*s since the string may not be nul terminated!  Thanks
-          to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+	* apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
+	  %s to be %*s since the string may not be nul terminated!  Thanks
+ 	  to Lu Yunhai <luyunhai@huawei.com> for reporting this.
 
 Tue Feb  6 20:11:28 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
@@ -1670,8 +123,8 @@ Tue Feb 06 17:16:43 2001  Steve Huston  <shuston@riverace.com>
 
 Mon Feb  5 16:19:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
-          Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+	* ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
+	  Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
 
         * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN
           macros to use the form 0x0123 rather than 0123X.  Thanks to
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f94010c6b8e..72551df7ac5 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,1604 +1,57 @@
-Mon Mar  5 11:29:36 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * docs/ACE-categories.html:
-          Fixed links to the doxygen files.
-
-        * ace/Pipe.cpp:
-          Fixed what looks like a typo, we want to *disable* the stream
-          pipes under QNX, not to enable them just on that platform.
-
-Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/RMCast/RMCast_Fragment_Test.cpp:
-        * tests/RMCast/RMCast_Reassembly_Test.cpp:
-          Undo Doug's changes.  They broke the test.
-
-Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/RMCast/RMCast_Fragment_Test.cpp,
-        * tests/RMCast/RMCast_Reassembly_Test.cpp,
-        * tests/Dynamic_Priority_Test.cpp,
-        * tests/Thread_Pool_Test.cpp: Make sure to write into the
-          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
-          <Gonzalo.Diethelm@sonda.com> for reporting this.
-
-Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/nightlybuilds/builds.lst:
-
-          Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
-
-Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Updated to detect missing ACE_TRY_ENV parameters in
-          ORB::resolve_initial_references() calls when emulated exceptions
-          are used.  Thanks to Darrell for providing this update.
-
-Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * tests/Makefile.bor:
-
-          Added missing Refcounted_Auto_Ptr_Test to the build
-
-Sun Mar  4 19:31:16 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Added the run_test_mt.pl for Leader_Follers.
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          Added a destructor to detect if a process wasn't explicitly
-          killed before the object went out of scope. Will print out
-          an error and kill it.
-
-        * bin/PerlACE/Run_Test.pm:
-
-          Turned on autoflush for all scripts.
-
-        * docs/run_test.txt:
-
-          Updated run_test.pl instructions to fit all the changes I
-          just made.
-
-        * examples/Export/run_test.pl:
-        * performance-tests/RPC/run_test.pl:
-        * performance-tests/TCP/run_test.pl:
-        * performance-tests/UDP/run_test.pl:
-
-          Updated to use PerlACE::Run_Test;
-
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Auto_IncDec_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Array_Test.dsp:
-        * tests/CDR_File_Test.dsp:
-        * tests/CDR_Test.dsp:
-        * tests/Cache_Map_Manager_Test.dsp:
-        * tests/Cached_Accept_Conn_Test.dsp:
-        * tests/Cached_Conn_Test.dsp:
-        * tests/Capabilities_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Config_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLL_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dirent_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Set_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Lazy_Map_Manager_Test.dsp:
-        * tests/Log_Msg_Test.dsp:
-        * tests/MEM_Stream_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Malloc_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/Message_Queue_Test_Ex.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OS_Test.dsp:
-        * tests/Object_Manager_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Manager_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Refcounted_Auto_Ptr_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-        * tests/Upgradable_RW_Test.dsp:
-        * tests/version_tests/Atomic_Op_Test.dsp: (removed)
-        * tests/version_tests/Auto_IncDec_Test.dsp: (removed)
-        * tests/version_tests/Barrier_Test.dsp: (removed)
-        * tests/version_tests/Basic_Types_Test.dsp: (removed)
-        * tests/version_tests/Buffer_Stream_Test.dsp: (removed)
-        * tests/version_tests/CDR_Array_Test.dsp: (removed)
-        * tests/version_tests/CDR_File_Test.dsp: (removed)
-        * tests/version_tests/CDR_Test.dsp: (removed)
-        * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed)
-        * tests/version_tests/Cached_Conn_Test.dsp: (removed)
-        * tests/version_tests/Capabilities_Test.dsp: (removed)
-        * tests/version_tests/Collection_Test.dsp: (removed)
-        * tests/version_tests/Config_Test.dsp: (removed)
-        * tests/version_tests/Conn_Test.dsp: (removed)
-        * tests/version_tests/DLL_Test.dsp: (removed)
-        * tests/version_tests/DLList_Test.dsp: (removed)
-        * tests/version_tests/Dirent_Test.dsp: (removed)
-        * tests/version_tests/Dynamic_Priority_Test.dsp: (removed)
-        * tests/version_tests/Enum_Interfaces_Test.dsp: (removed)
-        * tests/version_tests/Env_Value_Test.dsp: (removed)
-        * tests/version_tests/Future_Set_Test.dsp: (removed)
-        * tests/version_tests/Future_Test.dsp: (removed)
-        * tests/version_tests/Handle_Set_Test.dsp: (removed)
-        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed)
-        * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/High_Res_Timer_Test.dsp: (removed)
-        * tests/version_tests/IOStream_Test.dsp: (removed)
-        * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Log_Msg_Test.dsp: (removed)
-        * tests/version_tests/MEM_Stream_Test.dsp: (removed)
-        * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed)
-        * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed)
-        * tests/version_tests/MT_SOCK_Test.dsp: (removed)
-        * tests/version_tests/Malloc_Test.dsp: (removed)
-        * tests/version_tests/Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Map_Test.dsp: (removed)
-        * tests/version_tests/Mem_Map_Test.dsp: (removed)
-        * tests/version_tests/Message_Block_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed)
-        * tests/version_tests/Naming_Test.dsp: (removed)
-        * tests/version_tests/New_Fail_Test.dsp: (removed)
-        * tests/version_tests/Notify_Performance_Test.dsp: (removed)
-        * tests/version_tests/OS_Test.dsp: (removed)
-        * tests/version_tests/Object_Manager_Test.dsp: (removed)
-        * tests/version_tests/OrdMultiSet_Test.dsp: (removed)
-        * tests/version_tests/Pipe_Test.dsp: (removed)
-        * tests/version_tests/Priority_Buffer_Test.dsp: (removed)
-        * tests/version_tests/Priority_Reactor_Test.dsp: (removed)
-        * tests/version_tests/Priority_Task_Test.dsp: (removed)
-        * tests/version_tests/Process_Manager_Test.dsp: (removed)
-        * tests/version_tests/Process_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Process_Strategy_Test.dsp: (removed)
-        * tests/version_tests/RB_Tree_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Notify_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Performance_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Timer_Test.dsp: (removed)
-        * tests/version_tests/Reactors_Test.dsp: (removed)
-        * tests/version_tests/Reader_Writer_Test.dsp: (removed)
-        * tests/version_tests/Recursive_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed)
-        * tests/version_tests/Reverse_Lock_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Connector_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Test.dsp: (removed)
-        * tests/version_tests/SPIPE_Test.dsp: (removed)
-        * tests/version_tests/SString_Test.dsp: (removed)
-        * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed)
-        * tests/version_tests/Semaphore_Test.dsp: (removed)
-        * tests/version_tests/Service_Config_Test.dsp: (removed)
-        * tests/version_tests/Sigset_Ops_Test.dsp: (removed)
-        * tests/version_tests/Simple_Message_Block_Test.dsp: (removed)
-        * tests/version_tests/Svc_Handler_Test.dsp: (removed)
-        * tests/version_tests/TSS_Test.dsp: (removed)
-        * tests/version_tests/Task_Test.dsp: (removed)
-        * tests/version_tests/Thread_Manager_Test.dsp: (removed)
-        * tests/version_tests/Thread_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed)
-        * tests/version_tests/Thread_Pool_Test.dsp: (removed)
-        * tests/version_tests/Time_Service_Test.dsp: (removed)
-        * tests/version_tests/Time_Value_Test.dsp: (removed)
-        * tests/version_tests/Timeprobe_Test.dsp: (removed)
-        * tests/version_tests/Timer_Queue_Test.dsp: (removed)
-        * tests/version_tests/Tokens_Test.dsp: (removed)
-        * tests/version_tests/UPIPE_SAP_Test.dsp: (removed)
-        * tests/version_tests/Upgradable_RW_Test.dsp: (removed)
-        * tests/version_tests/run_all_tests.bat: (removed)
-        * tests/version_tests/version_tests.dsw: (removed)
-
-          Moved the version_tests back into the tests/*.dsp files.  The
-          reason they were originally moved is because it was easier to
-          select all the debug versions during a batch build.  But now
-          we have pippen.pl and msvc_auto_compile.pl, so this is no
-          longer an issue, while this strange setup would compilicate the
-          nightly builds.  Thus, it was standardized back.
-
-        * bin/create_vt_dsps.pl: (removed)
-
-          No need for this anymore.
-
-Sun Mar  4 19:27:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/Log_Msg.cpp:
-        * ace/Log_Msg_NT_Event_Log.h:
-        * ace/OS.cpp:
-
-          Disabled Log_Msg_NT_Event_Log on Windows CE.
-
-Sun Mar 04 13:19:35 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao.doxygen:
-          Add .txt files, so we can add web pages to the basic TAO
-          documentation.
-
-Sun Mar 04 10:58:08 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT
-          project files.
-
-Sun Mar  4 10:41:57 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Log_Msg.cpp,
-          ace/Log_Msg.h,
-          ace/Logging_Strategy.cpp,
-          ace/Makefile.bor,
-          ace/OS.cpp,
-          ace/OS.h,
-          ace/OS.i,
-          ace/ace.rc: Added support for the new NT event logging capability.
-          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-        * ace/Log_Msg_NT_Event_Log.cpp
-          ace/Log_Msg_NT_Event_Log.h
-          ace/ace_message_table.bin:  Added these files to support the new
-          NT event logging capability.
-          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing
-          this.
-
-Sun Mar  4 04:46:44 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/nightlybuilds/builds.lst:
-
-          Added new Windows CE nightly build.
-
-Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
-          typed in as ACE_STATIC_LIBS.
-
-        * ace/svc_export.h:
-        * ace/RMCast/RMCast_Export.h:
-        * ace/SSL/SSL_Export.h:
-        * websvcs/lib/websvcs_export.h: These files didn't check for
-          ACE_AS_STATIC_LIBS to determine if they should define their
-          export macros for static build.  Thanks to Chris Kohlhoff
-          <chris@kohlhoff.com> for reporting this.       [Bug 813]
-
-Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * ace/QoS/QoS_Session_Impl.cpp:
-        * ace/QoS/QoS_Session_Impl.i:
-        * examples/QOS/Fill_ACE_QoS.cpp:
-        * examples/QOS/Fill_ACE_QoS.h:
-        * examples/QOS/Makefile:
-        * examples/QOS/QoS_Util.cpp:
-        * examples/QOS/Receiver_QoS_Event_Handler.cpp:
-        * examples/QOS/Sender_QoS_Event_Handler.cpp:
-          Fixed various compile warnings when compiling with rapi=1 on
-          Redhat Linux 6.2
-
-Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Changed the detection pattern a bit to pick up
-          stuff like:
-
-          void
-          operator < (...)
-
-          better.
-
-        * ace/Auto_Ptr.i:
-        * ace/Base_Thread_Adapter.cpp:
-        * ace/Based_Pointer_T.i:
-        * ace/Connector.cpp:
-        * ace/Containers_T.cpp:
-        * ace/DEV_Addr.i:
-        * ace/Dynamic.i:
-        * ace/FILE.cpp:
-        * ace/Flag_Manip.i:
-        * ace/Handle_Set.i:
-        * ace/Hash_Map_Manager_T.cpp:
-        * ace/Lib_Find.cpp:
-        * ace/Local_Name_Space_T.cpp:
-        * ace/Local_Tokens.cpp:
-        * ace/MEM_Addr.i:
-        * ace/Malloc.cpp:
-        * ace/Malloc_Allocator.cpp:
-        * ace/Malloc_T.cpp:
-        * ace/Memory_Pool.cpp:
-        * ace/Message_Block.cpp:
-        * ace/Message_Block.i:
-        * ace/Message_Block_T.cpp:
-        * ace/Message_Queue.i:
-        * ace/Message_Queue_T.cpp:
-        * ace/Message_Queue_T.i:
-        * ace/Naming_Context.cpp:
-        * ace/OS.cpp:
-        * ace/OS.i:
-        * ace/PI_Malloc.cpp:
-        * ace/POSIX_Asynch_IO.cpp:
-        * ace/Process_Manager.cpp:
-        * ace/QtReactor.cpp:
-        * ace/RB_Tree.i:
-        * ace/RW_Process_Mutex.cpp:
-        * ace/Reactor.cpp:
-        * ace/Remote_Name_Space.cpp:
-        * ace/Remote_Tokens.cpp:
-        * ace/SOCK_Dgram.i:
-        * ace/SString.cpp:
-        * ace/SUN_Proactor.cpp:
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Service_Object.i:
-        * ace/Service_Repository.cpp:
-        * ace/Signal.cpp:
-        * ace/Signal.i:
-        * ace/Svc_Handler.cpp:
-        * ace/Synch.cpp:
-        * ace/Synch_T.cpp:
-        * ace/Thread_Adapter.cpp:
-        * ace/Thread_Manager.cpp:
-        * ace/Timer_Heap_T.cpp:
-        * ace/TkReactor.cpp:
-        * ace/Token.cpp:
-        * ace/Token_Manager.cpp:
-        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
-        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
-        * netsvcs/ACE-netsvcs.html:
-        * netsvcs/lib/Server_Logging_Handler_T.cpp:
-        * netsvcs/lib/Token_Handler.cpp:
-
-          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
-
-        * docs/ACE-categories.html:
-        * docs/ACE-porting.html:
-        * docs/ACE-subsets.html:
-        * docs/tutorials/new-tutorials.html:
-
-          Changed references to
-          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
-          relative paths instead (Fixes the last of the fuzz errors).
-
-Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
-          Added macros tha expand to multiple libraries
-          on QNX RTP to fix most of the link problems.
-
-Fri Mar  2 16:35:58 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/config-win32-borland.h:
-
-          Added /**/ to #include <vcl.h> so it isn't picked up by
-          MSVC-based dependency generators.
-
-Fri Mar 02 19:36:22 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and
-          errno is EAGAIN, change it to EWOULDBLOCK. Improve portability
-          for platforms where EAGAIN and EWOULDBLOCK are different values
-          and both used, like HP-UX.  Thanks to Mike Snowy
-          <snowymike@aol.com> for reporting this problem.
-
-        * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX.
-          This makes it pick up the EAGAIN->EWOULDBLOCK change.
-
-        * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where
-          ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless
-          ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree
-          will get ENOTSUP anyway.
-
-Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
-
-        * ace/QtReactor.cpp:
-          Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting
-          and fixing the problem - crashing of TAO/tests/QtTests/ client
-          example after moving the slider.
-
-Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/MEM_Acceptor.cpp:
-        * ace/MEM_Acceptor.h:
-        * ace/MEM_Addr.cpp:
-        * ace/MEM_Addr.h:
-        * ace/MEM_Connector.cpp:
-        * ace/MEM_Connector.h:
-        * ace/MEM_IO.cpp:
-        * ace/MEM_IO.h:
-        * ace/MEM_SAP.cpp:
-        * ace/MEM_SAP.h:
-        * ace/MEM_Stream.cpp:
-        * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
-          not to support position independent pointers.
-
-Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
-
-        * examples/IOStream/server/iostream_server.cpp (main): Removed the
-          call to register peer_acceptor with the reactor. The acceptor::open
-          call already registers for ACCEPT_MASK. Prevents leaving a hanging
-          READ_MASK registered after the acceptor is destroyed when main()
-          returns. This fixes Bugzilla # 801. Thanks to Pim Philipse
-          <pph@rogan-medical.com> for reporting this.
-
-        * THANKS: Added Pim Philipse to the Hall of Fame.
-
-Fri Mar 02 12:24:27 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions
-          (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set
-          ACE_NEW_THROWS_EXCEPTIONS either).
-
-        * ace/Thread_Manager.cpp (join_thr): Moved the code for
-          ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here
-          to ACE_OS::thr_join (which this function calls) so that
-          ACE_Thread::join also causes a pthread_detach. This is needed
-          on Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread
-          storage and avoid leaking memory. Thanks to Vladimir Kondratiev
-          <vladimir.kondratiev@intel.com> for reporting this and providing
-          excellent test cases to help resolve it quickly.
-
-        * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from
-          ACE_Thread_Manager::join_thr, above.
-
-        * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard
-          around purge_pending_notifications to prevent against an
-          ENOTSUP from purge_pending_notifications.
-
-Thu Mar  1 17:02:10 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          Fixed up the Spawn code to use the Executable ()
-          instead of {EXECUTABLE}, since that's how we get the
-          adjusted name (with .exe and stuff).  And also
-          skipped the file existance with IgnoreExeSubDir, since
-          IgnoreExeSubDir is often used when you need to find
-          the program in the path.
-
-Thu Mar  1 15:48:10 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Fuzz was being a bit to eager with the class matching in
-          the TRACE test.  It was having problems with something like:
-
-          char *foo::bar ()
-
-          since it thought the class was "char *foo" instead of just
-          "foo".
-
-          But it is feeling muuuuuuch better now.
-
-Thu Mar  1 13:18:07 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Added two new tests:
-
-          - absolute ACE_wrappers test:
-
-            Check for ~schmidt/ACE_wrappers in html files.  These should
-            be relative links since these html files already exist in
-            their own ACE_wrappers tree.
-
-          - TRACE test:
-
-            Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually
-            refers to the function/method it is in.
-
-          And expanded the checks in the bad run_test test (level 6)
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          - Added checks for file existence before running.
-          - Added IgnoreExeSubDir option.
-          - Added TerminateWaitKill method.
-
-        * bin/pippen.pl: (added)
-        * bin/PerlACE/MSProject.pm: (added)
-        * bin/PerlACE/MSProject/DSP.pm: (added)
-        * bin/PerlACE/MSProject/VCP.pm: (added)
-
-          There is nothing to see here...please be on your way.
-
-          It isn't like this is a super top secret project to
-          replace msvc_auto_compile.pl with something that works
-          better and also has a cool code-name that is shorter
-          than "msvc_auto_compile.pl".
-
-          But remember, you didn't hear that from me.
-
-Thu Mar  1 10:54:23 2001  Ossama Othman  <ossama@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Added the TAO Codec to the list of tests to run.
-
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Fixed all incorrect uses of CFLAGS and CCFLAGS where
-          preprocessor macros were defined.  Preprocessor macros should be
-          defined in the CPPFLAGS variable.
-
-          Define ACE_USE_RCSID in non-debug builds (i.e. debug=0).
-
-Thu Mar 01 07:29:58 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_run_tests.lst:
-          Fixed typos in the Service_Context_Manipulation test.  It was
-          running in platforms where it shouldn't.
-
-Thu Mar 01 07:07:03 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * include/makeinclude/recurse.bor:
-          Added support for makefiles which contain multiple targets.
-
-        * examples/IPC_SAP/SOCK_SAP/Makefile.bor:
-        * examples/Log_Msg/Makefile.bor:
-        * examples/Map_Manager/Makefile.bor:
-        * examples/Mem_Map/file-reverse/Makefile.bor:
-        * examples/RMCast/Send_File/Makefile.bor:
-        * examples/Service_Configurator/IPC-tests/client/Makefile.bor:
-        * examples/Threads/Makefile.bor:
-        * netsvcs/clients/Logger/Makefile.bor:
-        * tests/Makefile.bor:
-        * tests/RMCast/Makefile.bor:
-          Updated to work with new multi-target makefile support.
-
-Wed Feb 28 22:58:50 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * html/index.html:
-          Reference */index.html directly, instead of assuming that the
-          web browser will use index.html as the default file, this also
-          works better when browsing locally.  Thanks to Alain Decamps
-          <Alain.Decamps@pidpa.be> for pointing this out.
-
-Wed Feb 28 16:41:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * docs/bugzilla-build-setup.html:
-
-          Updated the section about the scoreboard and added a
-          placeholder for Win32 nightly build information.
-
-Wed Feb 28 16:04:14 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and
-          Messaging support disabled for the nightly builds.
-
-Wed Feb 28 15:35:59 2001  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * docs/bugzilla-build-setup.html:
-          Added html file outlining steps for adding a bugzilla
-          nightly build.
-
-Wed Feb 28 00:25:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          The examples/POA/Adapter_Activator/run_test.pl test was being run
-          twice.  In fairness to all the other tests that only get to run once,
-          I removed the second instance.
-
-Tue Feb 27 17:31:48 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for
-          the threads=0 build - this enables the reentrant functions which
-          are present, threads or not. It does not turn on threads, which
-          are instead enabled by -D_POSIX_C_SOURCE=199506L.
-
-        * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-        * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to
-          the POSIX.1c-conformant version of rand_r. Allows clean compile
-          on HP-UX 11 without thread support.
-          Also lined up some misaligned #if/else/endif lines to make it
-          easier to find one's way through.
-
-        * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the
-          ways to get the POSIX.1c-conformant version of readdir_r. Allows
-          clean compile on HP-UX 11 without thread support.
-
-Tue Feb 27 11:38:38 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * performance-tests/TCP/tcp_test.cpp (main): Zapped the
-          non-existent '-f' option.  Thanks to Mike Curtis for reporting
-          this.
-
-        * performance-tests/TCP/tcp_test.cpp (main): Check for improper
-          bufsz.  Thanks to Mike Curtis for reporting this.
-
-        * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t'
-          option, which specifies the number of threads.
-
-        * performance-tests/TCP/README: Fixed a typo.  Thanks to
-          Mike Curtis for reporting this.
-
-Tue Feb 27 10:51:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * bin/auto_run_tests.lst: Added the AMI tests to the daily
-          builds.
-
-Tue Feb 27 10:23:20 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES
-          to ChangeLog*. This should help us to avoid missing ChangeLog
-          entries in the beta distribution, just about every time we split
-          and add a ChangeLog.
-
-Mon Feb 27 07:39:16 2001  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-
-          Removed suppression of Future Error 129.
-          Removed the use of CFLAGS.
-
-        * ace/OS.h:
-        * ace/config-hpux-11.00.h:
-
-          Modification to remove system header macro definition conflicts.
-          This change does not suppress the conflicts, but does an undef
-          of the two conflicting macros before includeing tcp.h.  Thanks
-          to Sam Chong <sam@i2i-inc.com> for reporting this problem.
-
-Mon Feb 26 19:01:16 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Logging_Strategy.{h,cpp}: Added a new -k option to
-          set the logging key via the ACE_Logging_Strategy.  Thanks to
-          Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-Mon Feb 26 18:18:38 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/SString.i
-          (ACE_CString::find (const char *s, int pos) const):
-          (ACE_CString::find (char c, int pos) const):
-          (ACE_SString::find (const char *s, int pos) const):
-          (ACE_SString::find (char c, int pos) const):
-          (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const):
-          If match is found, return index from start of string, not from
-          'pos'. Matches the C++ string standard, which was the model for
-          these classes.
-          Thanks to Glen Osterhout <gosterho@elronsw.com> for this fix.
-
-        * ace/SString.h: Clarified comments on return value for above
-          functions.
-
-        * tests/SString_Test.cpp: Changed to look for the correct return
-          from the npos tests of the functions above.
-
-        * THANKS: Added Glen Osterhout to the Hall of Fame.
-
-Mon Feb 26 15:01:55 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test_Impl.dsp:
-        * tests/version_tests/DLL_Test_Impl.dsp: (removed)
-
-          Me thinks that the Release and Static configurations should
-          also compile, and me thinks that it is now fixed.
-
-Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
-          method assumes ownership of <next_arg>, rather than copying it.
-          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
-          Fixes [Bug 807].
-
-          The generated version_tests dsp didn't work (since DLL_Test_Impl
-          creates a library).  Manually created the configurations in the
-          tests/DLL_Test_Impl.dsp version instead.
-
-Mon Feb 26 15:54:33 2001  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b)
-
-        * docs/tutorials/013/message_queue.cpp:
-        * tests/Malloc_Test.cpp:
-
-        Fixed errors in #pragma instiate lines including removal of ';',
-        mispellings
-
-        * ace/config-all.h:
-
-        Added definition of Unixware UDK for definition of ACE_NOTREACHED()
-
-        * ace/config-unixware-7.1.0.udk.h:
-        * include/makeinclude/platform_unixware_udk.GNU:
-
-        New configuration files for building on Unixware 7 with UDK CC.
-
-Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
-          method assumes ownership of <next_arg>, rather than copying it.
-          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
-          Fixes [Bug 807].
-
-Mon Feb 26 12:27:46 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.i:
-
-          Added method to reset the byte order in class OuputCDR.  This
-          will be used by a gateway to set the byte order of a reply to a
-          reqest it has handled to one different than the gateway's own
-          byte order, if necessary. It should be called while the stream
-          is still empty, that is, before any part of the reply, including
-          the header, has been marshaled.
-
-Mon Feb 26 12:07:00 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before
-          setting the MAP_FIXED flag.  Thanks to <rhuber@amadeus.net> for
-          reporting this. [Bug 752]
-
-Mon Feb 26 09:29:36 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/RB_Tree.h:
-          Fully qualified enum name. This fixes problems on gcc-272 builds.
-
-Mon Feb 26 00:19:28 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        Time to do some spring cleaning...
-
-        * tests/version_tests/Config_Test.dsp: (added)
-        * tests/version_tests/DLL_Test_Impl.dsp: (added)
-        * tests/version_tests/Log_Msg_Test.dsp: (added)
-        * tests/version_tests/Message_Queue_Test_Ex.dsp: (added)
-        * tests/version_tests/version_tests.dsw:
-
-          Updated the version_tests dir with create_vt_dsps.pl.
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-        * netsvcs/lib/netsvcs.dsp:
-        * netsvcs/servers/servers.dsp:
-        * tests/ACE_Init_Test.dsp:
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Auto_IncDec_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Array_Test.dsp:
-        * tests/CDR_File_Test.dsp:
-        * tests/CDR_Test.dsp:
-        * tests/Cache_Map_Manager_Test.dsp:
-        * tests/Cached_Accept_Conn_Test.dsp:
-        * tests/Cached_Conn_Test.dsp:
-        * tests/Capabilities_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Config_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLL_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dirent_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Set_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Lazy_Map_Manager_Test.dsp:
-        * tests/Log_Msg_Test.dsp:
-        * tests/MEM_Stream_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Malloc_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/Message_Queue_Test_Ex.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OS_Test.dsp:
-        * tests/Object_Manager_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Manager_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Refcounted_Auto_Ptr_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-        * tests/Upgradable_RW_Test.dsp:
-
-          Removed the Alpha configurations.  I don't think we've
-          actually looked at these for over a year, and they are
-          missing from a lot of projects.  Thankfully, they are easy
-          to recreate if they are needed.
-
-        * ACE-INSTALL.html:
-
-          Changed the Windows NT Alpha section to mention that we
-          no longer have configurations out of the box for Win32/Alpha,
-          they must be recreated if needed.
-
-        * WindozeCE/ACEApp.cpp: (removed)
-        * WindozeCE/ACEApp.h: (removed)
-        * WindozeCE/README: (removed)
-        * WindozeCE/StdAfx.cpp: (removed)
-        * WindozeCE/StdAfx.h: (removed)
-        * WindozeCE/WindozeCE.aps: (removed)
-        * WindozeCE/WindozeCE.clw: (removed)
-        * WindozeCE/WindozeCE.cpp: (removed)
-        * WindozeCE/WindozeCE.dsp: (removed)
-        * WindozeCE/WindozeCE.h: (removed)
-        * WindozeCE/WindozeCE.rc: (removed)
-        * WindozeCE/WindozeCEDlg.cpp: (removed)
-        * WindozeCE/WindozeCEDlg.h: (removed)
-        * WindozeCE/resource.h: (removed)
-        * WindozeCE/res/WindozeCE.ico: (removed)
-        * WindozeCE/res/WindozeCE.rc2: (removed)
-
-          No longer used.
-
-        * Makefile:
-
-          Removed WindozeCE from CONTROLLED_FILES.
-
-        * tests/WinCE/Atomic_Op_Test.dsp: (removed)
-        * tests/WinCE/Barrier_Test.dsp: (removed)
-        * tests/WinCE/Basic_Types_Test.dsp: (removed)
-        * tests/WinCE/Buffer_Stream_Test.dsp: (removed)
-        * tests/WinCE/Conn_Test.dsp: (removed)
-        * tests/WinCE/DLL_Test.dsp: (removed)
-        * tests/WinCE/Enum_Interfaces_Test.dsp: (removed)
-        * tests/WinCE/Future_Test.dsp: (removed)
-        * tests/WinCE/Handle_Set_Test.dsp: (removed)
-        * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed)
-        * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed)
-        * tests/WinCE/MT_SOCK_Test.dsp: (removed)
-        * tests/WinCE/Map_Manager_Test.dsp: (removed)
-        * tests/WinCE/Mem_Map_Test.dsp: (removed)
-        * tests/WinCE/Message_Block_Test.dsp: (removed)
-        * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed)
-        * tests/WinCE/Message_Queue_Test.dsp: (removed)
-        * tests/WinCE/Notify_Performance_Test.dsp: (removed)
-        * tests/WinCE/OrdMultiSet_Test.dsp: (removed)
-        * tests/WinCE/Priority_Buffer_Test.dsp: (removed)
-        * tests/WinCE/Priority_Task_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Notify_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Performance_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Timer_Test.dsp: (removed)
-        * tests/WinCE/Reactors_Test.dsp: (removed)
-        * tests/WinCE/Reader_Writer_Test.dsp: (removed)
-        * tests/WinCE/Recursive_Mutex_Test.dsp: (removed)
-        * tests/WinCE/SOCK_Connector_Test.dsp: (removed)
-        * tests/WinCE/SOCK_Test.dsp: (removed)
-        * tests/WinCE/SString_Test.dsp: (removed)
-        * tests/WinCE/Semaphore_Test.dsp: (removed)
-        * tests/WinCE/Sigset_Ops_Test.dsp: (removed)
-        * tests/WinCE/Simple_Message_Block_Test.dsp: (removed)
-        * tests/WinCE/TSS_Test.dsp: (removed)
-        * tests/WinCE/Task_Test.dsp: (removed)
-        * tests/WinCE/Thread_Manager_Test.dsp: (removed)
-        * tests/WinCE/Thread_Mutex_Test.dsp: (removed)
-        * tests/WinCE/Thread_Pool_Test.dsp: (removed)
-        * tests/WinCE/Time_Value_Test.dsp: (removed)
-        * tests/WinCE/Timer_Queue_Test.dsp: (removed)
-        * tests/WinCE/ce_tests.dsw: (removed)
-
-          Removed these Windows CE Toolkit for Visual C++ files.
-
-Mon Feb 26 00:15:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test_Impl.dsp:
-
-          Made sure the Code Generation settings were correct.
-
-Sun Feb 25 19:40:11 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/ACEutils.pm (CheckForConfig):
-          This routine was not removing all the -Config options from the
-          command-line, causing problems in some of the tests.
-
-Sun Feb 25 16:33:26 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test.cpp:
-
-          Left the DLL end with a d in debug mode, but changed
-          the test to add the d when _DEBUG and ACE_WIN32 is
-          defined.  Test should now work again on Win2000_Debug.
-
-Sun Feb 25 11:28:06 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/run_test.pl:
-
-          When there are errors in the log, print out the entire
-          log.  This should make it much easier to understand
-          problems in the nightly build logs.
-
-Sun Feb 25 09:04:43 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/DLL_Test.cpp:
-          Accidentally left the 'd' suffix in the name of the DLL.
-
-Sat Feb 24 22:58:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/msvc_auto_compile.pl:
-        * TAO/TAOACE.dsw:
-        * TAO/TAOACE_Static.dsw:
-        * Static_Performance.dsw:
-
-          Removed references to gperf_lib.dsp
-
-        * TAO/version_tests.dsw: (removed)
-
-          This was still referring to orbsvcs.dsp, which shows that
-          it is way out of date (and not used).  Zapped.
-
-Sat Feb 24 20:59:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * apps/gperf/src/gperf.dsp:
-        * apps/gperf/src/gperf.dsw:
-        * apps/gperf/src/gperf_lib.dsp: (removed)
-
-          Merged gperf into one project.  This will bring the
-          structure in line with the Makefiles.
-
-Sat Feb 24 19:28:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-
-          Fixed my recent changes to ACE_OS::dlsym () to work on
-          Windows CE.
-
-Sat Feb 24 17:50:38 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test.cpp:
-
-          OBJ_PREFIX was being created by attaching a char string to
-          a ACE_TCHAR string.  Needed to add ACE_TEXT to the first
-          string for compilation on ACE_USES_WCHAR.
-
-        * tests/DLL_Test_Impl.dsp:
-
-          Changed the internal name to "DLL_Test DLL" to make sure
-          this gets compiled in the first pass by msvc_auto_compile.pl.
-
-        * tests/run_test.pl:
-
-          Added a check for LM_WARNINGs in log files.  Let's see if
-          there have been any hidden (DLL_Test actually was producing
-          a warning on Windows, but Carlos's fix already got rid of it,
-          Yay!).
-
-Sat Feb 24 15:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/tests.dsw:
-        * tests/DLL_Test_Impl.dsp:
-          Add new project file for the shared library used in the test.
-
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test_Impl.cpp:
-          Change the Win32 version to load a shared library instead of the
-          exe.
-
-Sat Feb 24 14:07:11 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/Thread_Pool_Reactor_Test.cpp:
-
-          Did a careful study of what this test was doing in regards to
-          sending wide-character strings, and made it consistent.  The
-          most troublesome aspect was the fact that the length is encoded
-          in the shutdown string ("\011shutdown") which meant that I had
-          to send the length in characters, not in bytes.  This should
-          really fix [Bug 537].
-
-Sat Feb 24 14:37:00 2001  Craig Rodrigues <crodrigu@bbn.com>
-
-        * ace/config-g++-common.h
-          gcc 2.97 and higher require the use of the std namespace for
-          iostrams
-
-Sat Feb 24 10:27:04 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_run_tests.lst:
-          Disable the interceptor tests when the ORB is compiled without
-          interceptor support.
-
-        * tests/run_test.lst:
-          Disable the Reactor_Notify_Test on single threaded builds, it
-          uses threads.
-
-        * bin/nightlybuilds/scoreboard_update.pl:
-          Fixed usage message.
-
-Sat Feb 24 09:45:18 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/run_test.lst:
-          Disable the DLL_Test on KCC/Linux builds.  The test runs
-          normally, but crashes on shutdown(), it appears as if the
-          run-time system is invoking the destructors after the library is
-          unloaded.
-
-        * tests/Makefile:
-        * tests/Makefile.DLL_Test:
-        * tests/DLL_Test.h:
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test_Impl.h:
-        * tests/DLL_Test_Impl.cpp:
-          Cleanup code, and truly separate the shared library code to a
-          completely new separate file.
-
-Sat Feb 24 09:51:45 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_compile:
-          Pass the -Config options to each script, this helps the
-          $ACE_ROOT/bin/run_test.pl script that needs to disable some
-          tests in certain configurations.
-
-Sat Feb 24 08:21:48 2001  David L. Levine <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          added -fno-implicit-templates on Tornado II for Intel 386
-          family targets.  Thanks to Albert Wijnja <Albert.Wijnja@meco.nl>
-          for reporting that static template data members weren't really on
-          VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com>
-          for confirming that -fno-implicit-templates should work with
-          the Tornado II g++.  [Bug 658]
-
-Thu Feb 22 15:59:04 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the
-          function as "localtime".  This is now fixed.  Thanks to Mason
-          Deaver <mason.deaver@tripointglobal.com> for reporting this.
-
-Fri Feb 23 19:44:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ACE version 5.1.13 released.
-
-Thu Feb 22 12:28:15 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/TP_Reactor.cpp (handle_events): Here is the description of
-          how things were working and where the problem was: In the
-          TP_Reactor there is one leader thread waiting in select() and
-          the others waiting on the token.  During deactivation(), the
-          <deactivation_> flag is set on the reactor, signal_all_threads()
-          is called on the token, and an empty notification is send to the
-          current leader thread.  signal_all_threads() sets the
-          <signal_all_threads_> flag on the Token when there are waiters
-          on the Token (does nothing if there are no waiters).  This
-          scheme worked fine when there were leader and follower threads
-          waiting.  When a new leader is chosen, it returns the magic
-          number 2 from token.acquire_read() and hence exits gracefully
-          from the handle_events().  However, the problem was that when
-          some (or all) of the TP threads are busy running upcalls,
-          signal_all_threads() was a no-op and the magic number 2 was not
-          returned from token.acquire_read() and hence the exit from
-          handle_events() was flagged as an error.
-
-          The fix is as described below:
-
-          (1) ACE_Token::signal_all_threads() does not make sense.  The
-          token is a mutex, not a condition variable.  Therefore, it does
-          not make sense to have a signal_all_threads() methods.  Plus I
-          believe that the method does not do as advertised.  Therefore, I
-          removed this method from the token class.
-
-          (2) There is no need to signal all the threads in the
-          TP_Reactor.  Marking the Reactor as closed and signaling the
-          leader thread is enough.  The leader thread will wake up to
-          handle the empty event, the next leader will see that the
-          Reactor is closed and exit gracefully.  This will continue until
-          all the waiters are drained.
-
-          (3) With the above change, there is no need to check for an
-          magic returns from token.acquire_read().  When a thread gets the
-          token, it checks the deactivation flag before proceeding.  If
-          the Reactor is closed, it gracefully exits.  Otherwise, it
-          continues as leader.
-
-          (4) Since there is no need to call token.signal_all_threads(),
-          ACE_TP_Reactor::wakeup_all_threads() can be removed since it is
-          now the same as ACE_Select_Reactor_T::wakeup_all_threads().
-
-          Note that this change should help with making
-          Thread_Pool_Reactor_Test run without shutdown errors.
-
-        * ace/Select_Reactor_T.i (deactivate): The setting of the
-          <deactivated_> flag and waking up of all the threads should be
-          atomic.  I am being picky about this one but I think am I right.
-          Also added the guard to the accessor.
-
-Thu Feb 22 08:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-
-          Bleh.  Changed an && to || to make sure we get a symbolname
-          variable for non-Unicode Win32.
-
-          "He who lives without committing any folly is not so
-          wise as he thinks"  - La Rochefoucauld
-
-Thu Feb 22 08:43:30 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * include/makeinclude/rules.local.GNU:
-          Add SunWS_cache and ir.out to the list of files removed by
-          the realclean pseudo-target.  This directory is used by Sun/CC
-          5.0 (and Forte), if not removed the information there can become
-          stale, and break the builds.
-          This should fix the Sun/CC 5.0 nightly builds.
-
-Thu Feb 22 07:51:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
-          Krishnakumar B  <kitty@ace.cs.wustl.edu> ".
-
-Thu Feb 22 03:31:06 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
-
-        * ace/OS.i (dlsym):
-          Hopefully fixed the Win32 builds. Removed a extra ! in the
-          #ifdef.
-
-Thu Feb 22 02:58:36 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
-
-        * VERSION:
-        * PROBLEM-REPORT-FORM:
-        * ace/Version.h:
-        Reverted the changes and restored the old versions of
-        these files as the beta build script was killed. Pain :-(
-
-Wed Feb 21 20:10:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-        * tests/DLL_Test.cpp:
-        * tests/Thread_Pool_Reactor_Test.cpp:
-
-          Fixed the remaining problems with the Win2000_Unicode tests.
-          [Bug 537]
-
-Tue Feb 20 21:19:39 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * ace/Svc_Conf.h:
-          Add ACE_Export macro for ace_create_service_type() it is used
-          outside the library now.
-
-Tue Feb 20 06:34:26 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly
-          set ACE_HAS_GNUG_PRE_2_8.  Thanks to Christian von Mueffling
-          <cvm@aiss.de> for reporting this.
-
-        * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
-          the ACE_TRACE macro.  Thanks to Mike Curtis for reporting this.
-
-Mon Feb 19 16:38:08 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ace/Asynch_Acceptor.{h,cpp}:
-        Added method void handle (ACE_HANDLE) and made it call the base
-        class's handle(ACE_HANDLE) method to remove warning about
-        partial overloading. Fix suggested by Irfan.
-
-Sun Feb 18 21:55:16 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ace/OS.h:
-        Added an extern "C" void ace_mutex_lock_cleanup_adapter before
-        the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on
-        SunCC 5.x.
-
-Sun Feb 18 17:16:41 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * netsvcs/clients/Tokens/manual/manual.cpp (main),
-        * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
-          ACE_HAS_TOKENS_LIBRARY stuff.  Thanks to Kitty for reporting
-          this.
-
-Sun Feb 18 16:28:45 2001  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.h: Changed order of method declarations to (hopefully)
-          dodge an internal compiler error on VxWorks.
-
-Sun Feb 18 09:59:18 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * netsvcs/clients/Tokens:
-        * netsvcs/servers/main.cpp (main):
-        * netsvcs/servers/svc.conf:
-        * netsvcs/lib/Token_Handler: Only compile this stuff if the
-          ACE_HAS_TOKENS_LIBRARY macro is enabled.  Thanks to Carlos
-          for reporting this.
-
-        * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY
-          so we can skip initializing certain things if that macro is
-          undefined.
-
-        * ace/Token_Collection.*:
-        * ace/Token_Invariants.*:
-        * ace/Token_Manager.*:
-        * ace/Local_Tokens.*:
-        * ace/Remote_Tokens.*:
-        * ace/Token_Request_Reply.*:
-          Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled
-          since this functionality does not appear to be widely used and
-          yet it takes up space.
-
-        * tests/Tokens_Test.cpp (main): Only run this test if
-          ACE_HAS_TOKENS_LIBRARY is defined.
-
-Sat Feb 17 17:23:46 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-
-          Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com>
-          In effect, this reverts the multicast code changed on
-              Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
-          for all platforms except linux.
-
-Sat Feb 17 15:52:09 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/run_all_list.pm:
-        * tests/run_tests.pl:
-          Remove obsolete scripts.
-
-Sat Feb 17 13:26:17 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast
-          -1 to void * since that's the signature of the method.  Thanks
-          to Bala for reporting this.
-
-        * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused
-          result local variable and also changed the logic to bailout if
-          handle_events() returns -1.  This fixes a warning reported by
-          KCC.
-
-Fri Feb 16 17:39:16 2001  Mayur Deshpande  <mayur@ics.uci.edu>
-
-        * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
-
-        * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to
-          CCFLAGS and 'exceptions=1' at end of file.
-          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
-
-Fri Feb 16 05:37:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Logging_Strategy.h: Updated the documentation to explain what
-          the various options mean.
-
-        * tests/Log_Msg_Test.cpp (test_log_msg_features): Added
-          ACE_Log_Msg::PROCESS to a coupld or priority_mask() calls to
-          make the test work correctly.  Thanks to Kitty for reporting
-          this.
-
-Thu Feb 15 17:53:31 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Thread_Manager.i: Simplified casting in
-          ACE_Thread_Descriptor::get_next per suggestion from Carlos.
-
-Thu Feb 15 14:57:59 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next.
-
-Thu Feb 15 11:33:55 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0)
-          to make sure that this test terminates...
-
-        * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to
-          make certain compilers happy.
-
-        * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32.
-
-Thu Feb 15 08:49:44 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/nightlybuilds/builds.lst:
-          Rename WashU builds so all the Debian builds appear together.
-
-Thu Feb 15 07:15:39 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple
-          log files, rather than just two.  Thanks to Orlando Ribeiro
-          <oribeiro@inescporto.pt> for this fix.
-
-Thu Feb 15 03:36:46 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * bin/nightlybuilds/builds.lst (WEB):
-        Added a new build with TAO_MINIMUM linked statically.
-
-Wed Feb 14 05:28:59 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(),
-          task(), get_next(), and self().  Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for reporting this.
-
-Tue Feb 13 17:51:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS.
-          Thanks to Mike Curtis for reporting this.
-
-        * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run.
-          Thanks to Mike Curtis for reporting this.
-
-Wed Feb 14 12:08:10 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read.
-          If record was a multiple of BUFSIZ and the record was
-          terminated with an EOF instead of a "term" character,
-          rec_read would return 0 instead of the actual data read in.
-          The problem was that the partial buffer fill size was being
-          checked instead of the total number of bytes read in.  This
-          issue was noticed when trying to read in an IOR file in TAO
-          that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long.
-
-Tue Feb 13 14:44:28 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_wchar.inl: Changed several variable from type <size_t>
-          to type <int> as on 64-bit whistler, size_t and int are not the
-          same size which confuses 64-bit compiler.  (Per Kitty's
-          request.)
-
-Tue Feb 13 10:23:31 2001  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of
-          handle () method and handle_ member to ACE_Handler). Moved the
-          handle_ member to the JAWS_Synch_IO class - it needs it, and
-          JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left
-          the handle () methods in JAWS_IO, but made them pure virtual,
-          implemented in JAWS_Synch_IO (implementation moved from JAWS_IO)
-          and in JAWS_Asynch_IO, where they forward up to ACE_Handler's
-          handle () methods.
-
-Mon Feb 12 18:18:05 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * tests/Thread_Mutex_Test.cpp:
-          Modified test to use process mutexes for Win32 platforms
-          so that timed mutexes could be tested.
-
-Sun Feb 11 15:33:39 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/QoS/ACE_QoS_Export.h:
-
-          Added ACE_AS_STATIC_LIBS support.
-
-        * ace/QoS/ACE_QoS.dsp:
-        * ace/QoS/ACE_QoS_Lib.dsp:
-
-          Fixed to comply with ACE standards.
-
-Sun Feb 11 10:50:10 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_g++.GNU (exceptions):
-          Only set the -fno-exceptions option if we're *not* using GCC
-          2.7.2!  Thanks to Pradeep for explaining how to do this.
-
-Sun Feb 11 10:15:08 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * ace/Makefile.bor:
-        * ace/QoS/Makefile.bor:
-        * include/makeinclude/ace_flags.bor:
-          Added build support for QoS library with Borland compiler.
-
-Sat Feb 10 15:29:08 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * ace/Message_Block.h:
-          Improved documentation for the lenth(), size() and space()
-          methods.
-
-Sat Feb 10 07:19:37 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * include/makeinclude/outputdir.bor:
-          Removed the now out-of-date comment about pascal/non-pascal
-          build directories.
-
-        * ace/config-win32-borland.h:
-          Added support for new ACE_HAS_VCL define to enable inclusion
-          of VCL header files.
-
-Fri Feb  9 16:47:44 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * ace/Makefile.am:
-          Removed references to the AQoSA files.
-
-Fri Feb  9 16:42:10 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * examples/QOS/client.dsp:
-        * examples/QOS/server.dsp:
-          Updated the corrected project files.
-          Thanks to Darrell for pointing this out.
-
-Thu Feb  8 19:25:03 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * performance-tests/RPC/run_test.pl:
-        * performance-tests/TCP/run_test.pl:
-        * performance-tests/UDP/run_test.pl:
-          Add driver strings
-
-Thu Feb 08 19:18:36 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Removed comment from Exposed Policies test. The test has been fixed.
-
-Thu Feb  8 14:11:36 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/ws2tcpip.h:  [Removed]
-
-          I don't see any reason to have this file in ace; it is a system
-          header file.  And from [Bug 722], our version is out of date anyway.
-
-        * ace/OS.h:
-
-          Changed to include system version of ws2tcpip.h
-
-        * ace/Makefile.am:
-        * ace/ace-dll.icc:
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-
-          Removed references to ws2tcpip.h.
-
-        * ace/SOCK_Connect.cpp:
-
-          Changed get_ip_interfaces to remove a memory error.  Thanks to
-          Viatcheslav Batenine <slavikb@infra2000.com> for helping out with
-          this.
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-
-          It looks like the change made on:
-
-          Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
-
-          doesn't work on Win32.  Reverted back to the old scheme for Win32
-          only.
-
 Thu Feb  8 00:34:57 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * include/makeinclude/platform_sunos5_g++.GNU: Added support for
-          -fno-exception when exceptions=0 is given to the Makefile.
-          Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
-          this.
+	* include/makeinclude/platform_sunos5_g++.GNU: Added support for
+	  -fno-exception when exceptions=0 is given to the Makefile.
+  	  Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
+ 	  this.
 
 Wed Feb  7 23:02:46 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
-          new overridden cancel_aio() method.  Thanks to Alexander Libman
-          <Alibman@baltimore.com> for contributing this.
+	* ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
+	  new overridden cancel_aio() method.  Thanks to Alexander Libman
+ 	  <Alibman@baltimore.com> for contributing this.
 
 Thu Feb  8 02:09:05 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
-        * examples/QOS/Makefile:
-        * examples/QOS/client.dsp:
-        * examples/QOS/server.dsp:
-          Modified to use the ACE_QoS lib.
-        * Receiver_QoS_Event_Handler.cpp:
-        * Sender_QoS_Event_Handler.cpp:
-          Added missing Log_Msg.h for ACE_DEBUG.
-          Other files were modified to reflect changed directory location
-          of AQosA imclude files.
-
+	* examples/QOS/Makefile:
+	* examples/QOS/client.dsp:
+	* examples/QOS/server.dsp:
+	  Modified to use the ACE_QoS lib. 
+	* Receiver_QoS_Event_Handler.cpp:
+	* Sender_QoS_Event_Handler.cpp:
+	  Added missing Log_Msg.h for ACE_DEBUG.
+	  Other files were modified to reflect changed directory location
+	  of AQosA imclude files.
+	
 Thu Feb  8 00:17:43 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
-        * ace/QoS_Decorator.cpp:
-        * ace/QoS_Session_Factory.cpp:
-        * ace/SOCK_Dgram_Mcast_QoS.cpp:
-        * ace/QoS_Decorator.h:
-        * ace/QoS_Session_Factory.h:
-        * ace/SOCK_Dgram_Mcast_QoS.h:
-        * ace/QoS_Manager.cpp:
-        * ace/QoS_Session_Impl.cpp:
-        * ace/SOCK_Dgram_Mcast_QoS.i:
-        * ace/QoS_Manager.h:
-        * ace/QoS_Session_Impl.h:
-        * ace/QoS_Session_Impl.i:
-          Moved the AQoSA classes to ace/QoS directory.
-
-        * ace/Makefile:
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-          Removed the QoS related files, added QoS directory to build.
-
-        * ace/Qos/Makefile
-        * ace/QoS/ACE_QoS.dsw:
-        * ace/QoS/ACE_QoS.dsp:
-        * ace/QoS/ACE_QoS_Lib.dsp:
-        * ace/QoS/ACE_QoS_Export.h:
-          Added Makefile and MSVC project files.
-          Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this
-          change and providing the patch.
+	* ace/QoS_Decorator.cpp:
+	* ace/QoS_Session_Factory.cpp:
+	* ace/SOCK_Dgram_Mcast_QoS.cpp:
+	* ace/QoS_Decorator.h:
+	* ace/QoS_Session_Factory.h:
+	* ace/SOCK_Dgram_Mcast_QoS.h:
+	* ace/QoS_Manager.cpp:
+	* ace/QoS_Session_Impl.cpp:
+	* ace/SOCK_Dgram_Mcast_QoS.i:
+	* ace/QoS_Manager.h:
+	* ace/QoS_Session_Impl.h:
+	* ace/QoS_Session_Impl.i: 
+	  Moved the AQoSA classes to ace/QoS directory.
+
+	* ace/Makefile:
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp:
+	  Removed the QoS related files, added QoS directory to build.
+
+	* ace/Qos/Makefile
+	* ace/QoS/ACE_QoS.dsw:
+	* ace/QoS/ACE_QoS.dsp:	
+	* ace/QoS/ACE_QoS_Lib.dsp:
+	* ace/QoS/ACE_QoS_Export.h:
+	  Added Makefile and MSVC project files.
+	  Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this 
+	  change and providing the patch.
 
 Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
@@ -1607,15 +60,15 @@ Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Wed Feb  7 09:03:22 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
-          incorrect if/else branching.  Thanks to Lu Yunhai
-          <luyunhai@huawei.com> for reporting this.
+	* apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
+	  incorrect if/else branching.  Thanks to Lu Yunhai
+ 	  <luyunhai@huawei.com> for reporting this.
 
 Tue Feb  6 23:43:49 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
-          %s to be %*s since the string may not be nul terminated!  Thanks
-          to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+	* apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
+	  %s to be %*s since the string may not be nul terminated!  Thanks
+ 	  to Lu Yunhai <luyunhai@huawei.com> for reporting this.
 
 Tue Feb  6 20:11:28 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
@@ -1670,8 +123,8 @@ Tue Feb 06 17:16:43 2001  Steve Huston  <shuston@riverace.com>
 
 Mon Feb  5 16:19:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
-          Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+	* ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
+	  Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
 
         * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN
           macros to use the form 0x0123 rather than 0123X.  Thanks to
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f94010c6b8e..72551df7ac5 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,1604 +1,57 @@
-Mon Mar  5 11:29:36 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * docs/ACE-categories.html:
-          Fixed links to the doxygen files.
-
-        * ace/Pipe.cpp:
-          Fixed what looks like a typo, we want to *disable* the stream
-          pipes under QNX, not to enable them just on that platform.
-
-Mon Mar  5 08:20:21 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/RMCast/RMCast_Fragment_Test.cpp:
-        * tests/RMCast/RMCast_Reassembly_Test.cpp:
-          Undo Doug's changes.  They broke the test.
-
-Mon Mar  5 07:52:52 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tests/RMCast/RMCast_Fragment_Test.cpp,
-        * tests/RMCast/RMCast_Reassembly_Test.cpp,
-        * tests/Dynamic_Priority_Test.cpp,
-        * tests/Thread_Pool_Test.cpp: Make sure to write into the
-          wr_ptr() rather than the rd_ptr().  Thanks to Gonzalo Diethelm
-          <Gonzalo.Diethelm@sonda.com> for reporting this.
-
-Mon Mar  5 08:00:23 2001  Chad Elliott  <elliott_c@ociweb.com>
-
-        * bin/nightlybuilds/builds.lst:
-
-          Added new VxWorks 5.4 and Chorus 4.0.1 nightly builds.
-
-Mon Mar 05 00:10:15 2001  Ossama Othman  <ossama@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Updated to detect missing ACE_TRY_ENV parameters in
-          ORB::resolve_initial_references() calls when emulated exceptions
-          are used.  Thanks to Darrell for providing this update.
-
-Mon Mar  5 07:57:07 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * tests/Makefile.bor:
-
-          Added missing Refcounted_Auto_Ptr_Test to the build
-
-Sun Mar  4 19:31:16 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Added the run_test_mt.pl for Leader_Follers.
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          Added a destructor to detect if a process wasn't explicitly
-          killed before the object went out of scope. Will print out
-          an error and kill it.
-
-        * bin/PerlACE/Run_Test.pm:
-
-          Turned on autoflush for all scripts.
-
-        * docs/run_test.txt:
-
-          Updated run_test.pl instructions to fit all the changes I
-          just made.
-
-        * examples/Export/run_test.pl:
-        * performance-tests/RPC/run_test.pl:
-        * performance-tests/TCP/run_test.pl:
-        * performance-tests/UDP/run_test.pl:
-
-          Updated to use PerlACE::Run_Test;
-
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Auto_IncDec_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Array_Test.dsp:
-        * tests/CDR_File_Test.dsp:
-        * tests/CDR_Test.dsp:
-        * tests/Cache_Map_Manager_Test.dsp:
-        * tests/Cached_Accept_Conn_Test.dsp:
-        * tests/Cached_Conn_Test.dsp:
-        * tests/Capabilities_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Config_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLL_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dirent_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Set_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Lazy_Map_Manager_Test.dsp:
-        * tests/Log_Msg_Test.dsp:
-        * tests/MEM_Stream_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Malloc_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/Message_Queue_Test_Ex.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OS_Test.dsp:
-        * tests/Object_Manager_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Manager_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Refcounted_Auto_Ptr_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-        * tests/Upgradable_RW_Test.dsp:
-        * tests/version_tests/Atomic_Op_Test.dsp: (removed)
-        * tests/version_tests/Auto_IncDec_Test.dsp: (removed)
-        * tests/version_tests/Barrier_Test.dsp: (removed)
-        * tests/version_tests/Basic_Types_Test.dsp: (removed)
-        * tests/version_tests/Buffer_Stream_Test.dsp: (removed)
-        * tests/version_tests/CDR_Array_Test.dsp: (removed)
-        * tests/version_tests/CDR_File_Test.dsp: (removed)
-        * tests/version_tests/CDR_Test.dsp: (removed)
-        * tests/version_tests/Cache_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Cached_Accept_Conn_Test.dsp: (removed)
-        * tests/version_tests/Cached_Conn_Test.dsp: (removed)
-        * tests/version_tests/Capabilities_Test.dsp: (removed)
-        * tests/version_tests/Collection_Test.dsp: (removed)
-        * tests/version_tests/Config_Test.dsp: (removed)
-        * tests/version_tests/Conn_Test.dsp: (removed)
-        * tests/version_tests/DLL_Test.dsp: (removed)
-        * tests/version_tests/DLList_Test.dsp: (removed)
-        * tests/version_tests/Dirent_Test.dsp: (removed)
-        * tests/version_tests/Dynamic_Priority_Test.dsp: (removed)
-        * tests/version_tests/Enum_Interfaces_Test.dsp: (removed)
-        * tests/version_tests/Env_Value_Test.dsp: (removed)
-        * tests/version_tests/Future_Set_Test.dsp: (removed)
-        * tests/version_tests/Future_Test.dsp: (removed)
-        * tests/version_tests/Handle_Set_Test.dsp: (removed)
-        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp: (removed)
-        * tests/version_tests/Hash_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/High_Res_Timer_Test.dsp: (removed)
-        * tests/version_tests/IOStream_Test.dsp: (removed)
-        * tests/version_tests/Lazy_Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Log_Msg_Test.dsp: (removed)
-        * tests/version_tests/MEM_Stream_Test.dsp: (removed)
-        * tests/version_tests/MM_Shared_Memory_Test.dsp: (removed)
-        * tests/version_tests/MT_Reactor_Timer_Test.dsp: (removed)
-        * tests/version_tests/MT_SOCK_Test.dsp: (removed)
-        * tests/version_tests/Malloc_Test.dsp: (removed)
-        * tests/version_tests/Map_Manager_Test.dsp: (removed)
-        * tests/version_tests/Map_Test.dsp: (removed)
-        * tests/version_tests/Mem_Map_Test.dsp: (removed)
-        * tests/version_tests/Message_Block_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Notifications_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Test.dsp: (removed)
-        * tests/version_tests/Message_Queue_Test_Ex.dsp: (removed)
-        * tests/version_tests/Naming_Test.dsp: (removed)
-        * tests/version_tests/New_Fail_Test.dsp: (removed)
-        * tests/version_tests/Notify_Performance_Test.dsp: (removed)
-        * tests/version_tests/OS_Test.dsp: (removed)
-        * tests/version_tests/Object_Manager_Test.dsp: (removed)
-        * tests/version_tests/OrdMultiSet_Test.dsp: (removed)
-        * tests/version_tests/Pipe_Test.dsp: (removed)
-        * tests/version_tests/Priority_Buffer_Test.dsp: (removed)
-        * tests/version_tests/Priority_Reactor_Test.dsp: (removed)
-        * tests/version_tests/Priority_Task_Test.dsp: (removed)
-        * tests/version_tests/Process_Manager_Test.dsp: (removed)
-        * tests/version_tests/Process_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Process_Strategy_Test.dsp: (removed)
-        * tests/version_tests/RB_Tree_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Exceptions_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Notify_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Performance_Test.dsp: (removed)
-        * tests/version_tests/Reactor_Timer_Test.dsp: (removed)
-        * tests/version_tests/Reactors_Test.dsp: (removed)
-        * tests/version_tests/Reader_Writer_Test.dsp: (removed)
-        * tests/version_tests/Recursive_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Refcounted_Auto_Ptr_Test.dsp: (removed)
-        * tests/version_tests/Reverse_Lock_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Connector_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Send_Recv_Test.dsp: (removed)
-        * tests/version_tests/SOCK_Test.dsp: (removed)
-        * tests/version_tests/SPIPE_Test.dsp: (removed)
-        * tests/version_tests/SString_Test.dsp: (removed)
-        * tests/version_tests/SV_Shared_Memory_Test.dsp: (removed)
-        * tests/version_tests/Semaphore_Test.dsp: (removed)
-        * tests/version_tests/Service_Config_Test.dsp: (removed)
-        * tests/version_tests/Sigset_Ops_Test.dsp: (removed)
-        * tests/version_tests/Simple_Message_Block_Test.dsp: (removed)
-        * tests/version_tests/Svc_Handler_Test.dsp: (removed)
-        * tests/version_tests/TSS_Test.dsp: (removed)
-        * tests/version_tests/Task_Test.dsp: (removed)
-        * tests/version_tests/Thread_Manager_Test.dsp: (removed)
-        * tests/version_tests/Thread_Mutex_Test.dsp: (removed)
-        * tests/version_tests/Thread_Pool_Reactor_Test.dsp: (removed)
-        * tests/version_tests/Thread_Pool_Test.dsp: (removed)
-        * tests/version_tests/Time_Service_Test.dsp: (removed)
-        * tests/version_tests/Time_Value_Test.dsp: (removed)
-        * tests/version_tests/Timeprobe_Test.dsp: (removed)
-        * tests/version_tests/Timer_Queue_Test.dsp: (removed)
-        * tests/version_tests/Tokens_Test.dsp: (removed)
-        * tests/version_tests/UPIPE_SAP_Test.dsp: (removed)
-        * tests/version_tests/Upgradable_RW_Test.dsp: (removed)
-        * tests/version_tests/run_all_tests.bat: (removed)
-        * tests/version_tests/version_tests.dsw: (removed)
-
-          Moved the version_tests back into the tests/*.dsp files.  The
-          reason they were originally moved is because it was easier to
-          select all the debug versions during a batch build.  But now
-          we have pippen.pl and msvc_auto_compile.pl, so this is no
-          longer an issue, while this strange setup would compilicate the
-          nightly builds.  Thus, it was standardized back.
-
-        * bin/create_vt_dsps.pl: (removed)
-
-          No need for this anymore.
-
-Sun Mar  4 19:27:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/Log_Msg.cpp:
-        * ace/Log_Msg_NT_Event_Log.h:
-        * ace/OS.cpp:
-
-          Disabled Log_Msg_NT_Event_Log on Windows CE.
-
-Sun Mar 04 13:19:35 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao.doxygen:
-          Add .txt files, so we can add web pages to the basic TAO
-          documentation.
-
-Sun Mar 04 10:58:08 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp: Added Log_Msg_NT_Event_Log.{h,cpp} to NT
-          project files.
-
-Sun Mar  4 10:41:57 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Log_Msg.cpp,
-          ace/Log_Msg.h,
-          ace/Logging_Strategy.cpp,
-          ace/Makefile.bor,
-          ace/OS.cpp,
-          ace/OS.h,
-          ace/OS.i,
-          ace/ace.rc: Added support for the new NT event logging capability.
-          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-        * ace/Log_Msg_NT_Event_Log.cpp
-          ace/Log_Msg_NT_Event_Log.h
-          ace/ace_message_table.bin:  Added these files to support the new
-          NT event logging capability.
-          Thanks to Chris Kohlhoff <chris@kohlhoff.com> for contributing
-          this.
-
-Sun Mar  4 04:46:44 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/nightlybuilds/builds.lst:
-
-          Added new Windows CE nightly build.
-
-Sun Mar 04 03:12:17 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/generate_export_file.pl: ACE_AS_STATIC_LIBS was incorrectly
-          typed in as ACE_STATIC_LIBS.
-
-        * ace/svc_export.h:
-        * ace/RMCast/RMCast_Export.h:
-        * ace/SSL/SSL_Export.h:
-        * websvcs/lib/websvcs_export.h: These files didn't check for
-          ACE_AS_STATIC_LIBS to determine if they should define their
-          export macros for static build.  Thanks to Chris Kohlhoff
-          <chris@kohlhoff.com> for reporting this.       [Bug 813]
-
-Sat Mar  3 19:07:31 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * ace/QoS/QoS_Session_Impl.cpp:
-        * ace/QoS/QoS_Session_Impl.i:
-        * examples/QOS/Fill_ACE_QoS.cpp:
-        * examples/QOS/Fill_ACE_QoS.h:
-        * examples/QOS/Makefile:
-        * examples/QOS/QoS_Util.cpp:
-        * examples/QOS/Receiver_QoS_Event_Handler.cpp:
-        * examples/QOS/Sender_QoS_Event_Handler.cpp:
-          Fixed various compile warnings when compiling with rapi=1 on
-          Redhat Linux 6.2
-
-Sat Mar  3 16:47:53 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Changed the detection pattern a bit to pick up
-          stuff like:
-
-          void
-          operator < (...)
-
-          better.
-
-        * ace/Auto_Ptr.i:
-        * ace/Base_Thread_Adapter.cpp:
-        * ace/Based_Pointer_T.i:
-        * ace/Connector.cpp:
-        * ace/Containers_T.cpp:
-        * ace/DEV_Addr.i:
-        * ace/Dynamic.i:
-        * ace/FILE.cpp:
-        * ace/Flag_Manip.i:
-        * ace/Handle_Set.i:
-        * ace/Hash_Map_Manager_T.cpp:
-        * ace/Lib_Find.cpp:
-        * ace/Local_Name_Space_T.cpp:
-        * ace/Local_Tokens.cpp:
-        * ace/MEM_Addr.i:
-        * ace/Malloc.cpp:
-        * ace/Malloc_Allocator.cpp:
-        * ace/Malloc_T.cpp:
-        * ace/Memory_Pool.cpp:
-        * ace/Message_Block.cpp:
-        * ace/Message_Block.i:
-        * ace/Message_Block_T.cpp:
-        * ace/Message_Queue.i:
-        * ace/Message_Queue_T.cpp:
-        * ace/Message_Queue_T.i:
-        * ace/Naming_Context.cpp:
-        * ace/OS.cpp:
-        * ace/OS.i:
-        * ace/PI_Malloc.cpp:
-        * ace/POSIX_Asynch_IO.cpp:
-        * ace/Process_Manager.cpp:
-        * ace/QtReactor.cpp:
-        * ace/RB_Tree.i:
-        * ace/RW_Process_Mutex.cpp:
-        * ace/Reactor.cpp:
-        * ace/Remote_Name_Space.cpp:
-        * ace/Remote_Tokens.cpp:
-        * ace/SOCK_Dgram.i:
-        * ace/SString.cpp:
-        * ace/SUN_Proactor.cpp:
-        * ace/Select_Reactor_Base.cpp:
-        * ace/Select_Reactor_T.cpp:
-        * ace/Service_Object.i:
-        * ace/Service_Repository.cpp:
-        * ace/Signal.cpp:
-        * ace/Signal.i:
-        * ace/Svc_Handler.cpp:
-        * ace/Synch.cpp:
-        * ace/Synch_T.cpp:
-        * ace/Thread_Adapter.cpp:
-        * ace/Thread_Manager.cpp:
-        * ace/Timer_Heap_T.cpp:
-        * ace/TkReactor.cpp:
-        * ace/Token.cpp:
-        * ace/Token_Manager.cpp:
-        * ace/CLASSIX/CLASSIX_CO_Acceptor.i:
-        * ace/CLASSIX/CLASSIX_Select_Reactor.cpp:
-        * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
-        * netsvcs/ACE-netsvcs.html:
-        * netsvcs/lib/Server_Logging_Handler_T.cpp:
-        * netsvcs/lib/Token_Handler.cpp:
-
-          Fixed bad ACE_TRACE and ACE_OS_TRACE's. (fuzz errors)
-
-        * docs/ACE-categories.html:
-        * docs/ACE-porting.html:
-        * docs/ACE-subsets.html:
-        * docs/tutorials/new-tutorials.html:
-
-          Changed references to
-          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
-          relative paths instead (Fixes the last of the fuzz errors).
-
-Fri Mar 2 20:08  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * include/makeinclude/platform_qnx_rtp_gcc.GNU:
-          Added macros tha expand to multiple libraries
-          on QNX RTP to fix most of the link problems.
-
-Fri Mar  2 16:35:58 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/config-win32-borland.h:
-
-          Added /**/ to #include <vcl.h> so it isn't picked up by
-          MSVC-based dependency generators.
-
-Fri Mar 02 19:36:22 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i (ACE_OS::send): (only non-Win32), if call fails and
-          errno is EAGAIN, change it to EWOULDBLOCK. Improve portability
-          for platforms where EAGAIN and EWOULDBLOCK are different values
-          and both used, like HP-UX.  Thanks to Mike Snowy
-          <snowymike@aol.com> for reporting this problem.
-
-        * ace/ACE.i (send_i): Call ACE_OS::send, not ACE_OS::write, on HP-UX.
-          This makes it pick up the EAGAIN->EWOULDBLOCK change.
-
-        * tests/TSS_Test.cpp: Avoid doing ACE_Thread::keyfree on where
-          ACE_HAS_PTHREADS_DRAFT4 or ACE_HAS_PTHREADS_DRAFT6 (unless
-          ACE_HAS_TSS_EMULATION is also defined) since ACE_Thread::keyfree
-          will get ENOTSUP anyway.
-
-Fri Mar 02 17:50:40 2001  Sharath R. Cholleti  <sharath@cs.wustl.edu>
-
-        * ace/QtReactor.cpp:
-          Thanks to Stefan Scherer <stefan_scherer@sepp.de> for reporting
-          and fixing the problem - crashing of TAO/tests/QtTests/ client
-          example after moving the slider.
-
-Fri Mar 02 15:35:40 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/MEM_Acceptor.cpp:
-        * ace/MEM_Acceptor.h:
-        * ace/MEM_Addr.cpp:
-        * ace/MEM_Addr.h:
-        * ace/MEM_Connector.cpp:
-        * ace/MEM_Connector.h:
-        * ace/MEM_IO.cpp:
-        * ace/MEM_IO.h:
-        * ace/MEM_SAP.cpp:
-        * ace/MEM_SAP.h:
-        * ace/MEM_Stream.cpp:
-        * ace/MEM_Stream.h: Disabled MEM_Stream support if one chooses
-          not to support position independent pointers.
-
-Fri Mar 02 13:17:36 2001  Steve Huston  <shuston@riverace.com>
-
-        * examples/IOStream/server/iostream_server.cpp (main): Removed the
-          call to register peer_acceptor with the reactor. The acceptor::open
-          call already registers for ACCEPT_MASK. Prevents leaving a hanging
-          READ_MASK registered after the acceptor is destroyed when main()
-          returns. This fixes Bugzilla # 801. Thanks to Pim Philipse
-          <pph@rogan-medical.com> for reporting this.
-
-        * THANKS: Added Pim Philipse to the Hall of Fame.
-
-Fri Mar 02 12:24:27 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-hpux-10.x-hpc++.h: If compiling without exceptions
-          (+noeh) then don't set ACE_HAS_EXCEPTIONS (don't set
-          ACE_NEW_THROWS_EXCEPTIONS either).
-
-        * ace/Thread_Manager.cpp (join_thr): Moved the code for
-          ACE_HAS_PTHREADS_DRAFT4 that does a pthread_detach from here
-          to ACE_OS::thr_join (which this function calls) so that
-          ACE_Thread::join also causes a pthread_detach. This is needed
-          on Pthreads Draft 4 (HP-UX 10.x) to properly clean up the thread
-          storage and avoid leaking memory. Thanks to Vladimir Kondratiev
-          <vladimir.kondratiev@intel.com> for reporting this and providing
-          excellent test cases to help resolve it quickly.
-
-        * ace/OS.i (ACE_OS::thr_join): Added the code that was removed from
-          ACE_Thread_Manager::join_thr, above.
-
-        * ace/Event_Handler.cpp (~ACE_Event_Handler): Add an ACE_Errno_Guard
-          around purge_pending_notifications to prevent against an
-          ENOTSUP from purge_pending_notifications.
-
-Thu Mar  1 17:02:10 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          Fixed up the Spawn code to use the Executable ()
-          instead of {EXECUTABLE}, since that's how we get the
-          adjusted name (with .exe and stuff).  And also
-          skipped the file existance with IgnoreExeSubDir, since
-          IgnoreExeSubDir is often used when you need to find
-          the program in the path.
-
-Thu Mar  1 15:48:10 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Fuzz was being a bit to eager with the class matching in
-          the TRACE test.  It was having problems with something like:
-
-          char *foo::bar ()
-
-          since it thought the class was "char *foo" instead of just
-          "foo".
-
-          But it is feeling muuuuuuch better now.
-
-Thu Mar  1 13:18:07 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/fuzz.pl:
-
-          Added two new tests:
-
-          - absolute ACE_wrappers test:
-
-            Check for ~schmidt/ACE_wrappers in html files.  These should
-            be relative links since these html files already exist in
-            their own ACE_wrappers tree.
-
-          - TRACE test:
-
-            Does a check on whether the ACE_TRACE or ACE_OS_TRACE actually
-            refers to the function/method it is in.
-
-          And expanded the checks in the bad run_test test (level 6)
-
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/Process_Win32.pm:
-
-          - Added checks for file existence before running.
-          - Added IgnoreExeSubDir option.
-          - Added TerminateWaitKill method.
-
-        * bin/pippen.pl: (added)
-        * bin/PerlACE/MSProject.pm: (added)
-        * bin/PerlACE/MSProject/DSP.pm: (added)
-        * bin/PerlACE/MSProject/VCP.pm: (added)
-
-          There is nothing to see here...please be on your way.
-
-          It isn't like this is a super top secret project to
-          replace msvc_auto_compile.pl with something that works
-          better and also has a cool code-name that is shorter
-          than "msvc_auto_compile.pl".
-
-          But remember, you didn't hear that from me.
-
-Thu Mar  1 10:54:23 2001  Ossama Othman  <ossama@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Added the TAO Codec to the list of tests to run.
-
-        * include/makeinclude/wrapper_macros.GNU:
-
-          Fixed all incorrect uses of CFLAGS and CCFLAGS where
-          preprocessor macros were defined.  Preprocessor macros should be
-          defined in the CPPFLAGS variable.
-
-          Define ACE_USE_RCSID in non-debug builds (i.e. debug=0).
-
-Thu Mar 01 07:29:58 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_run_tests.lst:
-          Fixed typos in the Service_Context_Manipulation test.  It was
-          running in platforms where it shouldn't.
-
-Thu Mar 01 07:07:03 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * include/makeinclude/recurse.bor:
-          Added support for makefiles which contain multiple targets.
-
-        * examples/IPC_SAP/SOCK_SAP/Makefile.bor:
-        * examples/Log_Msg/Makefile.bor:
-        * examples/Map_Manager/Makefile.bor:
-        * examples/Mem_Map/file-reverse/Makefile.bor:
-        * examples/RMCast/Send_File/Makefile.bor:
-        * examples/Service_Configurator/IPC-tests/client/Makefile.bor:
-        * examples/Threads/Makefile.bor:
-        * netsvcs/clients/Logger/Makefile.bor:
-        * tests/Makefile.bor:
-        * tests/RMCast/Makefile.bor:
-          Updated to work with new multi-target makefile support.
-
-Wed Feb 28 22:58:50 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * html/index.html:
-          Reference */index.html directly, instead of assuming that the
-          web browser will use index.html as the default file, this also
-          works better when browsing locally.  Thanks to Alain Decamps
-          <Alain.Decamps@pidpa.be> for pointing this out.
-
-Wed Feb 28 16:41:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * docs/bugzilla-build-setup.html:
-
-          Updated the section about the scoreboard and added a
-          placeholder for Win32 nightly build information.
-
-Wed Feb 28 16:04:14 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * bin/nightlybuilds/builds.lst (TYPE): Added a build with AMI and
-          Messaging support disabled for the nightly builds.
-
-Wed Feb 28 15:35:59 2001  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * docs/bugzilla-build-setup.html:
-          Added html file outlining steps for adding a bugzilla
-          nightly build.
-
-Wed Feb 28 00:25:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/auto_run_tests.lst:
-
-          The examples/POA/Adapter_Activator/run_test.pl test was being run
-          twice.  In fairness to all the other tests that only get to run once,
-          I removed the second instance.
-
-Tue Feb 27 17:31:48 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Turn on -D_REENTRANT for
-          the threads=0 build - this enables the reentrant functions which
-          are present, threads or not. It does not turn on threads, which
-          are instead enabled by -D_POSIX_C_SOURCE=199506L.
-
-        * ace/config-hpux-11.00.h: Added ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-        * ace/OS.i (rand_r): Added 'defined (HPUX_11)' to the ways to get to
-          the POSIX.1c-conformant version of rand_r. Allows clean compile
-          on HP-UX 11 without thread support.
-          Also lined up some misaligned #if/else/endif lines to make it
-          easier to find one's way through.
-
-        * ace/OS_Dirent.inl (readdir_r): Added 'defined (HPUX_11)' to the
-          ways to get the POSIX.1c-conformant version of readdir_r. Allows
-          clean compile on HP-UX 11 without thread support.
-
-Tue Feb 27 11:38:38 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * performance-tests/TCP/tcp_test.cpp (main): Zapped the
-          non-existent '-f' option.  Thanks to Mike Curtis for reporting
-          this.
-
-        * performance-tests/TCP/tcp_test.cpp (main): Check for improper
-          bufsz.  Thanks to Mike Curtis for reporting this.
-
-        * performance-tests/TCP/tcp_test.cpp (main): Documented the '-t'
-          option, which specifies the number of threads.
-
-        * performance-tests/TCP/README: Fixed a typo.  Thanks to
-          Mike Curtis for reporting this.
-
-Tue Feb 27 10:51:18 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * bin/auto_run_tests.lst: Added the AMI tests to the daily
-          builds.
-
-Tue Feb 27 10:23:20 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * Makefile: Changed the ChangeLog listing in the CONTROLLED_FILES
-          to ChangeLog*. This should help us to avoid missing ChangeLog
-          entries in the beta distribution, just about every time we split
-          and add a ChangeLog.
-
-Mon Feb 27 07:39:16 2001  Chad Elliott  <elliott_c@ociweb.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU:
-
-          Removed suppression of Future Error 129.
-          Removed the use of CFLAGS.
-
-        * ace/OS.h:
-        * ace/config-hpux-11.00.h:
-
-          Modification to remove system header macro definition conflicts.
-          This change does not suppress the conflicts, but does an undef
-          of the two conflicting macros before includeing tcp.h.  Thanks
-          to Sam Chong <sam@i2i-inc.com> for reporting this problem.
-
-Mon Feb 26 19:01:16 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Logging_Strategy.{h,cpp}: Added a new -k option to
-          set the logging key via the ACE_Logging_Strategy.  Thanks to
-          Chris Kohlhoff <chris@kohlhoff.com> for contributing this.
-
-Mon Feb 26 18:18:38 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/SString.i
-          (ACE_CString::find (const char *s, int pos) const):
-          (ACE_CString::find (char c, int pos) const):
-          (ACE_SString::find (const char *s, int pos) const):
-          (ACE_SString::find (char c, int pos) const):
-          (ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const):
-          If match is found, return index from start of string, not from
-          'pos'. Matches the C++ string standard, which was the model for
-          these classes.
-          Thanks to Glen Osterhout <gosterho@elronsw.com> for this fix.
-
-        * ace/SString.h: Clarified comments on return value for above
-          functions.
-
-        * tests/SString_Test.cpp: Changed to look for the correct return
-          from the npos tests of the functions above.
-
-        * THANKS: Added Glen Osterhout to the Hall of Fame.
-
-Mon Feb 26 15:01:55 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test_Impl.dsp:
-        * tests/version_tests/DLL_Test_Impl.dsp: (removed)
-
-          Me thinks that the Release and Static configurations should
-          also compile, and me thinks that it is now fixed.
-
-Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
-          method assumes ownership of <next_arg>, rather than copying it.
-          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
-          Fixes [Bug 807].
-
-          The generated version_tests dsp didn't work (since DLL_Test_Impl
-          creates a library).  Manually created the configurations in the
-          tests/DLL_Test_Impl.dsp version instead.
-
-Mon Feb 26 15:54:33 2001  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b)
-
-        * docs/tutorials/013/message_queue.cpp:
-        * tests/Malloc_Test.cpp:
-
-        Fixed errors in #pragma instiate lines including removal of ';',
-        mispellings
-
-        * ace/config-all.h:
-
-        Added definition of Unixware UDK for definition of ACE_NOTREACHED()
-
-        * ace/config-unixware-7.1.0.udk.h:
-        * include/makeinclude/platform_unixware_udk.GNU:
-
-        New configuration files for building on Unixware 7 with UDK CC.
-
-Mon Feb 26 12:29:45 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/ARGV.h: Clarify that the int add (const ACE_TCHAR *next_arg)
-          method assumes ownership of <next_arg>, rather than copying it.
-          Thanks to Steve Hespelt <shespelt@bear.com> for reporting this.
-          Fixes [Bug 807].
-
-Mon Feb 26 12:27:46 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.i:
-
-          Added method to reset the byte order in class OuputCDR.  This
-          will be used by a gateway to set the byte order of a reply to a
-          reqest it has handled to one different than the gateway's own
-          byte order, if necessary. It should be called while the stream
-          is still empty, that is, before any part of the reply, including
-          the header, has been marshaled.
-
-Mon Feb 26 12:07:00 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Memory_Pool.cpp: Moved the copying of MMAP flags up before
-          setting the MAP_FIXED flag.  Thanks to <rhuber@amadeus.net> for
-          reporting this. [Bug 752]
-
-Mon Feb 26 09:29:36 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/RB_Tree.h:
-          Fully qualified enum name. This fixes problems on gcc-272 builds.
-
-Mon Feb 26 00:19:28 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        Time to do some spring cleaning...
-
-        * tests/version_tests/Config_Test.dsp: (added)
-        * tests/version_tests/DLL_Test_Impl.dsp: (added)
-        * tests/version_tests/Log_Msg_Test.dsp: (added)
-        * tests/version_tests/Message_Queue_Test_Ex.dsp: (added)
-        * tests/version_tests/version_tests.dsw:
-
-          Updated the version_tests dir with create_vt_dsps.pl.
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-        * netsvcs/lib/netsvcs.dsp:
-        * netsvcs/servers/servers.dsp:
-        * tests/ACE_Init_Test.dsp:
-        * tests/Atomic_Op_Test.dsp:
-        * tests/Auto_IncDec_Test.dsp:
-        * tests/Barrier_Test.dsp:
-        * tests/Basic_Types_Test.dsp:
-        * tests/Buffer_Stream_Test.dsp:
-        * tests/CDR_Array_Test.dsp:
-        * tests/CDR_File_Test.dsp:
-        * tests/CDR_Test.dsp:
-        * tests/Cache_Map_Manager_Test.dsp:
-        * tests/Cached_Accept_Conn_Test.dsp:
-        * tests/Cached_Conn_Test.dsp:
-        * tests/Capabilities_Test.dsp:
-        * tests/Collection_Test.dsp:
-        * tests/Config_Test.dsp:
-        * tests/Conn_Test.dsp:
-        * tests/DLL_Test.dsp:
-        * tests/DLList_Test.dsp:
-        * tests/Dirent_Test.dsp:
-        * tests/Dynamic_Priority_Test.dsp:
-        * tests/Enum_Interfaces_Test.dsp:
-        * tests/Env_Value_Test.dsp:
-        * tests/Future_Set_Test.dsp:
-        * tests/Future_Test.dsp:
-        * tests/Handle_Set_Test.dsp:
-        * tests/Hash_Map_Bucket_Iterator_Test.dsp:
-        * tests/Hash_Map_Manager_Test.dsp:
-        * tests/High_Res_Timer_Test.dsp:
-        * tests/IOStream_Test.dsp:
-        * tests/Lazy_Map_Manager_Test.dsp:
-        * tests/Log_Msg_Test.dsp:
-        * tests/MEM_Stream_Test.dsp:
-        * tests/MM_Shared_Memory_Test.dsp:
-        * tests/MT_Reactor_Timer_Test.dsp:
-        * tests/MT_SOCK_Test.dsp:
-        * tests/Malloc_Test.dsp:
-        * tests/Map_Manager_Test.dsp:
-        * tests/Map_Test.dsp:
-        * tests/Mem_Map_Test.dsp:
-        * tests/Message_Block_Test.dsp:
-        * tests/Message_Queue_Notifications_Test.dsp:
-        * tests/Message_Queue_Test.dsp:
-        * tests/Message_Queue_Test_Ex.dsp:
-        * tests/Naming_Test.dsp:
-        * tests/New_Fail_Test.dsp:
-        * tests/Notify_Performance_Test.dsp:
-        * tests/OS_Test.dsp:
-        * tests/Object_Manager_Test.dsp:
-        * tests/OrdMultiSet_Test.dsp:
-        * tests/Pipe_Test.dsp:
-        * tests/Priority_Buffer_Test.dsp:
-        * tests/Priority_Reactor_Test.dsp:
-        * tests/Priority_Task_Test.dsp:
-        * tests/Process_Manager_Test.dsp:
-        * tests/Process_Mutex_Test.dsp:
-        * tests/Process_Strategy_Test.dsp:
-        * tests/RB_Tree_Test.dsp:
-        * tests/Reactor_Exceptions_Test.dsp:
-        * tests/Reactor_Notify_Test.dsp:
-        * tests/Reactor_Performance_Test.dsp:
-        * tests/Reactor_Timer_Test.dsp:
-        * tests/Reactors_Test.dsp:
-        * tests/Reader_Writer_Test.dsp:
-        * tests/Recursive_Mutex_Test.dsp:
-        * tests/Refcounted_Auto_Ptr_Test.dsp:
-        * tests/Reverse_Lock_Test.dsp:
-        * tests/SOCK_Connector_Test.dsp:
-        * tests/SOCK_Send_Recv_Test.dsp:
-        * tests/SOCK_Test.dsp:
-        * tests/SPIPE_Test.dsp:
-        * tests/SString_Test.dsp:
-        * tests/SV_Shared_Memory_Test.dsp:
-        * tests/Semaphore_Test.dsp:
-        * tests/Service_Config_Test.dsp:
-        * tests/Sigset_Ops_Test.dsp:
-        * tests/Simple_Message_Block_Test.dsp:
-        * tests/Svc_Handler_Test.dsp:
-        * tests/TSS_Test.dsp:
-        * tests/Task_Test.dsp:
-        * tests/Thread_Manager_Test.dsp:
-        * tests/Thread_Mutex_Test.dsp:
-        * tests/Thread_Pool_Reactor_Test.dsp:
-        * tests/Thread_Pool_Test.dsp:
-        * tests/Time_Service_Test.dsp:
-        * tests/Time_Value_Test.dsp:
-        * tests/Timeprobe_Test.dsp:
-        * tests/Timer_Queue_Test.dsp:
-        * tests/Tokens_Test.dsp:
-        * tests/UPIPE_SAP_Test.dsp:
-        * tests/Upgradable_RW_Test.dsp:
-
-          Removed the Alpha configurations.  I don't think we've
-          actually looked at these for over a year, and they are
-          missing from a lot of projects.  Thankfully, they are easy
-          to recreate if they are needed.
-
-        * ACE-INSTALL.html:
-
-          Changed the Windows NT Alpha section to mention that we
-          no longer have configurations out of the box for Win32/Alpha,
-          they must be recreated if needed.
-
-        * WindozeCE/ACEApp.cpp: (removed)
-        * WindozeCE/ACEApp.h: (removed)
-        * WindozeCE/README: (removed)
-        * WindozeCE/StdAfx.cpp: (removed)
-        * WindozeCE/StdAfx.h: (removed)
-        * WindozeCE/WindozeCE.aps: (removed)
-        * WindozeCE/WindozeCE.clw: (removed)
-        * WindozeCE/WindozeCE.cpp: (removed)
-        * WindozeCE/WindozeCE.dsp: (removed)
-        * WindozeCE/WindozeCE.h: (removed)
-        * WindozeCE/WindozeCE.rc: (removed)
-        * WindozeCE/WindozeCEDlg.cpp: (removed)
-        * WindozeCE/WindozeCEDlg.h: (removed)
-        * WindozeCE/resource.h: (removed)
-        * WindozeCE/res/WindozeCE.ico: (removed)
-        * WindozeCE/res/WindozeCE.rc2: (removed)
-
-          No longer used.
-
-        * Makefile:
-
-          Removed WindozeCE from CONTROLLED_FILES.
-
-        * tests/WinCE/Atomic_Op_Test.dsp: (removed)
-        * tests/WinCE/Barrier_Test.dsp: (removed)
-        * tests/WinCE/Basic_Types_Test.dsp: (removed)
-        * tests/WinCE/Buffer_Stream_Test.dsp: (removed)
-        * tests/WinCE/Conn_Test.dsp: (removed)
-        * tests/WinCE/DLL_Test.dsp: (removed)
-        * tests/WinCE/Enum_Interfaces_Test.dsp: (removed)
-        * tests/WinCE/Future_Test.dsp: (removed)
-        * tests/WinCE/Handle_Set_Test.dsp: (removed)
-        * tests/WinCE/Hash_Map_Manager_Test.dsp: (removed)
-        * tests/WinCE/MT_Reactor_Timer_Test.dsp: (removed)
-        * tests/WinCE/MT_SOCK_Test.dsp: (removed)
-        * tests/WinCE/Map_Manager_Test.dsp: (removed)
-        * tests/WinCE/Mem_Map_Test.dsp: (removed)
-        * tests/WinCE/Message_Block_Test.dsp: (removed)
-        * tests/WinCE/Message_Queue_Notifications_Test.dsp: (removed)
-        * tests/WinCE/Message_Queue_Test.dsp: (removed)
-        * tests/WinCE/Notify_Performance_Test.dsp: (removed)
-        * tests/WinCE/OrdMultiSet_Test.dsp: (removed)
-        * tests/WinCE/Priority_Buffer_Test.dsp: (removed)
-        * tests/WinCE/Priority_Task_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Exceptions_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Notify_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Performance_Test.dsp: (removed)
-        * tests/WinCE/Reactor_Timer_Test.dsp: (removed)
-        * tests/WinCE/Reactors_Test.dsp: (removed)
-        * tests/WinCE/Reader_Writer_Test.dsp: (removed)
-        * tests/WinCE/Recursive_Mutex_Test.dsp: (removed)
-        * tests/WinCE/SOCK_Connector_Test.dsp: (removed)
-        * tests/WinCE/SOCK_Test.dsp: (removed)
-        * tests/WinCE/SString_Test.dsp: (removed)
-        * tests/WinCE/Semaphore_Test.dsp: (removed)
-        * tests/WinCE/Sigset_Ops_Test.dsp: (removed)
-        * tests/WinCE/Simple_Message_Block_Test.dsp: (removed)
-        * tests/WinCE/TSS_Test.dsp: (removed)
-        * tests/WinCE/Task_Test.dsp: (removed)
-        * tests/WinCE/Thread_Manager_Test.dsp: (removed)
-        * tests/WinCE/Thread_Mutex_Test.dsp: (removed)
-        * tests/WinCE/Thread_Pool_Test.dsp: (removed)
-        * tests/WinCE/Time_Value_Test.dsp: (removed)
-        * tests/WinCE/Timer_Queue_Test.dsp: (removed)
-        * tests/WinCE/ce_tests.dsw: (removed)
-
-          Removed these Windows CE Toolkit for Visual C++ files.
-
-Mon Feb 26 00:15:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test_Impl.dsp:
-
-          Made sure the Code Generation settings were correct.
-
-Sun Feb 25 19:40:11 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/ACEutils.pm (CheckForConfig):
-          This routine was not removing all the -Config options from the
-          command-line, causing problems in some of the tests.
-
-Sun Feb 25 16:33:26 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test.cpp:
-
-          Left the DLL end with a d in debug mode, but changed
-          the test to add the d when _DEBUG and ACE_WIN32 is
-          defined.  Test should now work again on Win2000_Debug.
-
-Sun Feb 25 11:28:06 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/run_test.pl:
-
-          When there are errors in the log, print out the entire
-          log.  This should make it much easier to understand
-          problems in the nightly build logs.
-
-Sun Feb 25 09:04:43 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/DLL_Test.cpp:
-          Accidentally left the 'd' suffix in the name of the DLL.
-
-Sat Feb 24 22:58:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * bin/msvc_auto_compile.pl:
-        * TAO/TAOACE.dsw:
-        * TAO/TAOACE_Static.dsw:
-        * Static_Performance.dsw:
-
-          Removed references to gperf_lib.dsp
-
-        * TAO/version_tests.dsw: (removed)
-
-          This was still referring to orbsvcs.dsp, which shows that
-          it is way out of date (and not used).  Zapped.
-
-Sat Feb 24 20:59:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * apps/gperf/src/gperf.dsp:
-        * apps/gperf/src/gperf.dsw:
-        * apps/gperf/src/gperf_lib.dsp: (removed)
-
-          Merged gperf into one project.  This will bring the
-          structure in line with the Makefiles.
-
-Sat Feb 24 19:28:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-
-          Fixed my recent changes to ACE_OS::dlsym () to work on
-          Windows CE.
-
-Sat Feb 24 17:50:38 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/DLL_Test.cpp:
-
-          OBJ_PREFIX was being created by attaching a char string to
-          a ACE_TCHAR string.  Needed to add ACE_TEXT to the first
-          string for compilation on ACE_USES_WCHAR.
-
-        * tests/DLL_Test_Impl.dsp:
-
-          Changed the internal name to "DLL_Test DLL" to make sure
-          this gets compiled in the first pass by msvc_auto_compile.pl.
-
-        * tests/run_test.pl:
-
-          Added a check for LM_WARNINGs in log files.  Let's see if
-          there have been any hidden (DLL_Test actually was producing
-          a warning on Windows, but Carlos's fix already got rid of it,
-          Yay!).
-
-Sat Feb 24 15:44:58 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/tests.dsw:
-        * tests/DLL_Test_Impl.dsp:
-          Add new project file for the shared library used in the test.
-
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test_Impl.cpp:
-          Change the Win32 version to load a shared library instead of the
-          exe.
-
-Sat Feb 24 14:07:11 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/Thread_Pool_Reactor_Test.cpp:
-
-          Did a careful study of what this test was doing in regards to
-          sending wide-character strings, and made it consistent.  The
-          most troublesome aspect was the fact that the length is encoded
-          in the shutdown string ("\011shutdown") which meant that I had
-          to send the length in characters, not in bytes.  This should
-          really fix [Bug 537].
-
-Sat Feb 24 14:37:00 2001  Craig Rodrigues <crodrigu@bbn.com>
-
-        * ace/config-g++-common.h
-          gcc 2.97 and higher require the use of the std namespace for
-          iostrams
-
-Sat Feb 24 10:27:04 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_run_tests.lst:
-          Disable the interceptor tests when the ORB is compiled without
-          interceptor support.
-
-        * tests/run_test.lst:
-          Disable the Reactor_Notify_Test on single threaded builds, it
-          uses threads.
-
-        * bin/nightlybuilds/scoreboard_update.pl:
-          Fixed usage message.
-
-Sat Feb 24 09:45:18 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/run_test.lst:
-          Disable the DLL_Test on KCC/Linux builds.  The test runs
-          normally, but crashes on shutdown(), it appears as if the
-          run-time system is invoking the destructors after the library is
-          unloaded.
-
-        * tests/Makefile:
-        * tests/Makefile.DLL_Test:
-        * tests/DLL_Test.h:
-        * tests/DLL_Test.cpp:
-        * tests/DLL_Test_Impl.h:
-        * tests/DLL_Test_Impl.cpp:
-          Cleanup code, and truly separate the shared library code to a
-          completely new separate file.
-
-Sat Feb 24 09:51:45 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/auto_compile:
-          Pass the -Config options to each script, this helps the
-          $ACE_ROOT/bin/run_test.pl script that needs to disable some
-          tests in certain configurations.
-
-Sat Feb 24 08:21:48 2001  David L. Levine <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          added -fno-implicit-templates on Tornado II for Intel 386
-          family targets.  Thanks to Albert Wijnja <Albert.Wijnja@meco.nl>
-          for reporting that static template data members weren't really on
-          VxWorks/386, and to Greg Holtmeyer <greg.holtmeyer@windriver.com>
-          for confirming that -fno-implicit-templates should work with
-          the Tornado II g++.  [Bug 658]
-
-Thu Feb 22 15:59:04 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: The ACE_TRACE call for ACE_OS::gmtime identified the
-          function as "localtime".  This is now fixed.  Thanks to Mason
-          Deaver <mason.deaver@tripointglobal.com> for reporting this.
-
-Fri Feb 23 19:44:36 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ACE version 5.1.13 released.
-
-Thu Feb 22 12:28:15 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/TP_Reactor.cpp (handle_events): Here is the description of
-          how things were working and where the problem was: In the
-          TP_Reactor there is one leader thread waiting in select() and
-          the others waiting on the token.  During deactivation(), the
-          <deactivation_> flag is set on the reactor, signal_all_threads()
-          is called on the token, and an empty notification is send to the
-          current leader thread.  signal_all_threads() sets the
-          <signal_all_threads_> flag on the Token when there are waiters
-          on the Token (does nothing if there are no waiters).  This
-          scheme worked fine when there were leader and follower threads
-          waiting.  When a new leader is chosen, it returns the magic
-          number 2 from token.acquire_read() and hence exits gracefully
-          from the handle_events().  However, the problem was that when
-          some (or all) of the TP threads are busy running upcalls,
-          signal_all_threads() was a no-op and the magic number 2 was not
-          returned from token.acquire_read() and hence the exit from
-          handle_events() was flagged as an error.
-
-          The fix is as described below:
-
-          (1) ACE_Token::signal_all_threads() does not make sense.  The
-          token is a mutex, not a condition variable.  Therefore, it does
-          not make sense to have a signal_all_threads() methods.  Plus I
-          believe that the method does not do as advertised.  Therefore, I
-          removed this method from the token class.
-
-          (2) There is no need to signal all the threads in the
-          TP_Reactor.  Marking the Reactor as closed and signaling the
-          leader thread is enough.  The leader thread will wake up to
-          handle the empty event, the next leader will see that the
-          Reactor is closed and exit gracefully.  This will continue until
-          all the waiters are drained.
-
-          (3) With the above change, there is no need to check for an
-          magic returns from token.acquire_read().  When a thread gets the
-          token, it checks the deactivation flag before proceeding.  If
-          the Reactor is closed, it gracefully exits.  Otherwise, it
-          continues as leader.
-
-          (4) Since there is no need to call token.signal_all_threads(),
-          ACE_TP_Reactor::wakeup_all_threads() can be removed since it is
-          now the same as ACE_Select_Reactor_T::wakeup_all_threads().
-
-          Note that this change should help with making
-          Thread_Pool_Reactor_Test run without shutdown errors.
-
-        * ace/Select_Reactor_T.i (deactivate): The setting of the
-          <deactivated_> flag and waking up of all the threads should be
-          atomic.  I am being picky about this one but I think am I right.
-          Also added the guard to the accessor.
-
-Thu Feb 22 08:51:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-
-          Bleh.  Changed an && to || to make sure we get a symbolname
-          variable for non-Unicode Win32.
-
-          "He who lives without committing any folly is not so
-          wise as he thinks"  - La Rochefoucauld
-
-Thu Feb 22 08:43:30 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * include/makeinclude/rules.local.GNU:
-          Add SunWS_cache and ir.out to the list of files removed by
-          the realclean pseudo-target.  This directory is used by Sun/CC
-          5.0 (and Forte), if not removed the information there can become
-          stale, and break the builds.
-          This should fix the Sun/CC 5.0 nightly builds.
-
-Thu Feb 22 07:51:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * ace/OS.i: Reverted the change "Thu Feb 22 03:31:06 2001
-          Krishnakumar B  <kitty@ace.cs.wustl.edu> ".
-
-Thu Feb 22 03:31:06 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
-
-        * ace/OS.i (dlsym):
-          Hopefully fixed the Win32 builds. Removed a extra ! in the
-          #ifdef.
-
-Thu Feb 22 02:58:36 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
-
-        * VERSION:
-        * PROBLEM-REPORT-FORM:
-        * ace/Version.h:
-        Reverted the changes and restored the old versions of
-        these files as the beta build script was killed. Pain :-(
-
-Wed Feb 21 20:10:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/OS.i:
-        * tests/DLL_Test.cpp:
-        * tests/Thread_Pool_Reactor_Test.cpp:
-
-          Fixed the remaining problems with the Win2000_Unicode tests.
-          [Bug 537]
-
-Tue Feb 20 21:19:39 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * ace/Svc_Conf.h:
-          Add ACE_Export macro for ace_create_service_type() it is used
-          outside the library now.
-
-Tue Feb 20 06:34:26 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_g++.GNU: Make sure to explicitly
-          set ACE_HAS_GNUG_PRE_2_8.  Thanks to Christian von Mueffling
-          <cvm@aiss.de> for reporting this.
-
-        * ace/Thread_Manager.cpp (cancel_grp): Fixed a typo in
-          the ACE_TRACE macro.  Thanks to Mike Curtis for reporting this.
-
-Mon Feb 19 16:38:08 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ace/Asynch_Acceptor.{h,cpp}:
-        Added method void handle (ACE_HANDLE) and made it call the base
-        class's handle(ACE_HANDLE) method to remove warning about
-        partial overloading. Fix suggested by Irfan.
-
-Sun Feb 18 21:55:16 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * ace/OS.h:
-        Added an extern "C" void ace_mutex_lock_cleanup_adapter before
-        the definition of ACE_PTHREAD_CLEANUP_PUSH to avoid warnings on
-        SunCC 5.x.
-
-Sun Feb 18 17:16:41 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * netsvcs/clients/Tokens/manual/manual.cpp (main),
-        * tests/Tokens_Test.cpp (main): Reordered the #ifdefs for the
-          ACE_HAS_TOKENS_LIBRARY stuff.  Thanks to Kitty for reporting
-          this.
-
-Sun Feb 18 16:28:45 2001  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.h: Changed order of method declarations to (hopefully)
-          dodge an internal compiler error on VxWorks.
-
-Sun Feb 18 09:59:18 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * netsvcs/clients/Tokens:
-        * netsvcs/servers/main.cpp (main):
-        * netsvcs/servers/svc.conf:
-        * netsvcs/lib/Token_Handler: Only compile this stuff if the
-          ACE_HAS_TOKENS_LIBRARY macro is enabled.  Thanks to Carlos
-          for reporting this.
-
-        * ace/Object_Manager.cpp: Added a check for ACE_HAS_TOKENS_LIBRARY
-          so we can skip initializing certain things if that macro is
-          undefined.
-
-        * ace/Token_Collection.*:
-        * ace/Token_Invariants.*:
-        * ace/Token_Manager.*:
-        * ace/Local_Tokens.*:
-        * ace/Remote_Tokens.*:
-        * ace/Token_Request_Reply.*:
-          Only compile these files if ACE_HAS_TOKENS_LIBRARY is enabled
-          since this functionality does not appear to be widely used and
-          yet it takes up space.
-
-        * tests/Tokens_Test.cpp (main): Only run this test if
-          ACE_HAS_TOKENS_LIBRARY is defined.
-
-Sat Feb 17 17:23:46 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-
-          Integrated a fix from Keith Nicewarner <knicewar@erg.sri.com>
-          In effect, this reverts the multicast code changed on
-              Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
-          for all platforms except linux.
-
-Sat Feb 17 15:52:09 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/run_all_list.pm:
-        * tests/run_tests.pl:
-          Remove obsolete scripts.
-
-Sat Feb 17 13:26:17 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/POSIX_Asynch_IO.cpp (thread_function): Make sure to cast
-          -1 to void * since that's the signature of the method.  Thanks
-          to Bala for reporting this.
-
-        * ace/POSIX_Asynch_IO.cpp (thread_function): Zapped the unused
-          result local variable and also changed the logic to bailout if
-          handle_events() returns -1.  This fixes a warning reported by
-          KCC.
-
-Fri Feb 16 17:39:16 2001  Mayur Deshpande  <mayur@ics.uci.edu>
-
-        * ace/config-qnx-rtp.h: Commented out ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
-
-        * include/makeinclude/platform_qnx_rtp_gcc.GNU: Added -fexceptions to
-          CCFLAGS and 'exceptions=1' at end of file.
-          Thanks to Andrew Olson <andrew.olson@lmco.com> for the suggestion.
-
-Fri Feb 16 05:37:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Logging_Strategy.h: Updated the documentation to explain what
-          the various options mean.
-
-        * tests/Log_Msg_Test.cpp (test_log_msg_features): Added
-          ACE_Log_Msg::PROCESS to a coupld or priority_mask() calls to
-          make the test work correctly.  Thanks to Kitty for reporting
-          this.
-
-Thu Feb 15 17:53:31 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Thread_Manager.i: Simplified casting in
-          ACE_Thread_Descriptor::get_next per suggestion from Carlos.
-
-Thu Feb 15 14:57:59 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Thread_Manager.i: Fixed typo in ACE_Thread_Descriptor::get_next.
-
-Thu Feb 15 11:33:55 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tests/Refcounted_Auto_Ptr_Test.cpp (main): Always call ACE_OS::exit(0)
-          to make sure that this test terminates...
-
-        * ace/Thread_Manager.i (get_next): Added an ACE_const_cast() to
-          make certain compilers happy.
-
-        * ace/Logging_Strategy.cpp: Fixed some Unicode problems on Win32.
-
-Thu Feb 15 08:49:44 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * bin/nightlybuilds/builds.lst:
-          Rename WashU builds so all the Debian builds appear together.
-
-Thu Feb 15 07:15:39 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Logging_Strategy.{h,cpp}: Added support to generate multiple
-          log files, rather than just two.  Thanks to Orlando Ribeiro
-          <oribeiro@inescporto.pt> for this fix.
-
-Thu Feb 15 03:36:46 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * bin/nightlybuilds/builds.lst (WEB):
-        Added a new build with TAO_MINIMUM linked statically.
-
-Wed Feb 14 05:28:59 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Thread_Manager.{h,i}: Added const to state(), grp_id(),
-          task(), get_next(), and self().  Thanks to Johnny Willemsen
-          <jwillemsen@remedy.nl> for reporting this.
-
-Tue Feb 13 17:51:47 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tests/Makefile.bor (TESTS): Added Dirent_Test to list of TESTS.
-          Thanks to Mike Curtis for reporting this.
-
-        * tests/run_tests.bat: Fixed a typo so that Dirent_Test will run.
-          Thanks to Mike Curtis for reporting this.
-
-Wed Feb 14 12:08:10 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * ace/Read_Buffer.cpp: Fixed boundary condition in rec_read.
-          If record was a multiple of BUFSIZ and the record was
-          terminated with an EOF instead of a "term" character,
-          rec_read would return 0 instead of the actual data read in.
-          The problem was that the partial buffer fill size was being
-          checked instead of the total number of bytes read in.  This
-          issue was noticed when trying to read in an IOR file in TAO
-          that was exactly 512 bytes (BUFSIZ * 2 on Win2k) long.
-
-Tue Feb 13 14:44:28 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_wchar.inl: Changed several variable from type <size_t>
-          to type <int> as on 64-bit whistler, size_t and int are not the
-          same size which confuses 64-bit compiler.  (Per Kitty's
-          request.)
-
-Tue Feb 13 10:23:31 2001  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS/server/IO.{h cpp}: (Side-affect necessitated by addition of
-          handle () method and handle_ member to ACE_Handler). Moved the
-          handle_ member to the JAWS_Synch_IO class - it needs it, and
-          JAWS_Asynch_IO class has it by inheritance from ACE_Handler. Left
-          the handle () methods in JAWS_IO, but made them pure virtual,
-          implemented in JAWS_Synch_IO (implementation moved from JAWS_IO)
-          and in JAWS_Asynch_IO, where they forward up to ACE_Handler's
-          handle () methods.
-
-Mon Feb 12 18:18:05 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * tests/Thread_Mutex_Test.cpp:
-          Modified test to use process mutexes for Win32 platforms
-          so that timed mutexes could be tested.
-
-Sun Feb 11 15:33:39 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/QoS/ACE_QoS_Export.h:
-
-          Added ACE_AS_STATIC_LIBS support.
-
-        * ace/QoS/ACE_QoS.dsp:
-        * ace/QoS/ACE_QoS_Lib.dsp:
-
-          Fixed to comply with ACE standards.
-
-Sun Feb 11 10:50:10 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_g++.GNU (exceptions):
-          Only set the -fno-exceptions option if we're *not* using GCC
-          2.7.2!  Thanks to Pradeep for explaining how to do this.
-
-Sun Feb 11 10:15:08 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * ace/Makefile.bor:
-        * ace/QoS/Makefile.bor:
-        * include/makeinclude/ace_flags.bor:
-          Added build support for QoS library with Borland compiler.
-
-Sat Feb 10 15:29:08 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * ace/Message_Block.h:
-          Improved documentation for the lenth(), size() and space()
-          methods.
-
-Sat Feb 10 07:19:37 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * include/makeinclude/outputdir.bor:
-          Removed the now out-of-date comment about pascal/non-pascal
-          build directories.
-
-        * ace/config-win32-borland.h:
-          Added support for new ACE_HAS_VCL define to enable inclusion
-          of VCL header files.
-
-Fri Feb  9 16:47:44 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * ace/Makefile.am:
-          Removed references to the AQoSA files.
-
-Fri Feb  9 16:42:10 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * examples/QOS/client.dsp:
-        * examples/QOS/server.dsp:
-          Updated the corrected project files.
-          Thanks to Darrell for pointing this out.
-
-Thu Feb  8 19:25:03 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * performance-tests/RPC/run_test.pl:
-        * performance-tests/TCP/run_test.pl:
-        * performance-tests/UDP/run_test.pl:
-          Add driver strings
-
-Thu Feb 08 19:18:36 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * bin/auto_run_tests.lst:
-
-          Removed comment from Exposed Policies test. The test has been fixed.
-
-Thu Feb  8 14:11:36 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * ace/ws2tcpip.h:  [Removed]
-
-          I don't see any reason to have this file in ace; it is a system
-          header file.  And from [Bug 722], our version is out of date anyway.
-
-        * ace/OS.h:
-
-          Changed to include system version of ws2tcpip.h
-
-        * ace/Makefile.am:
-        * ace/ace-dll.icc:
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-
-          Removed references to ws2tcpip.h.
-
-        * ace/SOCK_Connect.cpp:
-
-          Changed get_ip_interfaces to remove a memory error.  Thanks to
-          Viatcheslav Batenine <slavikb@infra2000.com> for helping out with
-          this.
-
-        * ace/SOCK_Dgram_Mcast.cpp:
-
-          It looks like the change made on:
-
-          Fri Jan 26 11:18:15 2001  Douglas C. Schmidt  ...
-
-          doesn't work on Win32.  Reverted back to the old scheme for Win32
-          only.
-
 Thu Feb  8 00:34:57 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * include/makeinclude/platform_sunos5_g++.GNU: Added support for
-          -fno-exception when exceptions=0 is given to the Makefile.
-          Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
-          this.
+	* include/makeinclude/platform_sunos5_g++.GNU: Added support for
+	  -fno-exception when exceptions=0 is given to the Makefile.
+  	  Thanks to Christian v. Mueffling <cvm@aiss.de> for reporting
+ 	  this.
 
 Wed Feb  7 23:02:46 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
-          new overridden cancel_aio() method.  Thanks to Alexander Libman
-          <Alibman@baltimore.com> for contributing this.
+	* ace/SUN_Proactor.cpp: Fixed the cancel_aiocb() method and added a
+	  new overridden cancel_aio() method.  Thanks to Alexander Libman
+ 	  <Alibman@baltimore.com> for contributing this.
 
 Thu Feb  8 02:09:05 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
-        * examples/QOS/Makefile:
-        * examples/QOS/client.dsp:
-        * examples/QOS/server.dsp:
-          Modified to use the ACE_QoS lib.
-        * Receiver_QoS_Event_Handler.cpp:
-        * Sender_QoS_Event_Handler.cpp:
-          Added missing Log_Msg.h for ACE_DEBUG.
-          Other files were modified to reflect changed directory location
-          of AQosA imclude files.
-
+	* examples/QOS/Makefile:
+	* examples/QOS/client.dsp:
+	* examples/QOS/server.dsp:
+	  Modified to use the ACE_QoS lib. 
+	* Receiver_QoS_Event_Handler.cpp:
+	* Sender_QoS_Event_Handler.cpp:
+	  Added missing Log_Msg.h for ACE_DEBUG.
+	  Other files were modified to reflect changed directory location
+	  of AQosA imclude files.
+	
 Thu Feb  8 00:17:43 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
 
-        * ace/QoS_Decorator.cpp:
-        * ace/QoS_Session_Factory.cpp:
-        * ace/SOCK_Dgram_Mcast_QoS.cpp:
-        * ace/QoS_Decorator.h:
-        * ace/QoS_Session_Factory.h:
-        * ace/SOCK_Dgram_Mcast_QoS.h:
-        * ace/QoS_Manager.cpp:
-        * ace/QoS_Session_Impl.cpp:
-        * ace/SOCK_Dgram_Mcast_QoS.i:
-        * ace/QoS_Manager.h:
-        * ace/QoS_Session_Impl.h:
-        * ace/QoS_Session_Impl.i:
-          Moved the AQoSA classes to ace/QoS directory.
-
-        * ace/Makefile:
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-          Removed the QoS related files, added QoS directory to build.
-
-        * ace/Qos/Makefile
-        * ace/QoS/ACE_QoS.dsw:
-        * ace/QoS/ACE_QoS.dsp:
-        * ace/QoS/ACE_QoS_Lib.dsp:
-        * ace/QoS/ACE_QoS_Export.h:
-          Added Makefile and MSVC project files.
-          Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this
-          change and providing the patch.
+	* ace/QoS_Decorator.cpp:
+	* ace/QoS_Session_Factory.cpp:
+	* ace/SOCK_Dgram_Mcast_QoS.cpp:
+	* ace/QoS_Decorator.h:
+	* ace/QoS_Session_Factory.h:
+	* ace/SOCK_Dgram_Mcast_QoS.h:
+	* ace/QoS_Manager.cpp:
+	* ace/QoS_Session_Impl.cpp:
+	* ace/SOCK_Dgram_Mcast_QoS.i:
+	* ace/QoS_Manager.h:
+	* ace/QoS_Session_Impl.h:
+	* ace/QoS_Session_Impl.i: 
+	  Moved the AQoSA classes to ace/QoS directory.
+
+	* ace/Makefile:
+	* ace/ace_dll.dsp:
+	* ace/ace_lib.dsp:
+	  Removed the QoS related files, added QoS directory to build.
+
+	* ace/Qos/Makefile
+	* ace/QoS/ACE_QoS.dsw:
+	* ace/QoS/ACE_QoS.dsp:	
+	* ace/QoS/ACE_QoS_Lib.dsp:
+	* ace/QoS/ACE_QoS_Export.h:
+	  Added Makefile and MSVC project files.
+	  Thanks to Craig Rodrigues <crodrigu@bbn.com> for suggesting this 
+	  change and providing the patch.
 
 Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
@@ -1607,15 +60,15 @@ Wed Feb  7 11:34:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Wed Feb  7 09:03:22 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
-          incorrect if/else branching.  Thanks to Lu Yunhai
-          <luyunhai@huawei.com> for reporting this.
+	* apps/Gateway/Gateway/Event_Channel.cpp (initiate_acceptors): Fixed
+	  incorrect if/else branching.  Thanks to Lu Yunhai
+ 	  <luyunhai@huawei.com> for reporting this.
 
 Tue Feb  6 23:43:49 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
-          %s to be %*s since the string may not be nul terminated!  Thanks
-          to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+	* apps/Gateway/Peer/Peer.cpp (await_events): Fixed the use of
+	  %s to be %*s since the string may not be nul terminated!  Thanks
+ 	  to Lu Yunhai <luyunhai@huawei.com> for reporting this.
 
 Tue Feb  6 20:11:28 2001  Krishnakumar B  <kitty@cs.wustl.edu>
 
@@ -1670,8 +123,8 @@ Tue Feb 06 17:16:43 2001  Steve Huston  <shuston@riverace.com>
 
 Mon Feb  5 16:19:20 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-        * ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
-          Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
+	* ace/ACE.cpp: ACE_TRACE ("ACE::basename") should be ACE_TRACE ("ACE::diname").
+	  Thanks to Lu Yunhai <luyunhai@huawei.com> for reporting this.
 
         * ace/Basic_Types.h: Changed the ACE_BIG_ENDIAN and ACE_LITTLE_ENDIAN
           macros to use the form 0x0123 rather than 0123X.  Thanks to
diff --git a/Makefile b/Makefile
index e87f74641ce..ef4d316929e 100644
--- a/Makefile
+++ b/Makefile
@@ -127,7 +127,18 @@ CONTROLLED_FILES = \
         AUTHORS \
         BIBLIOGRAPHY \
         COPYING \
-        ChangeLog* \
+        ChangeLog \
+        ChangeLog-99b \
+        ChangeLog-99a \
+        ChangeLog-98a \
+        ChangeLog-98b \
+        ChangeLog-97b \
+        ChangeLog-97a \
+        ChangeLog-96b \
+        ChangeLog-96a \
+        ChangeLog-95 \
+        ChangeLog-94 \
+        ChangeLog-93 \
         FAQ \
         Makefile \
         Makefile.am \
@@ -139,6 +150,7 @@ CONTROLLED_FILES = \
         THANKS \
         TODO \
         VERSION \
+        WindozeCE \
         acconfig.h \
         aclocal.m4 \
         ace \
diff --git a/PACE/ChangeLog b/PACE/ChangeLog
index 375b1a9302b..96faccc9792 100644
--- a/PACE/ChangeLog
+++ b/PACE/ChangeLog
@@ -1,77 +1,43 @@
-Wed Feb 28 15:04:41 2001  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * pace/posix/string.inl (pace_strtok_r):
-          Added call to strtok_r for Lynx and SunOS since it is
-          supported but PACE_HAS_REENTRANT doesn't get defined
-          for them.
-
-        * pace/posix/setjmp.inl:
-        * pace/setjmp.h:
-          Changed setjmp and sigsetjmp from functions to macros since
-          the functions were causing warnings on linux (Red Hat 7).
-
-        * include/makeinclude/rules.common.GNU:
-          Added support for Solaris 8
-
-Fri Feb  9 19:35:29 2001  Luther J Baker  <luther@cs.wustl.edu>
-
-        * pace/config/compiler.h
-        * pace/config/utility.h
-        * pace/config/fcntl.h
-        * pace/win32/mman.inl
-        * pace/win32/pthread.h
-        * pace/win32/semaphore.inl
-        * pace/win32/stat.inl
-        * pace/win32/stdio.inl
-        * pace/win32/types.h
-        * pace/win32/unistd.inl
-        * pace/win32/utime.h
-        * pace/win32/utime.inl
-
-          Thanks to Christopher Kohlhoff <chris@kohlhoff.com>
-          for making the changes necessary to port PACE to
-          Borland C++ Builder 5.
-
 Thu Feb  1 17:36:24 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-        * pace/win32/signal.h (PACE_SIGSET_T):
-        * pace/win32/signal.inl (pace_sigfillset):
+	* pace/win32/signal.h (PACE_SIGSET_T):
+	* pace/win32/signal.inl (pace_sigfillset):	
 
-          Used ACE implementation.
+	  Used ACE implementation.
 
 Sun Jan 28 13:20:28 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-        * pace/posix/unistd.inl (pace_getlogin_r):
+	* pace/posix/unistd.inl (pace_getlogin_r):
 
-          Changed C++ style comments to C.
+	  Changed C++ style comments to C.
 
 Thu Jan 25 17:26:41 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-        * pace/posix/unistd.inl (pace_access):
+	* pace/posix/unistd.inl (pace_access):
 
-          Yet another change to the illustrious function.
-          Let it be noted that there needs to be a better test for
-          the _REENTRANT policy. Linux supports 'these' calls but
-          is currently forced to the emulation code.
+	  Yet another change to the illustrious function.
+	  Let it be noted that there needs to be a better test for
+	  the _REENTRANT policy. Linux supports 'these' calls but
+	  is currently forced to the emulation code.
 
-          The #if (PACE_SUNOS) || (PACE_LYNXOS) should not be here.
-          Instead, there should be a simple test like PACE_HAS_REENTRANT
-          or something even higher (such as in ACE: ACE_MT_SAFE).
+	  The #if (PACE_SUNOS) || (PACE_LYNXOS) should not be here.
+	  Instead, there should be a simple test like PACE_HAS_REENTRANT
+	  or something even higher (such as in ACE: ACE_MT_SAFE).
 
 Tue Jan 23 14:56:51 2001  Luther J Baker  <luther@cs.wustl.edu>
 
-        * pace/posix/unistd.inl (pace_getlogin_r):
+	* pace/posix/unistd.inl (pace_getlogin_r):
 
-          Rewrote code and based preprocessor selection on
-          PACE_HAS_REENTRANT as opposed to PACE_LYNXOS, PACE_SUNOS
-          on an otherwise defined platform macro.
+	  Rewrote code and based preprocessor selection on
+	  PACE_HAS_REENTRANT as opposed to PACE_LYNXOS, PACE_SUNOS
+	  on an otherwise defined platform macro.
 
 Fri Jan 19 12:43:27 2001  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-        * pace/posix/socket.h:
-          Added a check for HPUX so that pace_family_t is not defined for
-          HPUX.
-
+	* pace/posix/socket.h: 
+	  Added a check for HPUX so that pace_family_t is not defined for
+	  HPUX.
+          
 Thu Jan 18 15:22:07 2001  Joe Hoffert  <joeh@cs.wustl.edu>
 
         * tests/Stdio_Test.c (main):
@@ -106,12 +72,12 @@ Mon Jan 15 10:44:39 2001  Darrell Brunsch <brunsch@uci.edu>
           - Fixed the intermediate and output directories to
             fit the model used in ACE.
 
-          - Changed the names of the two pace* projects so
+          - Changed the names of the two pace* projects so 
             msvc_auto_compile.pl will be able to recognize
             them as libraries.
 
           - Added two new configurations to test_stdio so it
-            now can link to both the dynamic and static
+            now can link to both the dynamic and static 
             version of PACE.
 
           - Changed the configuration name of the static
diff --git a/PACE/include/makeinclude/rules.common.GNU b/PACE/include/makeinclude/rules.common.GNU
index ebcdc1a2712..4d7f5a5e061 100644
--- a/PACE/include/makeinclude/rules.common.GNU
+++ b/PACE/include/makeinclude/rules.common.GNU
@@ -42,11 +42,8 @@ endif # PACE_SYSNAME == Linux
 # AIX               AIX
 
 ifeq ($(PACE_SYSNAME),SunOS)
-  # Hard code special cases for SunOS 5.6, 5.7, and 5.8 since
-  # we need a 3 digit version number for comparison purposes.
-  ifeq ($(PACE_SYSVER),58)
-    PACE_SYSVER := $(PACE_SYSVER)0
-  endif # PACE_SYSVER == 58
+  # Hard code special cases for SunOS 5.6 and 5.7 since we
+  # need a 3 digit version number for comparison purposes.
   ifeq ($(PACE_SYSVER),57)
     PACE_SYSVER := $(PACE_SYSVER)0
   endif # PACE_SYSVER == 57
diff --git a/PACE/pace/posix/setjmp.inl b/PACE/pace/posix/setjmp.inl
index e51bcb77167..0e5ad69026c 100644
--- a/PACE/pace/posix/setjmp.inl
+++ b/PACE/pace/posix/setjmp.inl
@@ -15,6 +15,24 @@
 
 #if (PACE_HAS_POSIX_CLS_UOF)
 PACE_INLINE
+int
+pace_setjmp (pace_jmp_buf env)
+{
+  return setjmp (env);
+}
+#endif /* PACE_HAS_POSIX_CLS_UOF */
+
+#if (PACE_HAS_POSIX_SIG_UOF)
+PACE_INLINE
+int
+pace_sigsetjmp (pace_sigjmp_buf env, int savemask)
+{
+  return sigsetjmp (env, savemask);
+}
+#endif /* PACE_HAS_POSIX_SIG_UOF */
+
+#if (PACE_HAS_POSIX_CLS_UOF)
+PACE_INLINE
 void
 pace_longjmp (pace_jmp_buf env, int val)
 {
diff --git a/PACE/pace/posix/string.inl b/PACE/pace/posix/string.inl
index de23cfacf52..a09022bf59e 100644
--- a/PACE/pace/posix/string.inl
+++ b/PACE/pace/posix/string.inl
@@ -193,7 +193,7 @@ PACE_INLINE
 char *
 pace_strtok_r (char * s, const char * sep, char ** lasts)
 {
-# if defined (PACE_HAS_REENTRANT) || (PACE_LYNXOS) || (PACE_SUNOS)    
+# if defined (PACE_HAS_REENTRANT)
   return strtok_r (s, sep, lasts);
 # else  /* ! PACE_HAS_REENTRANT */
   PACE_UNUSED_ARG (s);
diff --git a/PACE/pace/setjmp.h b/PACE/pace/setjmp.h
index 17cd17fb9a2..eaaea6057ff 100644
--- a/PACE/pace/setjmp.h
+++ b/PACE/pace/setjmp.h
@@ -36,8 +36,7 @@ extern "C" {
      IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
    */
 #if (PACE_HAS_POSIX_CLS_UOF)
-  /* int pace_setjmp (pace_jmp_buf env); */
-# define pace_setjmp setjmp
+  PACE_INLINE int pace_setjmp (pace_jmp_buf env);
 #endif /* PACE_HAS_POSIX_CLS_UOF */
 
   /**
@@ -46,8 +45,7 @@ extern "C" {
      IEEE Std 1003.1, 1996 Edition), Section 8.3.1.
    */
 #if (PACE_HAS_POSIX_SIG_UOF)
-  /* int pace_sigsetjmp (pace_sigjmp_buf env, int savemask); */
-# define pace_sigsetjmp setjmp
+  PACE_INLINE int pace_sigsetjmp (pace_sigjmp_buf env, int savemask);
 #endif /* PACE_HAS_POSIX_SIG_UOF */
 
   /**
diff --git a/PACE/pace/win32/fcntl.h b/PACE/pace/win32/fcntl.h
index 7cb57a52cb0..c3b91b0f900 100644
--- a/PACE/pace/win32/fcntl.h
+++ b/PACE/pace/win32/fcntl.h
@@ -25,10 +25,6 @@
 extern "C" {
 #endif /* PACE_HAS_CPLUSPLUS */
 
-#if defined (__BORLANDC__)
-#define _O_TEMPORARY 0x08
-#endif /* __BORLANDC__ */
-
 #define PACE_FD_CLOEXEC FD_CLOEXEC
 #define PACE_F_DUPFD D_DUPFD
 #define PACE_F_GETFD F_GETFD
diff --git a/PACE/pace/win32/mman.inl b/PACE/pace/win32/mman.inl
index c324089991b..1b0abb8ee1b 100644
--- a/PACE/pace/win32/mman.inl
+++ b/PACE/pace/win32/mman.inl
@@ -120,10 +120,6 @@ PACE_INLINE
 int
 pace_shm_unlink (const char * name)
 {
-#if defined (__BORLANDC__)
-  return unlink (name);
-#else /* __BORLANDC__ */
   return _unlink (name);
-#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
diff --git a/PACE/pace/win32/pthread.h b/PACE/pace/win32/pthread.h
index 582b89c2ab1..32e529e1da5 100644
--- a/PACE/pace/win32/pthread.h
+++ b/PACE/pace/win32/pthread.h
@@ -153,7 +153,7 @@ extern "C" {
 
 #if (PACE_HAS_POSIX_NONUOF_FUNCS)
   int pthread_attr_getstackaddr (const pace_pthread_attr_t * attr,
-				 void ** stackaddr);
+				 void * stackaddr);
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
 
 #if (PACE_HAS_POSIX_NONUOF_FUNCS)
diff --git a/PACE/pace/win32/semaphore.inl b/PACE/pace/win32/semaphore.inl
index dea94013317..796abccb479 100644
--- a/PACE/pace/win32/semaphore.inl
+++ b/PACE/pace/win32/semaphore.inl
@@ -89,11 +89,7 @@ PACE_INLINE
 int
 pace_sem_unlink (const char * name)
 {
-#if defined (__BORLANDC__)
-  return unlink (name);
-#else /* __BORLANDC__ */
   return _unlink (name);
-#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_NONUOF_FUNCS */
 
diff --git a/PACE/pace/win32/stat.inl b/PACE/pace/win32/stat.inl
index 4ebc17eed86..fb45b0ded51 100644
--- a/PACE/pace/win32/stat.inl
+++ b/PACE/pace/win32/stat.inl
@@ -90,10 +90,6 @@ PACE_INLINE
 pace_mode_t
 pace_umask (pace_mode_t cmask)
 {
-#if defined (__BORLANDC__)
-  return umask (cmask);
-#else /* __BORLANDC__ */
   return _umask (cmask);
-#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_FA_UOF */
diff --git a/PACE/pace/win32/stdio.inl b/PACE/pace/win32/stdio.inl
index 180140149b9..fca3384d839 100644
--- a/PACE/pace/win32/stdio.inl
+++ b/PACE/pace/win32/stdio.inl
@@ -49,11 +49,7 @@ FILE *
 pace_fdopen (int fildes,
              const char * type)
 {
-#if defined (__BORLANDC__)
-  return fdopen (fildes, (char *)type);
-#else /* __BORLANDC__ */
   return fdopen (fildes, type);
-#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_DI_UOF */
 
diff --git a/PACE/pace/win32/types.h b/PACE/pace/win32/types.h
index cd6a7b10cd8..fdf9f2f2f2e 100644
--- a/PACE/pace/win32/types.h
+++ b/PACE/pace/win32/types.h
@@ -17,12 +17,8 @@
 #define PACE_SYS_TYPES_H_WIN32
 
 #include <sys/types.h>
-#if defined (__BORLANDC__)
-# include <windows.h>
-#else /* __BORLANDC__ */
-# include <wtypes.h>
-# include <windef.h>
-#endif /* __BORLANDC__ */
+#include <wtypes.h>
+#include <windef.h>
 
 #if defined (PACE_HAS_CPLUSPLUS)
 extern "C" {
diff --git a/PACE/pace/win32/unistd.inl b/PACE/pace/win32/unistd.inl
index bccc6bb6f48..3270cf19896 100644
--- a/PACE/pace/win32/unistd.inl
+++ b/PACE/pace/win32/unistd.inl
@@ -53,11 +53,7 @@ PACE_INLINE
 int
 pace_chdir (const char * path)
 {
-#if defined (__BORLANDC__)
-  return chdir (path);
-#else /* __BORLANDC__ */
   return _chdir (path);
-#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_FS_UOF */
 
@@ -109,11 +105,7 @@ int
 pace_execv (const char * path,
             char * const argv[])
 {
-#if defined (__BORLANDC__)
-  return execv (path, argv);
-#else /* __BORLANDC__ */
   return _execv (path, (const char * const *) argv);
-#endif /* __BORLANDC__ */
   /* if successful, this operation does NOT return */
 }
 #endif /* PACE_HAS_POSIX_MP_UOF */
@@ -125,12 +117,8 @@ pace_execve (const char * path,
              char * const argv[],
              char * const envp[])
 {
-#if defined (__BORLANDC__)
-  return execve (path, argv, envp);
-#else /* __BORLANDC__ */
   return _execve (path, (const char *const *) argv,
                   (const char *const *) envp);
-#endif /* __BORLANDC__ */
   /* if successful, this operation does NOT return */
 }
 #endif /* PACE_HAS_POSIX_MP_UOF */
@@ -141,11 +129,7 @@ int
 pace_execvp (const char * file,
              char * const argv[])
 {
-#if defined (__BORLANDC__)
-  return execvp (file, argv);
-#else /* __BORLANDC__ */
   return _execvp (file, (const char *const *) argv);
-#endif /* __BORLANDC__ */
   /* if successful, this operation does NOT return */
 }
 #endif /* PACE_HAS_POSIX_MP_UOF */
@@ -310,11 +294,7 @@ PACE_INLINE
 int
 pace_isatty (int fildes)
 {
-#if defined (__BORLANDC__)
-  return isatty (fildes);
-#else /* __BORLANDC__ */
   return _isatty (fildes);
-#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_DS_UOF */
 
diff --git a/PACE/pace/win32/utime.h b/PACE/pace/win32/utime.h
index 5b90db1bd70..cfd7e5014ce 100644
--- a/PACE/pace/win32/utime.h
+++ b/PACE/pace/win32/utime.h
@@ -17,11 +17,7 @@
 #define PACE_UTIME_H_WIN32
 
 #include "pace/sys/types.h"
-#if defined (__BORLANDC__)
-#include <utime.h>
-#else
 #include <sys/utime.h>
-#endif /* __BORLANDC__ */
 
 #if defined (PACE_HAS_CPLUSPLUS)
 extern "C" {
diff --git a/PACE/pace/win32/utime.inl b/PACE/pace/win32/utime.inl
index 4a83d7713e0..1154ebd29c4 100644
--- a/PACE/pace/win32/utime.inl
+++ b/PACE/pace/win32/utime.inl
@@ -23,11 +23,7 @@ pace_utime (const char * path,
 {
   /* Emulation not yet finished! Not yet working! */
 
-#if defined (__BORLANDC__)
-  return utime (path, (const struct utimbuf*)times);  
-#else /* __BORLANDC__ */
   /* Not quite the perfect answer... win32 doesn't take const args. */
   return _utime ((char*)path, (struct _utimbuf*)times);  
-#endif /* __BORLANDC__ */
 }
 #endif /* PACE_HAS_POSIX_FS_UOF */
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 925fc234a79..ebc905aeaf5 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -35,7 +35,7 @@
 To: ace-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 5.1.13
+    ACE VERSION: 5.1.12
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/STL/ACE_Changes b/STL/ACE_Changes
deleted file mode 100644
index 902fb94c94c..00000000000
--- a/STL/ACE_Changes
+++ /dev/null
@@ -1,53 +0,0 @@
-This version of STL was obtained from
-http://www.rahul.net/terris/.  This is a modified version of the
-implementation that comes with VC++4.0.  Please see readme2.stl for
-details. 
-
-The following modification have been made for compilation with VC++4.x
-
-________________________________________
-
-vector.h (line 85)
-________________________________________
-
-
-    /*
-     *  This is cause the VC++ compiler sucks
-     *  and does not recognize nested classes properly
-     *       
-     */
-#if !defined (VC_PLUS_PLUS_NESTED_CLASS_PROBLEM)
-    vector(size_type n, const T& value = T()) {
-	start = static_allocator.allocate(n);
-	uninitialized_fill_n(start, n, value);
-	finish = start + n;
-	end_of_storage = finish;
-    }
-#endif /* VC_PLUS_PLUS_NESTED_CLASS_PROBLEM */
-
-
-________________________________________
-
-bstring.h (line 1102)
-________________________________________
-
-
-    /* 
-     * This should be correctly scoped
-     *
-     * if (cap == ::reserve)
-     */
-
-    if (cap == std::reserve)
-    {
-       len = 0;
-       res = size;
-       ptr = new charT [res];
-    }
-    /* 
-     * This should be correctly scoped
-     *
-     *     else if ((cap == ::default_size) && (size != NPOS))
-     */
-
-    else if ((cap == std::default_size) && (size != NPOS))
diff --git a/STL/readme2.stl b/STL/readme2.stl
deleted file mode 100644
index 5132bc1189b..00000000000
--- a/STL/readme2.stl
+++ /dev/null
@@ -1,272 +0,0 @@
-STL2.ZIP
-
-Standard Template Library for Visual C++ 4.0 
-and Related Classes
-
-Revised 10/15/96 - Bug fixes and change to bit_vector.
-
-This version supports DLLs and threading.  You must use critical
-sections around code that uses the same container in different
-threads.  These features come at a price -- since memory
-usage is not optimal, this code may use more memory and
-may be slower.
-
-+ General strategy: Remove all statics except the
-  static allocator objects.  
-+ Vectors were not affected.
-+ Major changes made to tree.h
-+ Stability: Very stable.
-
-This code should be considered for experimental use only.  There
-are still statics lurking in some functions; these functions
-are not thread-safe.
-
--------------------------
-Fix for bit_vector
--------------------------
-This version also has a fix for bit_vector, which doesn't really
-work with VC++ 4.x.  Please include bvector.cpp in your
-project if you use bit_vector.  This fixes the linker errors
-that occur if you use bector.h in multiple .cpp files.
-
--------------------------
-Disclaimer
--------------------------
-Code is provided without warranty, liability, or technical support.
-
-STL.H and PTR.H are freely distributable and can be 
-modified in any way.
-
---------------------------------
-STRING.H does not compile.
---------------------------------
-
-"D. Pirzadeh" <ddp@crl.com> Explains how to fix:
-
-First, I got compile errors in "bstring.h"
-and changed it as follows to correct:
-        line 1104               "::reserve" -> "std::reserve"
-        line 1110               "::default_size" -> "std::default_size"
-
-Also, I got an INTERNAL COMPILER ERROR with Visual C++ v4.0 when I did the fol-
-lowing:
-        class xyz : public std::string { }
-
-I fixed it with:
-        typedef std::string XyzString;
-        class xyz : public XyzString { }
-
---------------------------------
-Changes made to STL distribution
---------------------------------
-
-These files were modified from the STL distribution shipped with 
-Microsoft Visual C++ 4.0.  The files here are a complete,
-working version of the STL.  These files have been tested with
-MFC applications.
-
-Changes were made to practically all header files.  Look for
-comments like:
-
-*Added by...
-*Changed by...
- 
-------------------
-Usage Instructions
-------------------
-
-Set the preprocessor variable NOMINMAX.
-
-As Microsoft recommends, the STL is compiled in the std namespace.
-
-When including these files, do **not** do this:
-
-	namespace std
-	{
-	  #include <vector.h>
-	}
-
-Instead, do this:
-
-	#include <vector.h>
-
-Recommended usage:
-
-	First, include:
-
-	#include <afxwin.h>
-	#include <afxext.h>
-	#include <afxtempl.h>
-
-	Then include the STL header files.
-
--------------------
-Support for CString
--------------------
-The stl.h file contains code written by me.  The file contains
-operators that will allow you to use CString objects with STL
-containers and functions.
-
-!!!! CString will not work with STL unless you include <stl.h> !!!!
-
--------------------------------------------
-Helper functions for pointers-in-containers
--------------------------------------------
-There is a file called stl.h which contains two functions:
-  SequenceDelete
-  MapDelete
-These functions send "delete" to all of the objects in a container.
-
-If you don't like this approach, you can use a supplied "pointer
-wrapper" class.
-
-There is a file called ptr.h which contains a class called Ptr 
-that can be used exactly like a pointer.  The object has a pointer 
-inside it that points to an object of any class.  When a Ptr object 
-is deleted, "delete" is sent to its underlying pointer.  Ptr can be 
-used with any STL container, as it has a copy constructor and 
-assignment operator, which transfers "ownership" of the pointer from 
-the source object to the destination object.  Ptr is from the book 
-Design Patterns by Gamma et al -- see the Proxy pattern.  
-
-The Ptr class makes memory leaks impossible, because it deletes
-objects automatically when the container is deleted, or when 
-functions like "delete" are used.
-
-Example:
-
-  This is a vector of CStrings:
-
-  std::vector< Ptr<CString> > StringVector;
-
-  StringVector.push_back( Ptr( new CString( "hello" ) ) );
-  StringVector.push_back( Ptr( new CString( "This is another string" ) ) );
-
-------------------------
-Common Problems with STL
-------------------------
-
-1) Compiler error: != is ambiguous
-
-   Solution: put the following line at the beginning of the method
-             that caused the error:
-
-   using namespace std;
-
-2) When using maps, the debugger crashes.
-
-   This is because symbols for maps (actually, for the "pair")
-   get truncated to 255 characters.  Solution:  Turn off the
-   variables window in the debugger.  Don't try to look at
-   a symbol that has been truncated.  This is not an STL-specific
-   bug --  It's a bug in the debugger.
-
-3) All sorts of compile errors in STL header files
-
-   Make sure the preprocessor variable NOMINMAX is defined
-
-
-4) Compiler errors about "operator < is not available", etc.
-   The class involved has global comparison operators.
-
-   Solution:
-   Write "routers" in the std namespace to the global namespace.
-   Example (see also stl.h - this is how CString is able
-   to work with STL):
-
-	namespace std
-	{
-		BOOL operator < ( const MyClass & rLhs,
-				  const AnotherClass & rRhs )
-		{
-		return ::operator < ( rLhs, rRhs );
-		}
-	}
-
-   See also 5.
-
-5) When you use find() or another algorithm, the compiler
-   complains that it cannot find the == or < operators.
-
-If your code compiles without any error messages, then disregard
-this section.  However, if you get errors like "cannot convert
-first argument from const class X" then read on. 
-
-I am assuming that your code is calling an STL algorithm like
-std::sort() or std::find().  If you're not, I can't help
-you.
-
-There is apparently a bug in the Microsoft compiler regarding
-namespaces.  Namespaces cannot locate global 
-functions that reside in the global namespace.  For example, 
-the binary == operator.
-
-Maybe this is a bug, maybe it isn't.  This is not clear
-to me.  However, I do know what works and have tried many other
-approaches that do not work.  If you have a better solution I
-would appreciate it if you could let me know about it. 
-
-So, if you declare your own class and want to use algorithms 
-like find() on an STL container, you have two choices:
-
-(1) Declare == as a member function.
-(2) Declare global operators == and !=.
-
-(1) simply works.  There will come a time, however, when (1)
-won't satisfy your needs.  If A == B, then B == A.  You can't
-do this using member functions if A and B are from different 
-classes.
-
-If you choose (2), you must add the != operator to the std
-namespace.  There are two ways to do this.  First, you can do
-this:
-   namespace std
-   { 
-     inline operator != ( const MyClass &rLhs, const MyClass &rRhs )
-     {
-       return ::operator != ( rLhs, rRhs );
-     }
-   }
-This "routes" != from the std namespace to the global namespace.
-
-Note that ( lhs != rhs ) can be derived from the == operator
-as !( lhs == rhs ).  There is a macro in STL.H, 
-STL_DECLARE_GLOBAL_NE, that does this derivation. 
-This derivation will not work when for whatever reason, !(lhs == rhs)
-is not the same as ( lhs != rhs ).
-
-The following example shows what you have to do for find().  Other
-algorithms require you to declare <, <=, and >= too.  See the
-macros STL_DECLARE_GLOBAL_GE, STL_DECLARE_GLOBAL_LT, and
-STL_GLOBAL_LE.  These macros derive new comparison operators
-from "operator <( const T&, const T& )".
-
-class MyClass
-{
-  public:
-  
-  int units;
-  CString description;
-};
-
-// We want to be able to test two MyClass objects against each other
-// in STL.  Need to create a global operator for this purpose.
-// Since we use find(), we need to declare not-equal too.
-bool operator == ( const MyClass &, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, MyClass )
-
-// These operators test for a matching description.
-// We do A == B and B == A to be consistent.
-bool operator == ( const MyClass&, const CString & );
-bool operator == ( const CString&, const MyClass & );
-STL_DECLARE_GLOBAL_NE( MyClass, CString )
-STL_DECLARE_GLOBAL_NE( CString, MyClass )
-
-6. Errors when creating vectors that have vectors and deques
-   that have deques.
-
-   Solution:  Provide atruments to the constructor.
-
-    std::vector< std::vector<int> >
-      TwoDimensional( 0, std::vector<int>() );
-
diff --git a/Static_Performance.dsw b/Static_Performance.dsw
index 8e50198ea15..2c114ac9adf 100644
--- a/Static_Performance.dsw
+++ b/Static_Performance.dsw
@@ -249,6 +249,21 @@ Package=<4>
 

 ###############################################################################

 

+Project: "gperf_lib"=.\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE dynamic library

+    End Project Dependency

+}}}

+

+###############################################################################

+

 Global:

 

 Package=<5>

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 58c5a428131..71367106f22 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3322 +1,238 @@
-Mon Mar  5 11:24:05 2001  Carlos O'Ryan  <coryan@uci.edu>
+Mon Mar  5 11:32:14 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/tests/EC_Basic/EC_Basic.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/tests/Event/Basic/Observer.cpp:
-        * orbsvcs/tests/Event/Performance/Latency.cpp:
-        * orbsvcs/tests/Event/Performance/Latency_Server.cpp:
-        * orbsvcs/tests/Event/lib/Driver.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Fixed more missing ACE_TRY_ENV in resolve_initial_references()
-
-Mon Mar  5 12:55:06 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp:
-          Removed bogus files from project file list.
-
-        * examples/PluggableUDP/DIOP/DIOP_Connector.cpp:
-        * examples/PluggableUDP/DIOP/DIOP_Transport.cpp:
-          Fixed some comments that were causing warnings with the Windows
-          builds.
-
-Mon Mar  5 12:24:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tests/IDL_Test/main.cpp:
-
-          Added ACE_TRY_ENV and check to the call to
-          resolve_initial_references ("RootPOA").
-
-Mon Mar  5 07:35:35 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile:
-          Fixed library name.
-
-Mon Mar  5 08:03:03 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * tests/Makefile.bor
-        * tests/Native_Exceptions/*.bor
-
-          Added BCB specific makefiles for this test
-
-Mon Mar  5 07:59:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * tests/AMI/client.cpp:
-        * tests/AMI/simple_client.cpp:
-        * tests/AMI/server.cpp:
-        * examples/mfc/client.cpp:
-        * examples/mfc/server.cpp:
-
-          Fixed exception handling, especially missing ACE_TRY_ENVs for
-          CORBA::ORB::resolve_initial_references (). Thanks to Ossama for
-          pointing this out.
-
-        * examples/PluggableUDP/Diop/README:
-
-          Added a small paragraph about the limitations of the current
-          DIOP implemenation.
-          Also, added a disclaimer.
-
-Mon Mar  5 04:42:52 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/Comp_Test/ftp.h:
-        * orbsvcs/tests/AVStreams/Comp_Test/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Comp_Test/server.h:
-        * orbsvcs/tests/AVStreams/Comp_Test/server.cpp:
-        * orbsvcs/tests/AVStreams/Comp_Test/README:
-        * orbsvcs/tests/AVStreams/Comp_Test/run_test.pl:
-
-          Added a new test to the AVStreams tests in order to demonstrate
-          the use of AVStreams Service to pace data at a specified frame rate.
-
-Mon Mar  5 01:26:42 2001  Fuzz Master D <brunsch@uci.edu>
-
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl:
-        * orbsvcs/examples/CosEC/Simple/run_test.pl:
-        * orbsvcs/examples/RtEC/Simple/run_test.pl:
-
-          The last of the PerlACE::Run_Test changes.  Everything else
-          that still uses ACEutils does so because they need more help
-          than I can provide right now (mostly using redirection in
-          the scripts, which does not work on Windows in either the
-          new or old Process module).
-
-          But anyway, I'll still use it to signify the close to my career
-          as the the group Perl junkie.  Somewhat fitting that what
-          started off with what I believe was a run_test script for
-          IDL_Cubit and its associated Process module ended with
-          changing most every run_test for a new PerlACE::Process module.
-
-          Let's have a moment of silence for remembrance.
-
-
-
-
-
-
-
-          I think that's long enough.  Seriously, the main reason I
-          wanted a moment of silence is so I can clearly hear the
-          anguished cries from all those who find out that they get to
-          maintain my perl scripts once I leave.  ;-)
-
-Mon Mar 05 09:10:27 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * examples/Makefile.bor:
-        * examples/PluggableUDP/Makefile.bor:
-        * examples/PluggableUDP/tests/Makefile.bor:
-        * examples/PluggableUDP/Diop/Makefile.bor:
-
-          Included Diop in the BCB build and make tests makefile empty
-          because for tests there is no correct client and server makefile yet
-
-Sun Mar 04 23:00:59 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/ORB.h (run):
-
-          Updated comments for the ORB::run() method.  This method, as
-          implemented by TAO, no longer returns an "int" error status (see
-          Carlos' ChangeLog entry from Feb 13).  The CORBA spec calls for
-          a "void" return type.
-
-Sun Mar 04 21:43:51 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/CosEvent_Service/Makefile:
-        * orbsvcs/Dump_Schedule/Makefile:
-        * orbsvcs/Event_Service/Makefile:
-        * orbsvcs/LifeCycle_Service/Makefile:
-        * orbsvcs/Logging_Service/Makefile:
-        * orbsvcs/Notify_Service/Makefile:
-        * orbsvcs/Scheduling_Service/Makefile:
-        * orbsvcs/tests/AVStreams/benchmark/Makefile:
-        * orbsvcs/tests/CosEvent/Basic/Makefile:
-        * orbsvcs/tests/EC_Basic/Makefile:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile:
-        * orbsvcs/tests/EC_Multiple/Makefile:
-        * orbsvcs/tests/EC_Throughput/Makefile:
-        * orbsvcs/tests/Event/Basic/Makefile:
-        * orbsvcs/tests/Event/Performance/Makefile:
-        * orbsvcs/tests/Event_Latency/Makefile:
-        * orbsvcs/tests/FaultTolerance/IOGR/Makefile:
-        * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile:
-        * orbsvcs/tests/Sched/Makefile:
-        * orbsvcs/tests/Trading/Makefile:
-        * orbsvcs/tests/ior_corbaname/Makefile:
-          The libraries added to support QNX were not in the right order,
-          it should be fixed now.
-
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h:
-          Several minor cosmetic fixes.
-
-Sun Mar 04 20:15:33 2001  Ossama Othman  <ossama@uci.edu>
-
-        * examples/Content_Server/SMI_Iterator/client.cpp (retrieve_data):
-        * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
-          (initialize_content_iterator):
-        * examples/Content_Server/AMI_Observer/Callback_i.cpp
-          (Callback_i):
-
-          Windows doesn't like the POSIX.1 mode constants I was using in
-          these files.  Use the ACE_DEFAULT_FILE_PERMS macro instead to
-          work-around Windows-specific stuff like this.
-
-          Fixed error messages so that they properly display filename with
-          which the error was associated.
-
-Sun Mar  4 21:39:03 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-          Commented in TAO_TAG_UDP_PROFILE now that DIOP is being
-          built regularly.
-
-        * examples/PluggableUDP/DIOP/DIOP_Connector.cpp:
-        * examples/PluggableUDP/DIOP/DIOP_Transport.cpp:
-          Fixed compile warnings under Linux.
-
-Sun Mar  4 19:12:59 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * examples/Callback_Quoter/Consumer.dsp:
-        * examples/Callback_Quoter/Notifier.dsp:
-        * examples/Callback_Quoter/Supplier.dsp:
-        * examples/Load_Balancing/client.dsp:
-        * examples/Load_Balancing/server.dsp:
-        * examples/Load_Balancing/service.dsp:
-        * examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp:
-        * examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp:
-        * examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp:
-        * orbsvcs/tests/EC_Basic/EC_Basic.dsp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp:
-        * orbsvcs/tests/Interoperable_Naming/client.dsp:
-        * orbsvcs/tests/LoadBalancing/client.dsp:
-        * orbsvcs/tests/LoadBalancing/server.dsp:
-        * orbsvcs/tests/Simple_Naming/client.dsp:
-        * orbsvcs/tests/Trading/Colocated_Test.dsp:
-        * orbsvcs/tests/Trading/Export_Test.dsp:
-        * orbsvcs/tests/Trading/Import_Test.dsp:
-        * orbsvcs/tests/Trading/TradingLib.dsp:
-        * tests/AMI/AMI_Test_Client.dsp:
-        * tests/AMI/AMI_Test_Server.dsp:
-        * tests/AMI/AMI_Test_Simple_Client.dsp:
-        * tests/AMI_Timeouts/client.dsp:
-        * tests/AMI_Timeouts/server.dsp:
-        * tests/DynAny_Test/basic_test.dsp:
-        * tests/Multiple/Client.dsp:
-        * tests/Multiple/Server.dsp:
-        * tests/Native_Exceptions/client.dsp:
-        * tests/ORB_destroy/ORB_destroy.dsp:
-        * tests/Native_Exceptions/server.dsp:
-        * tests/Object_Loader/Test_DLL.dsp:
-        * tests/Object_Loader/driver.dsp:
-        * tests/Portable_Interceptors/Benchmark/client.dsp:
-        * tests/Portable_Interceptors/Benchmark/server.dsp:
-        * tests/Smart_Proxies/client.dsp:
-        * tests/Smart_Proxies/server.dsp:
-        * tests/Timeout/client.dsp:
-        * tests/Timeout/server.dsp:
-
-          Fixed problems with outputting the release executables into
-          the wrong directory.
-
-        * tests/CDR/alignment.dsp: (added)
-        * tests/CDR/allocator.dsp: (added)
-        * tests/CDR/CDR.dsw:
+	* tao/Transport.cpp:
+	* tao/IIOP_Transport.cpp:
+	  Add debugging messages
 
-          Added a couple of missing projects.
-
-        * tests/Leader_Followers/run_test.pl:
-        * tests/Leader_Followers/run_test_mt.pl:
-
-          Split the actions of this test into 2 run_tests, so it
-          doesn't hit the sandbox timeout in the nightly builds.
-
-        * examples/Buffered_AMI/run_test.pl:
-        * examples/Buffered_Oneways/run_test.pl:
-        * examples/Callback_Quoter/run_test.pl:
-        * examples/Load_Balancing/run_test.pl:
-        * examples/Logging/run_test.pl:
-        * examples/OBV/Typed_Events/run_test.pl:
-        * examples/PluggableUDP/tests/run_test.pl:
-        * examples/POA/Forwarding/run_test.pl:
-        * examples/Persistent_Grid/run_test.pl:
-        * examples/Simple/bank/run_test.pl:
-        * examples/Simple/echo/run_test.pl:
-        * examples/Simple/grid/run_test.pl:
-        * examples/Simple/time/run_test.pl:
-        * examples/Simple/time-date/run_test.pl:
-        * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * orbsvcs/tests/AVStreams/Latency/run_test.pl:
-        * orbsvcs/tests/AVStreams/Multicast/run_test.pl:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
-        * orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-        * orbsvcs/tests/AVStreams/benchmark/run_test.pl:
-        * orbsvcs/tests/CosEvent/Basic/run_test.pl:
-        * orbsvcs/tests/EC_Basic/run_test.pl:
-        * orbsvcs/tests/EC_Custom_Marshal/run_test.pl:
-        * orbsvcs/tests/EC_Mcast/run_test.pl:
-        * orbsvcs/tests/EC_Multiple/run_test.pl:
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-        * orbsvcs/tests/Event/Basic/exhaustive_test.pl:
-        * orbsvcs/tests/Event/Basic/run_test.pl:
-        * orbsvcs/tests/Event/Performance/run_test.pl:
-        * orbsvcs/tests/Event_Latency/run_test.pl:
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/ImplRepo/NameService/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:
-        * orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl:
-        * orbsvcs/tests/Interoperable_Naming/run_test.pl:
-        * orbsvcs/tests/Property/run_test.pl:
-        * orbsvcs/tests/Simple_Naming/process-m-output.pl:
-        * orbsvcs/tests/Simple_Naming/run_test.pl:
-        * orbsvcs/tests/Time/run_test.pl:
-        * orbsvcs/tests/Trading/run_test.pl:
-        * tests/AMI/run_test.pl:
-        * tests/AMI_Timeouts/run_test.pl:
-        * tests/BiDirectional/run_test.pl:
-        * tests/BiDirectional_NestedUpcall/run_test.pl:
-        * tests/CDR/run_test.pl:
-        * tests/Codec/run_test.pl:
-        * tests/Connection_Purging/run_test.pl:
-        * tests/DSI_Gateway/run_test.pl:
-        * tests/DynAny_Test/run_test.pl:
-        * tests/Endpoint_Per_Priority/run_test.pl:
-        * tests/Exposed_Policies/run_test.pl:
-        * tests/Faults/run_test.pl:
-        * tests/Forwarding/run_test.pl:
-        * tests/IDL_Test/run_test.pl:
-        * tests/IORManipulation/run_test.pl:
-        * tests/InterOp-Naming/run_test.pl:
-        * tests/Leader_Followers/run_test.pl:
-        * tests/LongUpcalls/run_test.pl:
-        * tests/LongWrites/run_test.pl:
-        * tests/MT_Client/run_test.pl:
-        * tests/MT_Server/run_test.pl:
-        * tests/Multiple/run_test.pl:
-        * tests/Multiple_Inheritance/run_test.pl:
-        * tests/Native_Exceptions/run_test.pl:
-        * tests/NestedUpcall/MT_Client_Test/run_test.pl:
-        * tests/NestedUpcall/Simple/run_test.pl:
-        * tests/NestedUpcall/Triangle_Test/run_test.pl:
-        * tests/Nested_Event_Loop/run_test.pl:
-        * tests/ORB_destroy/run_test.pl:
-        * tests/ORB_init/run_test.pl:
-        * tests/Object_Loader/run_test.pl:
-        * tests/OctetSeq/run_test.pl:
-        * tests/POA/Deactivation/run_test.pl:
-        * tests/POA/Destruction/run_test.pl:
-        * tests/POA/Identity/run_test.pl:
-        * tests/POA/Non_Servant_Upcalls/run_test.pl:
-        * tests/POA/wait_for_completion/run_test.pl:
-        * tests/Param_Test/run_test.pl:
-        * tests/Param_Test/run_test_dii.pl:
-        * tests/Policies/run_test.pl:
-        * tests/Portable_Interceptors/Benchmark/run_test.pl:
-        * tests/Portable_Interceptors/Dynamic/run_test.pl:
-        * tests/Portable_Interceptors/ForwardRequest/run_test.pl:
-        * tests/Portable_Interceptors/IORInterceptor/run_test.pl:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl:
-        * tests/RTCORBA/Banded_Connections/run_test.pl:
-        * tests/RTCORBA/Client_Propagated/run_test.pl:
-        * tests/RTCORBA/Client_Protocol/run_test.pl:
-        * tests/RTCORBA/Explicit_Binding/run_test.pl:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl:
-        * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl:
-        * tests/RTCORBA/Private_Connection/run_test.pl:
-        * tests/RTCORBA/RTMutex/run_test.pl:
-        * tests/RTCORBA/Server_Declared/run_test.pl:
-        * tests/RTCORBA/Server_Protocol/run_test.pl:
-        * tests/Smart_Proxies/run_test.pl:
-        * tests/Smart_Proxies/Benchmark/run_test.pl:
-        * tests/Smart_Proxies/On_Demand/run_test.pl:
-        * tests/Smart_Proxies/Policy/run_test.pl:
-        * tests/Timed_Buffered_Oneways/run_test.pl:
-        * tests/Timeout/run_test.pl:
-        * tests/Xt_Stopwatch/run_test.pl:
-        * tests/ior_corbaloc/run_test.pl:
-
-          Updated to use PerlACE::Run_Test;
-
-Sun Mar 04 16:01:50 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/RT_Current.h:
-        * tao/RT_Mutex.h:
-        * tao/RT_ORB.h:
-        * tao/RT_Policy_i.h:
-
-          Removed inclusion of `tao/RTCORBAS.h'.  The RTCORBA module only
-          defines local interfaces, so there is no need to include this
-          header.  Included `tao/RTCORBAC.h' instead.  This reduces header
-          dependencies.
+        * tests/LongWrites/Makefile:
+	  Updates dependencies and object files for the client.
 
-        * tao/RTCORBAC.cpp:
-        * tao/TAOC.cpp:
-        * tao/TimeBaseC.cpp:
+Fri Mar 02 15:29:17 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-          We should never include a skeleton header for the same IDL in
-          the corresponding stub sources.  Removed those includes
-          (e.g. removed '#include "tao/TAOS.h"' from TAOC.cpp).
+        * tao/Transport.h:
+        * tao/Transport.cpp:
+          Continue implementation of reactive output.
+          On this pass I fixed the code to deal with several error
+          conditions, invoke schedule_output() if the connection returns
+          an EWOULDBLOCK, also cancel the output if there is no data to
+          send.
+          Fix syncronization on send_queued_message()
+          Fix memory allocation for message blocks contained in
+          Queued_Message, they cannot be cloned() because that would
+          allocate from TSS.
 
-        * tao/Makefile:
-        * tao/Makefile.bor:
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp:
+        * tao/IIOP_Transport.h:
+        * tao/IIOP_Transport.cpp:
+          Implement schedule_output() and cancel_output() methods.
 
-          Do not compile the following empty skeleton files:
+        * tao/Wait_On_Leader_Follower.cpp:
+          Do not re-insert the transport into the reactor on each wait,
+          once is enough.
 
-            CONV_FRAMES
-            GIOPS
-            IOPS
-            PollableS
-            RTCORBAS
-            TAOS
+        * tao/IIOP_Connection_Handler.h:
+        * tao/IIOP_Connection_Handler.cpp:
+          Implement a handle_output() callback, delegate on the
+          TAO_Transport
 
-Sun Mar 04 13:55:28 2001  Carlos O'Ryan  <coryan@uci.edu>
+        * tao/IIOP_Endpoint.cpp:
+          Remove unused #include
 
-        * examples/AMI/FL_Callback/peer.cpp:
-        * examples/AMI/FL_Callback/progress.cpp:
-        * tests/DSI_Gateway/gateway.cpp:
-        * tests/DSI_Gateway/server.cpp:
-        * tests/Endpoint_Per_Priority/client.cpp:
-        * tests/Endpoint_Per_Priority/server.cpp:
-        * tests/FL_Cube/server.cpp:
-        * tests/Faults/client.cpp:
-        * tests/Faults/middle.cpp:
-        * tests/Faults/server.cpp:
-        * tests/LongUpcalls/ami_client.cpp:
-        * tests/LongUpcalls/ami_server.cpp:
-        * tests/LongUpcalls/blocking_client.cpp:
-        * tests/LongUpcalls/blocking_server.cpp:
+        * tests/LongWrites/Coordinator.h:
+        * tests/LongWrites/Coordinator.cpp:
+        * tests/LongWrites/Receiver.h:
+        * tests/LongWrites/Receiver.cpp:
+        * tests/LongWrites/Sender.h:
+        * tests/LongWrites/Sender.cpp:
         * tests/LongWrites/client.cpp:
+        * tests/LongWrites/client.dsp:
+        * tests/LongWrites/run_test.pl:
         * tests/LongWrites/server.cpp:
-        * tests/MT_Client/server.cpp:
-        * tests/MT_Server/server.cpp:
-          More calls to resolve_initial_references() with a missing
-          ACE_TRY_ENV
-
-Sun Mar 04 13:14:39 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tao/PP_Memory_Management.txt:
-          The memory management rules for TAO's pluggable protocol
-          framework were poorly documented.  This file should capture
-          that, currently it describes a proposal more than the current
-          behavior.
-
-Sun Mar  4 13:29:09 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * tao/RTCORBA.pidl:
-        * tao/IOP.pidl:
-        * tao/RTPOA.pidl:
-          Updated to CORBA v2.4.2 (February 2001) versions.  Only comments
-          were changed in IOP.pidl and RTPOA.pidl.  In RTCORBA.pidl, all
-          of the PolicyTypes were changed from TAO specific numbers to OMG
-          assigned numbers.  Also, the create_tcp_protocol_properties
-          factor method was added to RTORB, so that users can now
-          instantiate instances of TCPProtocolProperties.
-
-        * tao/RT_ORB.{h,cpp} (create_tcp_protocol_properties):
-          Added implementation to return a new TCPProtocolProperties
-          instance.
-
-        * tao/RTCORBAC.{cpp,h,i}:
-        * tao/RTCORBAS.{cpp,h,i}:
-        * tao/RTCORBAS_T.{cpp,h,i}:
-        * tao/diffs/RTCORBAC.cpp.diff:
-        * tao/diffs/RTCORBAC.h.diff:
-        * tao/diffs/RTCORBAS.cpp.diff:
-        * tao/diffs/RTCORBAS.h.diff:
-          Updated all the files generated from RTCORBA.pidl.
-
-Sun Mar 04 08:10:04 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * Changed the following files to correctly use the
-          CORBA::Environment parameter when calling
-          <ORB::resolve_initial_references>.  Thanks to Ossama for
-          pointing this out.
-
-          Under examples/POA:
-
-          - Adapter_Activator/server.cpp
-          - DSI/Database_i.cpp
-          - DSI/server.cpp
-          - Default_Servant/File_i.cpp
-          - Default_Servant/server.cpp
-          - Explicit_Activation/server.cpp
-          - FindPOA/FindPOA.cpp
-          - Forwarding/server.cpp
-          - Loader/Server_Manager.cpp
-          - NewPOA/NewPOA.cpp
-          - On_Demand_Activation/server.cpp
-          - On_Demand_Loading/Server_Manager.cpp
-          - Reference_Counted_Servant/server.cpp
-          - RootPOA/RootPOA.cpp
-          - TIE/server.cpp
-
-          Under tests/POA:
-
-          - Deactivation/Deactivation.cpp
-          - Destruction/Destruction.cpp
-          - Identity/Identity.cpp
-          - Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
-          - wait_for_completion/wait_for_completion.cpp
-
-Sun Mar 04 10:11:07 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Smart_Proxies/Policy/server.cpp (shutdown):
-
-          Added missing ACE_TRY_ENV parameter to the ORB::shutdown() call.
-
-          (main):
-
-          Fixed ORB::run() call so that it uses the standard calling
-          convention (void return).
-
-Sun Mar 04 10:02:18 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Smart_Proxies/Benchmark/server.cpp (box_prices, tickets):
-
-          Fixed "unused argument" warnings.
-
-          (shutdown):
-
-          Added missing ACE_TRY_ENV parameter to the ORB::shutdown() call.
-
-          (main):
-
-          Fixed ORB::run() call so that it uses the standard calling
-          convention (void return).
-
-Sun Mar 04 09:44:18 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/BiDirectional/client.cpp (main):
-        * tests/BiDirectional/server.cpp (main):
-        * tests/BiDirectional_NestedUpcall/client.cpp (main):
-        * tests/BiDirectional_NestedUpcall/server.cpp (main):
-        * tests/MProfile/server.cpp (main):
-        * tests/MProfile_Forwarding/Manager.cpp (init):
-        * tests/MProfile_Forwarding/server.cpp (main):
-        * tests/QtTests/server.cpp (main):
-        * tests/Smart_Proxies/Collocation/Coll_Tester.cpp (init):
-        * tests/Xt_Stopwatch/server.cpp (main):
-
-          Added missing ACE_TRY_ENV parameter to
-          resolve_initial_references() call, and the corresponding
-          ACE_CHECK/ACE_CHECK_RETURN/ACE_TRY_CHECK macro.
-
-        * tests/Smart_Proxies/Benchmark/server.cpp (main):
-        * tests/Smart_Proxies/Policy/server.cpp (main):
-
-          Added missing ACE_TRY_CHECK after resolve_initial_references()
-          call.
-
-Sun Mar 04 09:12:40 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/IFR_Client/InterfaceC.cpp:
-
-          Moved inclusion of the `tao/PortableInterceptor.h' header
-          outside of the "TAO_HAS_INTERCEPTORS" protected block.  This
-          header must remain visible since it contains the
-          "TAO_INTERCEPTOR" macros.  Note that this won't cause problems
-          when portable interceptor support is disabled since those macros
-          are always visible, too.
-
-Sun Mar  4 11:06:25 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * examples/PluggableUDP/README:
-        * examples/PluggableUDP/DIOP/README:
-          Added infomation about DIOP and PluggableUDP directories.
-
-        * examples/PluggableUDP/tests/README:
-          Moved some information about the implementation of DIOP into the
-          ../DIOP/README file.
-
-Sun Mar  4 10:03:59 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * examples/PluggableUDP/tests/server.cpp:
-        * examples/PluggableUDP/tests/client.cpp:
-          Added missing ACE_TRY_ENV parameter to
-          resolve_initial_references() per Ossama's request.
-
-        * examples/PluggableUDP/tests/UDP_i.cpp:
-          Fixed some compiler warnings under Linux.
-
-Sat Mar 03 23:32:29 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/AMI_Timeouts/timeout_client.cpp (init):
-        * tests/AMI_Timeouts/timeout_client.cpp (init, svc):
-
-          Renamed "init()" method to "initialize()."  It conflicted with
-          its base class "ACE_Task_Base::init()" method.
-
-Sat Mar 03 22:56:20 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/AMI_Timeouts/client.cpp (main):
-        * tests/AMI_Timeouts/timeout_client.cpp (svc, init):
-        * tests/AMI_Timeouts/server.cpp (main):
-
-          Fixed compile-time problems related to emulated exceptions.
-          ACE_TRY_NEW_ENV declares a CORBA::Environment within a do-while
-          loop scope, so that Environment is not available outside of the
-          loop.  However, an ACE_CHECK_RETURN is done outside of the
-          ACE_TRY_NEW_ENV block.  Use ACE_DECLARE_NEW_CORBA_ENV instead.
-
-          Added missing ACE_TRY_ENV parameter to the
-          resolve_initial_references() and shutdown() calls.
-
-          Corrected spelling.  "Caught," not "Catched!"
-
-        * tests/AMI_Timeouts/Makefile:
-
-          Added missing dependencies.
-
-Sat Mar  3 16:31:31 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * docs/TAO-metrics.html:
-        * docs/TAO-tutorials.html:
-        * docs/components.html:
-        * docs/events_tutorial.html:
-        * docs/poa_migration.html:
-        * docs/reactivator.html:
-        * docs/releasenotes.html:
-        * docs/releasenotes/OBV.html:
-        * docs/tutorials/Quoter/index.html:
-        * docs/tutorials/Quoter/On_Demand_Activation/index.html:
-        * docs/tutorials/Quoter/Simple/Impl-Repo/index.html:
-        * docs/tutorials/Quoter/Simple/ImprovedServer/index.html:
-        * docs/tutorials/Quoter/Simple/Persistent/index.html:
-
-          Changed references to
-          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/* to
-          relative paths instead (Fixes fuzz errors).
-
-        * tao/ORB_Core.i:
-        * tao/Stub.i:
-        * tao/default_resource.cpp:
-        * tao/Strategies/advanced_resource.cpp:
-
-          Fixed bad ACE_TRACE's.  (Fixes more fuzz errors)
-
-Sat Mar  3 16:31:07 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * examples/PluggableUDP/DIOP/DIOP_Acceptor.{cpp,i,h}:
-        * examples/PluggableUDP/DIOP/DIOP_Connection_Handler.{cpp,i,h}:
-        * examples/PluggableUDP/DIOP/DIOP_Connector.{cpp,h}:
-        * examples/PluggableUDP/DIOP/DIOP_Endpoint.{cpp,i,h}:
-        * examples/PluggableUDP/DIOP/DIOP_Factory.{cpp,h}:
-        * examples/PluggableUDP/DIOP/DIOP_Profile.{cpp,i,h}:
-        * examples/PluggableUDP/DIOP/DIOP_Transport.{cpp,i,h}:
-        * examples/PluggableUDP/DIOP/diop_export.h:
-        * examples/PluggableUDP/DIOP/Makefile:
-        * examples/PluggableUDP/DIOP/Makefile.bor:
-        * examples/PluggableUDP/DIOP/TAO_DIOP.dsp:
-        * examples/PluggableUDP/DIOP/TAO_DIOP.dsw:
-        * examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp:
-        * examples/PluggableUDP/tests/Makefile:
-        * examples/PluggableUDP/tests/Makefile.bor:
-        * examples/PluggableUDP/tests/README:
-        * examples/PluggableUDP/tests/UDP.dsw:
-        * examples/PluggableUDP/tests/UDP.idl:
-        * examples/PluggableUDP/tests/UDP_Client_i.{cpp,h}:
-        * examples/PluggableUDP/tests/UDP_i.{cpp,h}:
-        * examples/PluggableUDP/tests/client.cpp:
-        * examples/PluggableUDP/tests/client.dsp:
-        * examples/PluggableUDP/tests/run_test.pl:
-        * examples/PluggableUDP/tests/server.cpp:
-        * examples/PluggableUDP/tests/server.dsp:
-        * examples/PluggableUDP/tests/svc.conf:
-          Added UDP pluggable protocol and unit tests as a TAO example.
-          This code was contributed by Michael Kircher
-          <Michael.Kircher@mchp.siemens.de> and John Mackenzie
-          <John.Mackenzie.extern@icn.siemens.de> as a TAO 1.1a
-          pluggable protocol.  The main changes from the original code
-          include upgrading the pluggable protocol interfaces with the latest
-          changes and  moving the code from TAO/tao to a separate library.
-
-Sat Mar 03 15:28:34 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/PortableServer/Object_Adapter.cpp (open):
-
-          Fixed broken memory management that I inadvertently introduced.
-          This brings the code back to what it used to do before my
-          change, but it uses a POA_Manager_var instead of an auto_ptr.
-          Using the _var allows us to remove the auto_ptr template
-          instantiation(s) for the POA_Manager.  We technically shouldn't
-          be using auto_ptrs on reference counted objects anyway, even
-          though in this case there was no harm in doing so.
-
-        * tao/PortableServer/POA.cpp:
-
-          Removed auto_ptr<TAO_POA> and auto_ptr<TAO_POA_Manager> template
-          instantiations.  They are no longer needed, thus reducing the
-          POA footprint slightly.
-
-          (create_POA_i):
-
-          Use a POA_var instead of an auto_ptr.  The same reasoning from
-          above applies here as well, i.e. auto_ptrs should not be used on
-          reference counted objects.
-
-Sat Mar  3 13:12:00 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tao/PortableServer/Object_Adapter.cpp:
-          Fixed minor typo in the creation of the RootPOA
-
-Sat Mar 03 12:18:12 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Codec/client.cpp (verify_data):
-
-          Cleaned up test output so that it is HTML friendly (i.e. no tab
-          characters).  The output in our HTML build logs was slightly
-          confusing.
-
-        * tests/Codec/README:
-
-          Updated expected test output.
-
-Sat Mar 03 11:46:36 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Portable_Interceptors/ForwardRequest/server.bor:
-
-          Fixed typo in the rule that builds the ServerRequestInterceptor
-          stub.  The test should once again build with Borland C++.
-
-Sat Mar 03 11:14:57 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/corbafwd.h:
-
-          Added the CORBA::_tc_{OctetSeq,StringSeq,WStringSeq} TypeCode
-          declarations.  They were previously renamed to get around
-          problems with compilers that lack support for namespaces.  The
-          proper workaround is to actually put them in the CORBA namespace
-          by using the forward declaration / typedef trick used in this
-          file.  This also fixes a problem with these TypeCodes not being
-          available due to the renaming.
-
-        * tao/OctetSeqC.h:
-        * tao/StringSeqC.h:
-
-          Removed the _tc_CORBA_{OctetSeq,StringSeq,WStringSeq}
-          declarations.  They were hacks to get around compilers that do
-          not support namespaces.  The proper TypeCodes are now declared
-          in the CORBA namespace in `corbafwd.h'.
-
-        * tao/OctetSeqC.cpp:
-        * tao/StringSeqC.cpp:
-
-          Use the proper CORBA::_tc_{OctetSeq,StringSeq,WStringSeq}
-          TypeCodes rather than broken renamed ones described above.  This
-          addresses CORBA compliance and interoperability problems.
-
-        * tao/diffs/OctetSeq.diff:
-        * tao/diffs/StringSeq.diff:
-
-          Regenerated these diffs to include the above changes.
-
-Sat Mar  3 10:42:01 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp (forward_references):
-
-          Fixed an exception specification.
-
-Sat Mar 03 02:10:00 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/PortableServer/ServerRequestInfo.cpp:
-
-          Include "tao/PolicyC.h" to pull in declaration of
-          CORBA::Policy::_nil().  This is particularly necessary for
-          builds that disable compile-time support for CORBA Messaging
-          since the Policy header doesn't get pulled in otherwise.
-
-Sat Mar  3 00:16:46 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Portable_Interceptors/ForwardRequest/Makefile:
-
-          Updated dependencies.  Fixed one part of the build problems.
-
-          (TAO_IDLFLAGS):
-
-          Added missing IDL include path.  `ServerRequestInterceptor.idl'
-          includes "tao/PortableInterceptor.pidl".  This is the other part
-          of the build fix.
-
-          (realclean):
-
-          Added missing clean rules for the `ServerRequestInterceptor*'
-          stubs and skeletons.
-
-Fri Mar 02 23:54:41 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/OctetSeqC.cpp:
-        * tao/StringSeqC.cpp:
-
-          Use the TAO_NAMESPACE_{TYPE,DEFINE} preprocessor to macros
-          correct compile-time errors on platforms that do not define the
-          ACE_HAS_USING_KEYWORD.  Fixes a "multiple definition"
-          compile-time error on those platforms.
-
-        * tao/diffs/OctetSeq.diff:
-        * tao/diffs/StringSeq.diff:
-
-          Regenerated these diffs so that they include the above changes.
-
-Fri Mar  2 20:28:27  Angelo Corsaro  <angelo@hermes.doc.wustl.edu>
-
-        * rules.tao.GNU:
-        * orbsvcs/CosEvent_Service/Makefile:
-        * orbsvcs/Dump_Schedule/Makefile:
-        * orbsvcs/Event_Service/Makefile:
-        * orbsvcs/LifeCycle_Service/Makefile:
-        * orbsvcs/Logging_Service/Makefile:
-        * orbsvcs/Notify_Service/Makefile:
-        * orbsvcs/Scheduling_Service/Makefile:
-        * orbsvcs/tests/AVStreams/benchmark/Makefile:
-        * orbsvcs/tests/CosEvent/Basic/Makefile:
-        * orbsvcs/tests/EC_Basic/Makefile:
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile:
-        * orbsvcs/tests/EC_Multiple/Makefile:
-        * orbsvcs/tests/EC_Throughput/Makefile:
-        * orbsvcs/tests/Event/Basic/Makefile:
-        * orbsvcs/tests/Event/Performance/Makefile:
-        * orbsvcs/tests/Event_Latency/Makefile:
-        * orbsvcs/tests/FaultTolerance/IOGR/Makefile:
-        * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile:
-        * orbsvcs/tests/Sched/Makefile:
-        * orbsvcs/tests/Trading/Makefile:
-        * orbsvcs/tests/ior_corbaname/Makefile:
-
-          Added the new macros:
-              - TAO_DYNAMIC_LIBS
-              - TAO_COS_NOTIFICATION_LIBS
-              - TAO_RT_SCHED_LIBS
-              - TAO_FAULT_TOLERANCE_LIBS
-              - TAO_COS_TRADING_LIBS
-
-          this macros expand to  multiple libraries on QNX RTP,
-          and this enable to work around a problem that is present
-          currently in the QNX linker. For all othe platform these
-          macro expand to the only library associated to the CORBA
-          service. With this work aroun all the orbsvcs  and almost
-          all the orbsvcs test build.
-
-Fri Mar  2 16:16:45 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/Object.cpp (operator>>):
-
-          Added "ERROR" to the error output so that our automated test
-          suite will pick up the error message.  Previously it was not
-          detected.  Clarified the error message a bit, as well.
-
-Fri Mar 02 15:39:28 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/orbconf.h: Since MEM_Stream is not supported if position
-          independent pointers are not, we need to disable SHMIOP in that
-          case.
-
-Fri Mar 02 15:20:32 2001  Michael Kircher <Michael.Kircher@mchp.siemens.de>
-
-        * tests/AMI_Timeouts/timout_client.cpp:
-          Fixed a missing ".in ()" on a var type.
-
-Fri Mar  2 11:46:40 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/CodecFactory.cpp (create_codec):
-
-          Fixed a "statement is unreachable" warning.
-
-        * tao/PortableInterceptorC.h (sync_scope):
-
-          Hide the ClientRequestInfo::sync_scope() method declaration if
-          CORBA Messaging support isn't enabled.
-
-Fri Mar  2 11:37:43 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/PortableInterceptor.cpp:
-
-          Moved code within the "TAO_HAS_INTERCEPTORS" block.  Fixes a
-          compile-time error on platforms with request interceptors
-          disabled.
-
-Fri Mar 02 11:57:03 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * tao/Connection_Handler.cpp (set_socket_option):
-
-           Fixed mispelling in ACE_UNUSED_ARG, that was breaking
-           QNX build.
-
-Fri Mar 02 09:32:33 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp (~Server_Request_Interceptor, destroy):
-
-          Moved release of the forward object references from the
-          destructor to the destroy() method.  There was a strange problem
-          with interdependent object life cycles.  The forward object
-          references wouldn't be released unless the server request
-          interceptor was destroyed (destructor called), and the
-          interceptor wouldn't be destroyed unless the object references
-          were released!  I'll need to examine this issue further.  In the
-          meantime, the ServerRequestInterceptor::destroy() change gets
-          around the problem nicely, and fixes the memory leaks.
-
-        * tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
-          (post_init):
-
-          Use ACE_TRY_ENV instead of TAO_ENV_ARG_PARAMETER.  There is no
-          reason to use the latter when calling ORB supplied methods.
-
-        * tests/Portable_Interceptors/ForwardRequest/test_i.cpp:
-
-          Removed debugging message from the destructor.
-
-Fri Mar 02 08:29:53 2001  Ossama Othman  <ossama@uci.edu>
-
-        * docs/index.html:
-        * docs/minimumTAO.html:
-        * docs/pluggable_protocols/index.html:
-        * docs/releasenotes/index.html:
-
-          Fixed references to Doug's web site.  Just link to the local
-          files.  There is no need to go remote.  Thanks to Darrell's
-          "Fuzz" script for picking these up.
-
-Fri Mar 02 08:13:34 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Portable_Interceptors/ForwardRequest/Makefile
-          (TAO_IDLFLAGS):
-
-          Define the "CORBA3" preprocessor macro to make sure that the
-          "local" keyword is enabled in the `tao/PortableInterceptor.pidl'
-          file included by `ServerRequestInterceptor.idl'.
-
-Fri Mar 02 07:40:28 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl:
-
-          Added this missing file.  I neglected to commit it with my
-          previous set of changes for this test.
-
-        * tests/Portable_Interceptors/ForwardRequest/Makefile:
-        * tests/Portable_Interceptors/ForwardRequest/server.bor:
-
-          Added missing `ServerRequestInterceptor.idl' related rules to
-          these Makefiles.
-
-        * tests/Portable_Interceptors/ForwardRequest/server.dsp:
-
-          Added missing header files to the header file list.
-
-Fri Mar 02 07:25:50 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/ORB_Core.cpp (destroy_interceptors):
-
-          Fixed a compile-time warning that occured on native exception
-          builds.
-
-Fri Mar  02 02:18:32 2001  Michael Kircher <Michael.Kircher@mchp.siemens.de>
-
-        * tests/AMI_Timeouts/timeout_i.cpp:
-        * tests/AMI_Timeouts/server.cpp:
-        * tests/AMI_Timeouts/client.cpp:
-          Fixed exception handling code.
-
-Fri Mar  2 02:15:32 2001  Michael Kircher <Michael.Kircher@mchp.siemens.de>
-
-        * tao/Connection_Handler.cpp:
-          Fixed a wrong "#elsif".
-
-Fri Mar  2 01:32:32 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * tao/Connection_Handler.cpp (set_socket_option):
-          Added ACE_UNUSED_ARG to avoid warning on those platform
-          that lack SOCK_BUF_SIZE.
-
-Fri Mar  2 07:51:04 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * tests/makefile.bor:
-        * tests/Forwarding/*.bor:
-
-          Added BCB specific makefiles for this TAO test
-
-Thu Mar  1 18:24:32 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * examples/POA/Adapter_Activator/server.dsp:
-        * examples/POA/DSI/client.dsp:
-        * examples/POA/DSI/server.dsp:
-        * examples/POA/Default_Servant/client.dsp:
-        * examples/POA/Default_Servant/server.dsp:
-        * examples/POA/FindPOA/FindPOA.dsp:
-        * examples/POA/Forwarding/client.dsp:
-        * examples/POA/Forwarding/server.dsp:
-        * examples/POA/Generic_Servant/client.dsp:
-        * examples/POA/NewPOA/NewPOA.dsp:
-        * examples/POA/On_Demand_Activation/server.dsp:
-        * examples/POA/Reference_Counted_Servant/server.dsp:
-        * examples/POA/RootPOA/RootPOA.dsp:
-        * examples/POA/TIE/client.dsp:
-        * examples/POA/TIE/server.dsp:
-
-          Release executables go into Release subdirectory.
-
-        * examples/POA/Adapter_Activator/run_test.pl:
-        * examples/POA/DSI/run_test.pl:
-        * examples/POA/Default_Servant/run_test.pl:
-        * examples/POA/Explicit_Activation/run_test.pl:
-        * examples/POA/FindPOA/run_test.pl:
-        * examples/POA/Forwarding/run_test.pl:
-        * examples/POA/Loader/run_test.pl:
-        * examples/POA/NewPOA/run_test.pl:
-        * examples/POA/On_Demand_Activation/run_test.pl:
-        * examples/POA/On_Demand_Loading/run_test.pl:
-        * examples/POA/Reference_Counted_Servant/run_test.pl:
-        * examples/POA/RootPOA/run_test.pl:
-        * examples/POA/TIE/run_test.pl:
-
-          More scripts using PerlACE::Run_Test.  Yay!
-
-Thu Mar  1 18:51:45 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_array/array_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp:
-
-          Disabled generation of _var and _out classes for
-          anonymous sequences and arrays (those not declared in an
-          IDL file via a typedef), as required by the spec.
-          This closes [BUGID:677].
-
-Thu Mar  1 15:54:54 2001  Ossama Othman  <ossama@uci.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
-          (destroy):
-
-          Added missing PortableInterceptor::Interceptor::destroy()
-          implementation.
-
-Thu Mar  1 17:49:51 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/Protocol_Factory.cpp:
-        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
-        * orbsvcs/orbsvcs/AV/AV_Core.cpp:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-
-          Removed unncessary ACE_DEBUGS and ensconced the others with
-          TAO_debug_level checks. This should fix the tests from failing.
-
-Thu Mar  1 14:14:38 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        And today's quote is.....
-
-        "What we call progress is the exchange of one Nuisance for another
-         Nuisance."
-                     - Havelock Ellis
-
-        This is the first in a set of updates to the run_test.pl scripts.
-        The goal is to start running the tests for the Release configuration
-        and for Borland.  These setups output the executables into sub-
-        directories, which wasn't handled too well by the old ACEutils.pm
-        perl module.  PerlACE::Run_Test contains an updated Process class
-        which does a much better job of handling this (among other things).
-
-        * performance-tests/Latency/deferred_synch_client.dsp:
-
-          Changed the output executable name to match the other platforms.
-
-        * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp:
-        * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp:
-
-          Output directory of Win32 Release executables should be "Release".
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-
-          Made sure to clean up shmiop files when finished.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/run_test.pl:
-
-          Made some minor updates to make it more consistent with the rest of
-          the run_test.pl scripts.
-
-        * performance-tests/Callback/run_test.pl:
-        * performance-tests/Cubit/TAO/DII_Cubit/run_test.pl:
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-        * performance-tests/Latency/multi_threaded.pl:
-        * performance-tests/Latency/run_test.pl:
-        * performance-tests/Latency/scalability.pl:
-        * performance-tests/Latency/single_threaded.pl:
-        * performance-tests/POA/Object_Creation_And_Registration/run_test.pl:
-        * performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl:
-        * performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl:
-        * performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl:
-        * performance-tests/RTCorba/Oneways/Reliable/client_test.pl:
-        * performance-tests/RTCorba/Oneways/Reliable/run_test.pl:
-
-          Updated to use PerlACE::Run_Test.
-
-Thu Mar  1 15:21:53 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/TypeCode.cpp:
-
-          Modified private_member_label() to insert octet 0 into
-          the Any label for the default index, as the spec requires.
-          This closes out [BUGID:123].
-
-Thu Mar  1 14:09:21 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-
-          Removed some extra generated carriage returns in
-          interceptor skeleton code.
-
-Thu Mar  1 12:07:57 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/ClientRequestInfo.cpp (get_request_policy):
-
-          Fixed "unused argument" warning in the case where compile-time
-          support for CORBA Messaging is disabled.
-
-        * tests/Makefile.bor (DIRS):
-
-          Added the `Codec' test directory to list of directories to
-          recurse into.
-
-Thu Mar  1 11:10:58 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Makefile (DIRS):
-
-          Added the `Codec' test directory to list of directories to
-          recurse into.
-
-Thu Mar  1 10:51:14 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tests/Codec/client.cpp:
-
-          Fixed compiler warnings.
-
-        * tests/Codec/Makefile:
-
-          Fixed typo, and updated dependencies.
-
-Thu Mar  1 10:39:49 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/ClientRequestInfo.inl (forward_reference):
-
-          Fixed "unused argument" warning.
-
-        * tao/ClientRequestInfo.cpp (get_request_policy):
-
-          Only call CORBA::Object::_get_policy() if CORBA Messaging is
-          enabled at compile-time.  Fixes a compile-time error reported by
-          Erik Johannes <ejohannes@oresis.com>.
-
-        * tao/PortableServer/Object_Adapter.cpp (dispatch):
-
-          Cleaned up the interceptor related code slightly.
-
-Thu Mar 01 12:18:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * tests/AMI_Timeouts/client.cpp:
-
-          Added a ".in ()" when passing a _var as _ptr.
-
-        * tests/AMI_Timeouts/Makefile:
-
-          Added a missing space.
-
-        * tests/AMI_Timeouts/timeout_i.cpp:
-
-          Removed the name of some parameters which were not used.
-
-          This should fix several compile warnings and errors. Thanks to
-          Bala for hooking up the AMI_Timeouts test and reporting this.
-
-Thu Mar 01 09:38:28 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/CodecFactory.h:
-        * tao/CodecFactory.cpp:
-
-          New files containing the implementation of the IOP::CodecFactory
-          interface as defined by the adopted Portable Interceptor
-          specification (ptc/00-08-05).
-
-        * tao/Codec_ORBInitializer.h:
-        * tao/Codec_ORBInitializer.cpp:
-
-          ORBInitializer that registers the CodecFactory reference with
-          the ORB.
-
-        * tao/CDR_Encaps_Codec.h:
-        * tao/CDR_Encaps_Codec.cpp:
-
-          New files containing the implementation of the IOP::Codec
-          interface specifically for CDR encapsulations.
+        * tests/LongWrites/svc.conf:
+        * tests/LongWrites/Sender_Task.h:
+        * tests/LongWrites/Sender_Task.cpp:
+          Add support for multi-threaded clients.
+          Try to count the number of incoming messages and only exit when
+          all have been received.
 
-        * tao/ORB.cpp (init_orb_globals):
-
-          Register the CodecFactory ORBInitializer with the ORB.
-
-        * tao/ORBInitInfo.h:
-        * tao/ORBInitInfo.cpp (codec_factory):
-
-          Implemented this method, as required by the Portable Interceptor
-          specification.  Each ORBInitInfo method now retains its own
-          copy of a CodecFactory.  This was to done for ease of
-          implementation.
-
-        * tao/OctetSeq.pidl:
-        * tao/StringSeq.pidl:
-
-          Place the typedef in each of these PIDL files in the CORBA
-          module.  Previously they were incorrectly placed in the global
-          namespace.  [Bug 793]
-
-        * tao/OctetSeqC.h:
-        * tao/OctetSeqC.i:
-        * tao/OctetSeqC.cpp:
-        * tao/diffs/OctetSeq.diff
-        * tao/StringSeqC.h:
-        * tao/StringSeqC.i:
-        * tao/StringSeqC.cpp:
-        * tao/diffs/StringSeq.diff:
-
-          Regenerated these files against the updated PIDL files.
-          [Bug 793]
-
-        * tao/PortableInterceptor.pidl:
-        * tao/IOP.pidl:
-
-          Updated with changes made in ptc/00-08-05.  These changes
-          include (1) moving Codec related interfaces to the IOP module,
-          (2) addition of the Interceptor::destroy() method, and (3)
-          addition of the IOP::TaggedComponentSeq type to the IOP module.
-
-        * tao/PortableInterceptorC.h:
-        * tao/PortableInterceptorC.i:
-        * tao/PortableInterceptorC.cpp:
-        * tao/diffs/PortableInterceptor.diff:
-        * tao/IOPC.h:
-        * tao/IOPC.i:
-        * tao/IOPC.cpp:
-        * tao/diffs/IOP.diff:
-
-          Regenerated these files against the updated PIDL files.
-
-        * tao/ClientRequestInfo.inl:
-        * tao/ClientRequestInfo.cpp:
-        * tao/PortableServer/ServerRequestInfo.inl:
-        * tao/PortableServer/ServerRequestInfo.cpp:
+        * tests/Queued_Message_Test/Queued_Message_Test.dsp:
+          Removed a number of unused files from this unit test.
 
-          Removed all reference to LOCATION_FORWARD_PERMANENT.  It is
-          currently not supported by the CORBA and Portable Interceptor
-          specifications.  This may change in the future as FT CORBA
-          issues are resolved.
+Sun Feb 25 10:22:59 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-          Added all missing exception minor codes.  The final adopted
-          Portable Interceptor specification specifies what they are (the
-          joint submission did not).
-
-        * tao/ClientRequestInfo.h:
-
-          Made target_ member a "_ptr."  The TAO_ClientRequestInfo no
-          longer needs to release the reference.
-
-        * tao/ClientRequestInfo.cpp (TAO_ClientRequestInfo):
-
-          Do not duplicate the target object reference.  There is no need
-          to do so since it is guaranteed to be valid for the lifetime of
-          the request.  This removes a pair of locks from the critical
-          path, thus improving performance.  [Bug 795]
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.cpp (destroy_interceptors):
-
-          New helper method that invokes Interceptor::destroy() on all
-          registered interceptors when ORB::destroy() is called.
-
-          (destroy):
-
-          Invoke the TAO_ORB_Core::destroy_interceptors() help method when
-          ORB::destroy() is called.
-
-        * tao/PortableInterceptor.i:
-        * tao/PortableInterceptor.cpp:
-
-          Un-inlined the destructors.  They're already no-ops, and
-          inlining them only serves to increase the footprint since
-          inlined destructor code is placed at all exit points.
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp:
-        * tao/Makefile:
-        * tao/Makefile.bor:
-
-          Added Codec related filenames to these files.
-
-        * tests/Codec/Codec.dsw:
-        * tests/Codec/Makefile:
-        * tests/Codec/Makefile.bor:
-        * tests/Codec/README:
-        * tests/Codec/client.bor:
-        * tests/Codec/client.cpp:
-        * tests/Codec/client.dsp:
-        * tests/Codec/run_test.pl:
-        * tests/Codec/test.idl:
-
-          New test that verifies the CodecFactory and CDR encapsulation
-          Codec objects are functioning properly.
-
-        * tests/README:
-
-          Added a description of the Codec test.
-
-        * tests/Portable_Interceptors/Benchmark/interceptors.cpp:
-        * tests/Portable_Interceptors/Benchmark/interceptors.h:
-        * tests/Portable_Interceptors/Dynamic/interceptors.cpp:
-        * tests/Portable_Interceptors/Dynamic/interceptors.h:
-        * tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp:
-        * tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h:
-        * tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp:
-        * tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h:
-        * tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp:
-        * tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h:
-        * tests/Portable_Interceptors/ForwardRequest/server.cpp:
-        * tests/Portable_Interceptors/ForwardRequest/server.dsp:
-        * tests/Portable_Interceptors/ForwardRequest/test_i.cpp:
-        * tests/Portable_Interceptors/ForwardRequest/test_i.h:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp:
-        * tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp:
-        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h:
-
-          Updated to conform to the Portable Interceptor support updates.
-
-        * docs/interceptors.html:
-
-          Updated current status of TAO's interceptor support
-          (e.g. addition of the CodecFactory and CDR encapsulation Codec),
-          and the reference list (URL for the adopted Portable Interceptor
-          specification).
-
-Thu Mar  1 09:30:14 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/IFR_Client/InterfaceC.i:
-        * tao/IFR_Client/InterfaceC.h:
-        * tao/IFR_Client/InterfaceC.cpp:
-        * orbsvcs/IFR_Service/InterfaceS.h:
-        * orbsvcs/IFR_Service/InterfaceS.cpp:
-
-          Replaced the interceptor code I ill-advisedly removed
-          some time ago. More changes are soon to come for these
-          files, so the .diff files have not yet been regenerated.
-
-Wed Feb 28 20:44:37 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Latency/pong.h:
-        * orbsvcs/tests/AVStreams/Latency/ping.h:
-        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
-
-          Fixed compile errors and warnings.
-
-Wed Feb 28 15:43:54 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/orbconf.h: Fixed a small mistake for the default case.
-
-Wed Feb 28 15:23:46 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * docs/Options.html: Added documentation for the option
-          "-ORBConnectionCacheLock".
-
-Wed Feb 28 15:20:07 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/orbconf.h: Added a check to notify the users that compiling
-          RT CORBA without CORBA Messaging support is an error.
-
-Wed Feb 28 14:23:41 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Tagged_Profile.h:
-        * tao/Tagged_Profile.i:
-        * tao/TAgged_Profile.cpp: This class held an instance of
-          GIOP::IORAddressingInfo which in turn held an instance of
-          TAO_String_Manager. This was a source of allocation and
-          deallocation for every call along the critical path. We now rip
-          open the GIOP::IORAddressingInfo structure and store the
-          information that is just required like the <type_id> and the
-          <IOP::TaggedProfile>.
-
-        * tao/GIOP_Message_Generator_Parser.cpp: Added code to do a lazy
-          evaluation of GIOP::IORAddressingInfo structure that we may
-          receive. These changes should fix the bugzilla bug #798.
-
-Wed Feb 28 14:17:46 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Makefile: Added AMI_Timeouts to the list of directories.
-
-Wed Feb 28 14:16:00 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Stub.h:
-        * tao/Stub.cpp (TAO_Stub): Changed the signature of the method
-          create_ior_info ().
-
-Wed Feb 28 13:55:25 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-
-          Fixed indentation for generation of
-          '_tao_server_request.argument_flag (0);'
-
-Wed Feb 28 09:43:35 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/Any:
-
-          Change the value() method to return the void* value_
-          member if the any owns its data. In this case, it
-          must return something meaningful because we call it
-          in the >>= operator for all but the simple types.
-
-Web Feb 28 09:36:03 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Makefile.bor
-        * orbsvcs/tests/FaultTolerance/Makefile.bor
-
-        The FaultTolerance test is now build with BCB
-
-Web Feb 28 09:02:51 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * Makefile.bor
-        * orbsvcs/tests/Makefile.bor
-        * orbsvcs/tests/Simple_Naming/Makefile.bor
-
-          The orbsvcs tests for which there is a correct BCB makefile
-          are now build in the all build
-
-Tue Feb 27 17:45:55 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/Latency/control.cpp:
-        * orbsvcs/tests/AVStreams/Latency/pong.cpp:
-        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
-        * orbsvcs/tests/AVStreams/Latency/run_test.pl:
-
-          Added script to run test.
-
-Tue Feb 27 16:36:06 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * orbsvcs/IFR_Service/tao_ifr.bor:
-          Added library required for debug build.
-
-        * tests/AMI_Timeouts/client.bor:
-        * tests/AMI_Timeouts/server.bor:
-          Added missing source file timeout_client.cpp.
-
-Tue Feb 27 15:23:37 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/Pluggable/server.cpp:
-
-          Fixed unused args compile warnings.
-
-Tue Feb 27 12:21:03 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/IIOP_Connector.cpp: Moved the template instantiations to the
-          top of the file as this was creating problem with SunCC
-          5.0. Thanks to Christian Mueffling <cvm@aiss.de> for reporting
-          this.
-
-        * tao/UIOP_Connector.cpp:
-        * tao/SHMIOP_Connector.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp: Added the same
-          fix for these protocols too.
-
-Tue Feb 27 12:17:18 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/Any.cpp:
-
-          Modified value() method to return 'this' if the Any
-          contains some value, 0 otherwise. It is possible that
-          the Any's void* value_ member could be 0 but the Any
-          contains some value in its message block member. The
-          'this' pointer is returned to enforce the OMG warnings
-          that the method will soon disappear from the spec and
-          that its return value cannot be guaranteed to yield
-          any useful value by casting.
-
-        * tao/Sequence_T.cpp:
-        * tao/Sequence.cpp:
-
-          In the operator= methods in each sequence class, modified
-          the case where the release_ member is 0 to set the
-          buffer to 0 if rhs.maximum_ is 0. Otherwise allocbuf (0)
-          is called, which may lead to problems. Thanks to Virgilijus Globis
-          <virgis@megagis.lt> for reporting this bug.
-
-        * tao/MessagingC.h:
-
-          Removed two instances of a typedef of _tao_seq_Octet to
-          _marshaled_exception_seq, in Messaging::ExceptionHolder and
-          in OBV_Messaging::ExceptionHolder. These typedefs are no
-          longer used or needed anywhere.
-
-        * tao/Stub.cpp:
-
-          Removed some extra parentheses in parse_policies.
-
-Tue Feb 27 11:34:00 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Invocation.cpp:
-        * tao/Invocation.h: Removed the instance of IOP::IOR that was
-          created on the stack in every call. This structure had a
-          TAO_String_Manager which allocates memory in the constructor and
-          destroys memory in the destructor. This allocation and
-          deallocation comes into play for every call even when it is not
-          used.
-
-        * tao/Stub.cpp:
-        * tao/Stub.h:
-        * tao/Stub.i: Added a pointer to the IOP::IOR in this class. When
-          the client receives an exception LOC_NEEDS_ADDRESSING_MODE, the
-          actual information is prepared only once and passed on to the
-          invocation classes for every subsequent call.
-
-Tue Feb 27 06:35:36 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h (operands.): Fixed a
-          typo that was generating quite a bit of errors.
-
-Tue Feb 27 04:32:00 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl:
-        * orbsvcs/tests/AVStreams/Multicast/run_test.pl:
-        * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-
-          Added scripts to run the AVStreams tests.
-
-Mon Feb 26 20:01:06 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp:
-        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast/server.cpp:
-        * orbsvcs/tests/AVStreams/Latency/control.cpp:
-        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Full_Profile/server.cpp:
-        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Pluggable/server.cpp:
-
-          Ensured clean termination of the processes.
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
-
-          Corrected multicasting address formating to fix the Multicast
-          and Multicast_Full_Profile tests.
-
-          Also fixed the iteration through the reverse flow spec set in
-          TAO_StreamEndPoint::start.
-
-          Thanks to Craig Rodrigues <crodrigu@bbn.com> for reporting these
-          bugs.
-
-
-
-Mon Feb 26 19:05:57 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
-        * orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h:
-          Added some TAO_Trading_Export macros to export some classes from
-          the Trading Service library.  Thanks to Lothar Werzinger
-          <werzinger.lothar@krones.de> for reporting this and submitting
-          the patches.
-
-Mon Feb 26 16:34:55 2001  Christopher Kohlhoff  <chris@kohlhoff.com>
-
-        * orbsvcs/IFR_Service/IFR_Service.bor:
-        * orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor:
-        * orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor:
-
-          Fixed build of IFR_Service with Borland.
-
-        * orbsvcs/TAO_Service/Makefile.bor:
-
-          Added Borland makefile for the TAO_Service.
-
-        * orbsvcs/Makefile.bor:
-
-          Include IFR_Service and TAO_Service in default build.
-
-Mon Feb 26 15:35:10 2001  Phil Mesnier  <mesnier_p@ociweb.com>
-
-        Port to Unixware 7 (7.1.1) Using UDK CC (7.1.1.b)
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * orbsvcs/orbsvcs/Log/LogMgr_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp:
-        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp:
-        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
-        * orbsvcs/tests/AVStreams/Latency/pong.cpp:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp:
-        * tao/CORBALOC_Parser.cpp:
-        * tao/RT_ORB.cpp:
-        * tao/default_resource.cpp:
-        * tao/Strategies/SHMIOP_Acceptor.cpp:
-        * tao/Strategies/SHMIOP_Connector.cpp:
-        * tao/Strategies/UIOP_Acceptor.cpp:
-
-        Fixed errors in #pragma instiate lines including removal of ';', mispellings
-
-Mon Feb 26 14:09:29 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Collocation/Diamond_i.cpp (color): Fixed a warning in
-          Tru64_CXX builds.
-
-Mon Feb 26 12:52:48 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/Asynch_Invocation.h:
-        * tao/Asynch_Invocation.i:
-        * tao/Invocation.cpp:
-        * tao/Invocation.h:
-        * tao/Invocation.i:
-        * tao/DynamicInterface/DII_Invocation.h:
-        * tao/DynamicInterface/DII_Invocation.inl:
-
-          Added default argument to constructors that will
-          determine the byte order of the contained CDR
-          stream. The default is native byte order, but can
-          be modified by a gateway if it is handling a request
-          in non-native byte order.
-
-        * tao/GIOP_Message_Base.cpp:
-
-          In write_protocol_header(), added code to toggle the byte
-          order field based on the byte order of the CDR stream that
-          is passed in.
-
-        * tao/DynamicInterface/Request.cpp:
-        * tao/DynamicInterface/Request.h:
-        * tao/DynamicInterface/Request.inl:
-        * tao/DynamicInterface/Server_Request.h:
-        * tao/DynamicInterface/Server_Request.inl:
-
-          Added accessors to the byte order of the underlying
-          invocation. These will be used by a gateway to
-          preserve the byte order of a request it is handling,
-          even if it is a byte order different than that of the
-          gateway's platform. CORBA::Request also stores the
-          byte order as state, so the reply can be checked for a
-          change in byte order.
-
-        * tests/DSI_Gateway/test_dsi.cpp:
-
-          Added lines to the gateway's invoke() method to use the
-          above accessors, to get and set the appropriate byte orders
-          immediately before and after the call to
-          CORBA::Request::invoke().
-
-Mon Feb 26 10:28:45 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/Param_Test/anyop.dsp:
-
-          Fixed CR->CR/LF problem.
-
-Mon Feb 26 11:40:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * tests/AMI_Timeouts/timeout_i.cpp:
-          Added some missing throw specs on method implementations.
-          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for pointing
-          this out.
-
-Mon Feb 26 09:32:24 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * performance-tests/RTCorba/Oneways/Reliable/client.cpp:
-        * tests/Single_Read/client.cpp:
-        * tests/Timed_Buffered_Oneways/client.cpp:
-          Fixed gcc-272 compilation problems, all related to constructs
-          like Foo::data data (...); I used Foo::data the_data (...); and
-          things are happy now.
-
-        * examples/OBV/Typed_Events/Client_i.cpp:
-        * examples/OBV/Typed_Events/Event_Types_impl.cpp:
-        * examples/OBV/Typed_Events/Server_i.cpp:
-          Fixed more gcc-272 compilation problems about ambiguous
-          initialization of T_var, changed from T_var x(new T_impl);
-          to T_var x(ACE_static_cast(T*,new T_impl));
-
-        * tests/Smart_Proxies/Makefile:
-        * tests/Smart_Proxies/On_Demand/Makefile:
-        * tests/Smart_Proxies/Policy/Makefile:
-          Removed -I options from LDFLAGS.
-
-Mon Feb 26 09:30:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * tests/Makefile.bor:
-          Added the AMI_Timouts directory to that makefile.
-          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for pointing
-          this out.
-
-        * tests/AMI_Timeouts/timeout_i.cpp:
-          Added some missing throw specs on method implementations.
-          Thanks to Johnny Willemsen <jwillemsen@remedy.nl> for pointing
-          this out.
-
-Mon Feb 26 06:45:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * tao/Asynch_Reply_Dispatcher.cpp:
-          Compilers were complaining about a unused argument. I fixed it
-          by removing the name of the argument; this should take care of it.
-          Thanks to Bala for pointing that out.
-
-Mon Feb 26 03:45:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * tao/Asynch_Timeout_Handler.cpp:
-        * tao/Asynch_Timeout_Handler.h:
-          Added these two files.
-          This class implements an event handler for timeouts on AMI
-          invocations. The timeout handler is registered for timeouts
-          with the ORB by the asynch invocation object.
-
-          When the reply does not arrive right in time, the timer
-          expires and the timeout handler is invoked. The timeout handler
-          knows the correct transport mux strategy and the asynch reply
-          dispatcher for the reply, which timed out.
-
-          On timeout the timeout handler unbinds the reply dispatcher from
-          the transport mux strategy and informs the reply dispatcher that
-          the reply timed out. The asynch reply dispatcher informs the
-          associated reply handler in the application about this by raising
-          the timeout exception. The reply dispatcher will commit suicide after
-          that. The timeout handler itself unregisters itself from the reactor
-          and commits suicide in handle_close.
-
-          Note: The timeout handler should be allocated statically in the
-                reply dispatcher, instead - as it is now - of being allocated
-                dynamically in the asynch invocation object. Thanks Carlos.
-                But how can we know in the constructor of the reply dispatcher
-                (which is the right place to allocate it statically) whether
-                timeouts are actually enabled. If they are not enabled, we
-                might waste memory for something not needed?
-
-        * tao/Asynch_Reply_Dispatcher.cpp:
-        * tao/Asynch_Reply_Dispatcher.h:
-          Added a new method <reply_timed_out> which is invoked by the timeout
-          handler on timeout. This method informs the application reply handler
-          about the timeout by raising the timeout exception.
-          At the end of that method the reply dispatcher commits suicide as it
-          is no longer needed - it was dynamically allocated, as the original
-          asynch invocation object has gone away before (asynchrony!).
-
-          If the reply arrives right in time the reply dispatcher unregisters
-          the timeout handler from the reactor and deletes it.
-
-        * tao/Asynch_Invocation.cpp:
-          Added code to the actual invocation path. The timeout handler is
-          dynamically allocated and registered with the reactor for timeouts.
-          It is then handed over to the asynch reply dispatcher for later usage.
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp:
-        * tao/Makefile:
-        * tao/Makefile.am:
-        * tao/Makefile.bor:
-          Added the Asynch_Timeout_Handler.{h,cpp} files to these files.
-          Dependencies in <Makefile> need to be updated.
-
-        * tests/AMI_Timeouts/client.bor:
-          Added this file as Borland specific Makefile for the client.
-
-        * tests/AMI_Timeouts/Makefile
-        * tests/AMI_Timeouts/Makefile.bor
-        * tests/AMI_Timeouts/README
-        * tests/AMI_Timeouts/client.cpp
-        * tests/AMI_Timeouts/client.dsp
-        * tests/AMI_Timeouts/run_test.pl
-        * tests/AMI_Timeouts/server.bor
-        * tests/AMI_Timeouts/server.cpp
-        * tests/AMI_Timeouts/server.dsp
-        * tests/AMI_Timeouts/svc.conf
-        * tests/AMI_Timeouts/timeout_client.cpp
-        * tests/AMI_Timeouts/timeout_client.h
-        * tests/AMI_Timeouts/timeout_i.cpp
-        * tests/AMI_Timeouts/timeout_i.h:
-          Updated these files to reflect latest modifications on the
-          AMI Timeout test.
-
-Mon Feb 26 09:46:04 2001  Johnny Willemsen <jwillemsen@remedy.nl>
-
-        * tests/makefile.bor:
-        * tests/Bidirectional_NestedUpcall/*.bor
-          Added Borland C++ Builder specific makefiles for this test
-
-Mon Feb 26 00:19:28 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        Time to do some spring cleaning...
-
-        * TAO/examples/Simple/time/client.dsp:
-        * TAO/examples/Simple/time/server.dsp:
-        * TAO/orbsvcs/Naming_Service/NT_Naming_Service.dsp:
-        * TAO/orbsvcs/Naming_Service/Naming_Service.dsp:
-        * TAO/tao/TAO.dsp:
-
-          Removed Win32 Alpha configurations.  See ACE changelog
-          for more info.
-
-Mon Feb 26 01:47:04 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * orbsvcs/Notify_Service/Notify_Service.cpp:
-        * orbsvcs/Notify_Service/svc.conf:
-          Corrected the "-Notify_TPReactor" option.
-
-        * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h:
-        * orbsvcs/Notify_Service/README:
-          - Added the "-AllocateTaskperProxy" option to pre-allocate the
-            worker task(s) used in event processing.
-          - Added "-AsynchUpdates" option to send subscription/publication
-            updates asynchromously.
-          - Event Manager Object Factory is allocated per channel now.
-
-        * orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Map.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Factory.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Factory.h:
-        * orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp:
-        * orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp:
-          Trivial debug messages will print conditionally. use ORBDebugLevel
-          option to see debug messages.
-
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/README:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf:
-          Updates files to correct configurations.
-
-Mon Feb 26 01:24:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * TAO/ValueBase.cpp:
-          The code of value types needs a urgent repair in many places.
-          With this change I fixed how the ORB was obtained - from
-          fetching it via TAO_ORB_Core_instance to fetching
-          it via the CDR stream, which owns a correct reference to it.
-          With TAO_ORB_Core_instance we could have actually fetched
-          the wrong ORB.
-
-Sun Feb 25 19:37:24 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * examples/POA/Adapter_Activator/run_test.pl:
-        * examples/POA/DSI/run_test.pl:
-        * examples/POA/Explicit_Activation/run_test.pl:
-        * examples/POA/FindPOA/run_test.pl:
-        * examples/POA/Forwarding/run_test.pl:
-        * examples/POA/Loader/run_test.pl:
-        * examples/POA/NewPOA/run_test.pl:
-        * examples/POA/On_Demand_Activation/run_test.pl:
-        * examples/POA/On_Demand_Loading/run_test.pl:
-        * examples/POA/Reference_Counted_Servant/run_test.pl:
-        * examples/POA/RootPOA/run_test.pl:
-        * examples/POA/TIE/run_test.pl:
-          Instead of pushing a new directory to @INC we use 'use lib
-          <path>;' much cleaner and it works with 'use Foo;'.
-
-Sun Feb 25 11:31:47 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * examples/POA/Adapter_Activator/run_test.pl:
-        * examples/POA/Explicit_Activation/run_test.pl:
-        * examples/POA/Loader/run_test.pl:
-        * examples/POA/On_Demand_Activation/run_test.pl:
-        * examples/POA/Reference_Counted_Servant/run_test.pl:
-        * examples/POA/RootPOA/run_test.pl:
-          Replace 'require ACEutil' with 'use ACEutil', the latter should
-          eat the -Config options passed by the auto_compile script.
-
-Sun Feb 25 10:38:57 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tao/default_resource.h:
-          Remove unused enum
-
-Sun Feb 25 12:19:59 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * tao/RT_ORB.cpp:
-        * tao/RT_ORB.h:
-        * tao/RT_Mutex.cpp:
-        * tao/RT_Mutex.h:
-        * tao/orbconf.h:
-        * tests/RTCORBA/RTMutex/server.cpp: Added TAO_HAS_NAMED_RT_MUTEXES
-          option to enable support for named RT Mutexes.  They are now
-          disabled by default to help reduce TAO's memory footprint.
-
-
-Sun Feb 25 10:13:58 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/default_resource.cpp: Changed the option
-          "-ORBConnectionLock" to "-ORBConnectionCacheLock". This change
-          should fix bug #799 in bugzilla which talks about two locks on
-          the connection cache for every call.
-
-        * orbsvcs/tests/AVStreams/Latency/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf:
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
-        * performance-tests/Latency/st_client.conf:
-        * tests/Collocation/svc.conf:
-        * tests/Smart_Proxies/Collocation/svc.conf: Changed the option
-          -ORBConnectorLock to the new option
-          -ORBConnectionCacheLock.
+        * tao/Queued_Message.h:
+        * tao/Queued_Message.cpp:
+        * tao/Transport.cpp:
+          Instead of releasing the message blocks as soon as possible we
+          delay until the queued message is deallocated.  This will make
+          it possible to release all the data in the same thread that
+          allocated it, preserving the support for TSS allocators.
 
+        * tests/LongWrites/Test.idl:
+        * tests/LongWrites/Receiver.h:
+        * tests/LongWrites/Receiver.cpp:
+        * tests/LongWrites/Sender.h:
+        * tests/LongWrites/Sender.cpp:
+        * tests/LongWrites/client.cpp:
+        * tests/LongWrites/run_test.pl:
+          The test can now send big oneways, big twoways and big twoways
+          with big responses.
 
-Sun Feb 25 10:01:06 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+Wed Feb 14 18:38:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-        * tests/Collocation/Coll_Tester.cpp (parse_args):
-        * tests/Collocation/Coll_Tester.h:
-        * tests/Collocation/Diamond_i.h: Fixed warnings with g++ on
-          Linux.
+        * tao/Queued_Message.cpp:
+          Fixed queue manipulation logic
 
-Sat Feb 24 11:01:21 2001  Carlos O'Ryan  <coryan@uci.edu>
+        * tests/Queued_Message_Test/Queued_Message_Test.cpp:
+          The test was miscounting remove operations from the queue.
 
-        * performance-tests/Latency/st_client.conf:
-          The option to disable locks in the connection cache was changed,
-          but this configuration file was still using the old one.
+        * tests/Queued_Message_Test/Queued_Message_Test.dsw:
+        * tests/Queued_Message_Test/Queued_Message_Test.dsp:
+          Add MSVC project files.
 
-Sat Feb 24 10:16:42 2001  Carlos O'Ryan  <coryan@uci.edu>
+Wed Feb 14 10:02:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-        * tests/RTCORBA/Client_Protocol/svc.conf:
-        * tests/RTCORBA/Explicit_Binding/svc.conf:
-        * tests/RTCORBA/Server_Protocol/server_reverse.conf:
-        * tests/RTCORBA/Server_Protocol/server_reverse_nt.conf:
-        * tests/RTCORBA/Server_Protocol/server_shmiop.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf:
-          The SHMIOP protocol was configured using dynamic loading,
-          but that does not work on static builds.  Furthermore, there is
-          no need to dynamically load the protocol because it is
-          statically linked into the application.
+        * tao/Queued_Message.h:
+        * tao/Queued_Message.cpp:
+          Add flag to control message block ownership, used to minimize
+          memory allocations.
 
-Sat Feb 24 11:13:02 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
+        * tao/Transport.cpp:
+          Use the ownership flags for the Queued_Message.
 
         * tests/Makefile:
-        * tests/Collocation/README:
-        * tests/Collocation/Makefile:
-        * tests/Collocation/Makefile.impl:
-        * tests/Collocation/Makefile.test:
-        * tests/Collocation/Makefile.stub: Added the missing UNIX
-          Makefiles for collocation test.  Thanks to Steve Hespelt
-          <shespelt@bear.com> for reporting this.
-
-Fri Feb 23 19:48:08 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * TAO version 1.1.13 released.
-
-Thu Feb 22 03:07:46 2001  Krishnakumar B  <kitty@ace.cs.wustl.edu>
-
-        * VERSION:
-        * PROBLEM-REPORT-FORM:
-        * tao/Version.h:
-
-        Revert of the changes done by the release script.
-
-Wed Feb 21 20:32:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/run_test.pl:
-
-          Updated to use PerlACE::Run_Test.  Also fixed the timeout
-          problem we've been seeing on Win2000_DLL_Debug nightly build.
-
-Wed Feb 21 20:17:22 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tests/Multiple/Multiple_Impl.cpp:
-          Don't return a string when an exception is raised.  This is not
-          only non-compliant, it is a bad idea: the receiver is supposed
-          to ignore all return values, because they are invalid.
-
-Wed Feb 21 21:04:03 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: Fixed
-          incorrect usage of SHMIOP endpoint specifier.
-
-Wed Feb 21 08:38:05 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tao/RT_ORBInitializer.cpp:
-          Add RT_ORB_Loader to the service repository, otherwise
-          resolve_initial_references("RT_ORB") fails for static builds.
-          Don't add a static service twice, otherwise the old copy is
-          destroyed and sometimes the ORB caches it.
-
-Wed Feb 21 10:50:46 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * docs/Options.html: Changed the documentation for
-          -ORBConnectionCachingStrategy and -ORBPurgePercentage
-          options.
-
-Wed Feb 21 07:27:58 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp:
-          The binary name was broken in this fails, this should fix the
-          problems in the Win32 builds.
-
-Tue Feb 20 21:01:53 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Connection_Handler.h:
-        * tao/Connection_Handler.cpp: Added a new method mark_invalid ().
-
-        * tao/IIOP_Connection_Handler.cpp: Checked for any buffered
-          messages in the socket before closing the socket during
-          handle_close (). This fix should fix the errors in
-          Timed_Buffered_Oneways test.
-
-        * tao/IIOP_Transport.cpp: Purged the handle during
-          close_connection ().
-
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Transport.cpp:
-        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-        * tao/Strategies/SHMIOP_Transport.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: Replicated the
-          changes done for IIOP.
-
-Tue Feb 20 20:34:06 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/Sequence_T.i:
-        * tao/Sequence_T.cpp:
-
-          Reverted the change in
-
-          Mon Feb 19 11:26:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/Makefile:
-
-          Added ACE_HAS_GNUG_PRE_2_8 guard for the compilation of the
-          directories IFR_Client and Domain, so these directories will
-          be skipped by any build using old g++.
-
-Tue Feb 20 15:02:01 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * docs/Options.html:
-          Add documentation about the secret -ORBIORParser option in the
-          resource factory.
-
-        * docs/ior_parsing.html:
-          Document the pluggable IOR parser feature in TAO, and how you
-          can go about adding a new version.
-
-Tue Feb 20 16:35:27 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/RT_ORBInitializer.cpp:
-          We must add the RT_Protocols_Hooks service, after the
-          Service_Configurator is opened.  This is a bit more complicated
-          than the usual ACE_Service_Config::static_svcs()->insert().
-          After the beta we need to revisit this code and factor out some
-          commonalities with ACE_Service_Config::load_static_svcs(), and
-          probably rethink this portion of the RT-CORBA initialization.
-
-          This fix should solve the crashes under Sun/CC 4.2 that have
-          plagued TAO-1.1.12 and our nightly builds too.
-
-          This problem was identified by many members of the community,
-          including Scott Gunn <gunns@tvratings.com>, J. Russell
-          Noseworthy <rnosewor@objectsciences.com> and Keith Nicewarner
-          <knicewar@erg.sri.com>.
-
-Tue Feb 20 16:13:22 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/IIOP_Connection_Handler.cpp (handle_close):  Fixed a problem
-          with lingering handles in the cache when the server is
-          shutdown. We need to pro-actively purge the handles from
-          cache. Thanks to Christian von Mueffling <cvm@aiss.de> for
-          reporting this problem.
-
-        * tao/IIOP_Transport.cpp: We were explicitly purging connections
-          after a handle_close () in close_connection (). That is not
-          required as we purge the connections from cache during
-          handle_close () itself.
-
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * tao/Strategies/UIOP_Transport.cpp:
-        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
-        * tao/Strategies/SHMIOP_Transport.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp: Replicated the
-          changes done for IIOP.
-
-Tue Feb 20 12:02:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/IIOP_Connection_Handler.cpp (handle_close):
-        * tao/Strategies/UIOP_Connection_Handler.cpp:
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: Fixed a
-          leak from open handles on the server side when the clients
-          exit.  Thanks to Andy Olson <andrew.olson@lmco.com>
-          and Ossama for helping with this.
-
-Tue Feb 20 10:25:37 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation.operation_ss.cpp:
-
-          Added missing carriage return in skeleton code generation.
-          Thanks to Alexandr Gavrilov <gavr@trustworks.com> for
-          reporting this bug.
-
-Tue Feb 20 06:27:17 2001  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/Makefile.bor (OBJFILES): Remove
-
-          $(OBJDIR)\GIOP_Message_Headers.obj
-
-          since this file no longer exists.  Thanks to Johnny Willemsen
-          for reporting this.
-
-Mon Feb 19 20:19:07 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/GIOP_Message_Locate_Header.cpp:
-        * tao/GIOP_Message_Generator_Parser_10.cpp: Corrected the wrong
-          inclusions.
+        * tests/Queued_Message_Test/Makefile:
+        * tests/Queued_Message_Test/Queued_Message_Test.cpp:
+          Add new unit test for the TAO_Queued_Message class.
 
         * tao/Makefile:
         * tao/Domain/Makefile:
         * tao/DynamicAny/Makefile:
         * tao/DynamicInterface/Makefile:
         * tao/IFR_Client/Makefile:
-        * tao/IORManipulation/Makefile:
-        * tao/IORTable/Makefile:
-        * tao/PortableServer/Makefile:
-        * tao/SmartProxies/Makefile:
-        * tao/Strategies/Makefile: Updated dependencies.
-
-Mon Feb 19 19:59:44 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/GIOP_Message_Locate_Header.h: Changed the wrong inclusion of
-          .i file.
-
-Mon Feb 19 19:15:11 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * orbsvcs/Makefile:
-        * orbsvcs/tests/Makefile:
-
-          Skipped the IFR_Service and tests/InterfaceRepo
-          directories for Lynx OS builds.
-
-Mon Feb 19 14:27:18 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * examples/Simple/time-date/client.conf:
-        * examples/Simple/time-date/run_test.pl:
-          Use an empty configuration file for the client, this should
-          resolve the problems with the automatic builds.
-
-Mon Feb 19 16:04:21 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-
-          Added ACE_UNUSED_ARG (ACE_TRY_ENV) at the end of the
-          generated *_skel functions. There is a combination
-          of circumstances - TAO_HAS_INTERCEPTORS not defined,
-          IDL operation has no in, inout, out or return args
-          (as in a oneway shutdown operation) and native
-          exception use is enforced by passing -Ge 0 to the
-          IDL compiler - where this argument is not used. If
-          it is used, adding the final line above does no
-          harm. The situation described was arising in the
-          Native_Exception test in the Debian Linux builds.
-
-Mon Feb 19 15:58:03 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * orbsvcs/examples/RtEC/Schedule/Service.cpp:
-          Added a #ifdef to make sure that we are enabling the
-        typedef TAO_Reconfig_Scheduler only if we are compiling with
-        g++-2.8 or above.
-
-Mon Feb 19 12:18:06 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/IFR_Service/Makefile.BE:
-        * orbsvcs/IFR_Service/Makefile.TypeCodeFactory:
-          Fixed the warnings under True64/CXX, they were actually
-          important and could have manifested themselves as errors in
-          other platforms.
-
-Mon Feb 19 12:11:23 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/GIOP_Message_Handler.cpp (is_message_ready):
-        * tao/GIOP_Message_Handler.h : A hack to get SHMIOP working. In
-          the method is_message_ready (), before the control is returned
-          to the reactor, a check is made to see whether the protocol in
-          use, uses the reactor for signalling. If that is the case, we
-          read the rest of the data immediately. This is based on an
-          assumption that SHMIOP (for which this hack is implemented),
-          ensures that data gets sent in one big chunk unlike TCP.
-
-        * tao/GIOP_Message_Base.cpp: Made a change to confirm to the
-          signature of the is_message_ready () method in
-          GIOP_Message_Handler.
-
-        * tao/Transport.h:
-        * tao/Transport.cpp: Added a virtual method reactor_signalling
-          (). This method returns a value of 1 if the protocol happens to
-          use the reactor for signalling and 0 otherwise. The default
-          implementation returns a value of 0.
-
-        * tao/Strategies/SHMIOP_Transport.h:
-        * tao/Strategies/SHMIOP_Transport.cpp: Implemenetd reactor_signalling
-          () to return 1.
-
-        * tao/orbconf.h: Enabled SHMIOP.
-
-Mon Feb 19 11:26:05 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tao/Sequence_T.i:
-        * tao/Seuqence_T.cpp:
-
-          Uninlined the operator const T_var () const for TAO_Object_Manager.
-          The T::_duplicate method call is not yet defined if the inline
-          operator is used on an interface from IFR_Client. This was
-          causing a problem on the VxWorks and old g++ builds. Thanks
-          to Carlos for the suggestion.
-
-Mon Feb 19 09:59:01 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * examples/Quoter/Makefile:
-          TAO_IDLFLAGS was redefined, losing all the global settings.
-
-        * tao/Object_Loader.h:
-          Must include "tao/Exception.h" to satisfy more strict ANSI-C++
-          compilers: the new throw spec uses CORBA::SystemException, so a
-          forward declaration is not enough.
-
-Sun Feb 18 15:01:09 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tao/Object_Loader.h:
-          Add CORBA::SystemException to create_object()'s throw spec.
-
-        * tao/RT_ORB_Loader.h:
-        * tao/RT_ORB_Loader.cpp:
-          Use the more lenient throw spec in the RT_ORB_Loader class.
-          Only the Borland C++ compiler caught this problem. I believe the
-          current solution is the "Right Thing"[tm], it is always possible
-          for a load operation to fail.
-
-Sun Feb 18 16:56:33 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * orbsvcs/IFR_Service/Makefile.BE:
-        * orbsvcs/IFR_Service/Makefile.TypeCodeFactory:
-          Added -I(TAO_ROOT)/tao to LDFLAGS to remove warnings under cxx
-          on Tru64.
-
-Sun Feb 18 16:28:45 2001  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/DOVEBrowser/NS_Resolve.java: removed
-          dependency on com.infoglide package.
-
-Sun Feb 18 14:28:44 2001  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h:
-        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
-          Workaround problems in the RedHat-7.0 version of the g++
-          compiler.  I refactored code to make it simpler, it helps humans
-          and it seems to help this compiler too.
-
-Sun Feb 18 10:33:47 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-          Fixed memory leaks in the test.
-
-Sun Feb 18 03:37:33 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * orbsvcs/IFR_Service/Makefile.IFR_Service (IFR_SVR_OBJS):
-        Added -I(TAO_ROOT)/tao to LDFLAGS to appease cxx on Tru64.
-
-Sun Feb 18 03:33:52 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * tests/Smart_Proxies/On_Demand/Makefile:
-        Added -I$(TAO_ROOT)/tao to LDFLAGS to appease cxx on Tru64.
-
-Sun Feb 18 03:22:01 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * tests/Smart_Proxies/Makefile (LDFLAGS):
-        Added -I$(TAO_ROOT)/tao to LDFLAGS to appease cxx on Tru64.
-
-Sat Feb 17 23:08:44 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/GIOP_Message_Handler.cpp: Fixed a problem that showed up
-          only in EC_throughput. When multiple messages were read out of
-          the socket and processed, sometime we could be left with
-          messages that are not even the size of GIOP header length. Added
-          a conditional check for this case. This fixes the problem in
-          EC_Throughput.
-
-Sat Feb 17 20:38:10 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * TAO_INSTALL.html: Added GPERF building to unix instructions.
-
-Sat Feb 17 19:21:54 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * orbsvcs/tests/Notify/Basic/Basic.dsw:
-        * orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsw:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsw:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsw:
-
-          Added workspaces for these directories to make it easier to
-          compile each of these directories separately.
-
-        * orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp:
-        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp:
-        * orbsvcs/tests/Notify/Basic/Events_Test.dsp:
-        * orbsvcs/tests/Notify/Basic/IdAssignment.dsp:
-        * orbsvcs/tests/Notify/Basic/LifeCycleTest.dsp:
-        * orbsvcs/tests/Notify/Basic/Simple.dsp:
-        * orbsvcs/tests/Notify/Basic/Updates.dsp:
-        * orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp:
-
-          Fixed the multiple problems in these project files.
-
-Sat Feb 17 13:39:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Single_Read/test_i.cpp: Added a sleep between incoming
-          requests.
-
-Sat Feb 17 12:44:30 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/orbconf.h: Disabled SHMIOP for the upcoming beta. SHMIOP
-          does not work with the single read optimizations that have been
-          integrated in to TAO. This will be enabled after the beta when
-          we have a fix.
-
-Fri Sat 17 11:49:29 2001  Pradeep Gore <pradeep@cs.wustl.edu>
-
-        * orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp:
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp:
-        * orbsvcs/examples/Notify/Filter/Filter.dsp:
-        * orbsvcs/examples/Notify/Subscribe/Subscribe.dsp:
-          Modified include settings in these projects.
-
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h:
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp:
-          Modified event loop to use work-pending/perform-work.
-
-Fri Feb 16 20:12:52 2001  Krishnakumar B  <kitty@cs.wustl.edu>
-
-        * tests/Smart_Proxies/Makefile:
-          Added -I$(TAO_ROOT)/tao to CPPFLAGS to comfort cxx on Tru64 so
-          that it could get the template instantiations.
-
-Fri Feb 16 18:42:29 2001  Pradeep Gore <pradeep@cs.wustl.edu>
-
-        * orbsvcs/examples/Notify/Filter/Filter.dsp
-        * orbsvcs/examples/Notify/Subscribe/Subscribe.dsp
-        * orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp
-        * orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp
-        * orbsvcs/tests/Notify/Basic/Events_Test.dsp
-        * orbsvcs/tests/Notify/Basic/IdAssignment.dsp
-        * orbsvcs/tests/Notify/Basic/LifeCycleTest.dsp
-        * orbsvcs/tests/Notify/Basic/Simple.dsp
-        * orbsvcs/tests/Notify/Basic/Updates.dsp
-        * orbsvcs/tests/Notify/lib/Notify_Test_Client.h
-        * orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp
-        * orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp
-          Updated include paths, exported class Notify_Test_Client
-
-Fri Feb 16 15:26:29 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * examples/Simulator/DOVEBrowser/NS_Resolve.java:
-          Cleaned up the code a bit.  Thanks to Kevin Regan
-          <kregan@infoglide.com> for contributing this.
-
-Fri Feb 16 15:06:17 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+          Update dependencies
 
-        * tao/GIOP_Message_Handler.cpp: Fixed a problem in the case when
-          multiple one way messages were read from the socket. All the
-          complete calls got processed correctly. One of the incomplete
-          calls at the boundary was not processed properly. This should
-          fix the reliable one way test failures.
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+          The ACE_SSL_SOCK_Stream does not support sendv()
 
-Fri Feb 16 11:09:41 2001  Jeff Parsons <parsons@cs.wustl.edu>
+Mon Feb 12 15:44:54 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * tao/Makefile:
+          Update makefile to include new files
 
-          Moved IFR_Client_Adapter from INTERFACE_REPO_FILES
-          to ORB_CORE_FILES, since Object and LocalObject use
-          the adapter, and the IFR is forcefully disabled on
-          some platforms. Thanks to Carlos for the suggestion.
-
-Fri Feb 16 10:53:45 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tests/IDL_Test/nested_scope.idl:
-
-          Renamed an interface definition in this file to avoid a
-          name clash with a module in another IFL file in this
-          test.
-
-Fri Feb 16 09:41:54 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tests/IDL_Test: Added a new Makefile.bor.  Thanks to
-          Johnny Willemsen for this.
-
-Fri Feb 16 02:28:19 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * tests/Exposed_Policies/Policy_Verifier.h:
-        * tests/Exposed_Policies/Policy_Verifier.cpp:
-
-          Fixed false warning message that used to detect that
-          the number of bands was not correct.
-
-Thu Feb 15 19:23:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * examples/POA/Default_Servant/File_i.cpp:
-
-          Changed the use of 0644 for open permissions to
-          ACE_DEFAULT_FILE_PERMS.  On Win32, 0644 causes ACE_OS::open
-          to fail.
-
-        * examples/Load_Balancing/service.dsp:
-
-          Changed the output file from service.exe to load_balancer.exe
-          to match what the Makefile does.
-
-        * tests/Exposed_Policies/run_test.pl:
-
-          Test wasn't waiting between starting server and client, thus it
-          usually would fail.
-
-        * examples/POA/Default_Servant/run_test.pl:
-        * examples/Load_Balancing/run_test.pl:
-        * tests/Exposed_Policies/run_test.pl:
-
-          Updated to use PerlACE::Run_Test.
-
-Thu Feb 15 13:19:47 2001  Ossama Othman  <ossama@uci.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
-          (cube_any, cube_any_struct):
-
-          Fixed a problem where the result check would always fail since
-          the Any that owned the result was delete()d too early.  delete()
-          the Any after the result check.
-
-        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
-          (send_request, receive_request_service_contexts):
-
-          Sequence buffers to be released by the sequence should be
-          allocated with the allocbuf() member, not the new() operator.
-          Corrected the buffer allocations in these methods accordingly.
-
-Thu Feb 15 14:20:07 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * tests/IDL_Test/Makefile:
-        * tests/IDL_Test/namespace_check.cpp:
-
-          Added code generated from two additional IDL files
-          (params.idl and nested_scope.idl) to the list of
-          file skipped by compilers that either don't support
-          namespaces (SunCC4.2 and old g++) or have broken
-          typedefs (old g++). The two IDL files added to the
-          conditional list have nested modules, and old g++'s
-          broken typedef cannot compile the generated code.
-
-Thu Feb 15 13:43:50 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Fixed lookup function to handle the case where the scoped
-          name we are looking up begins with an interface, and the
-          actual item is in a base class of that interface. Previously,
-          only base classes of the scope where the lookup was initiated
-          (if it is an interface) were checked. Thanks to
-          Doug Warner <dougwarner@micron.com> for sending in the
-          example IDL file that pointed this out.
-
-        * tests/IDL_Test/interface.idl:
-
-          Added a modified version of the example IDL file to the
-          test suite.
-
-Thu Feb 15 11:47:53 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * tao/Stub.cpp (parse_policies):
-          Removed extra parenthesis and changed index type to CORBA::ULong
-          in the policy list. This should definitively fix the
-          error/warning on any platform. Thanks to Jeff for the hint.
-
-Thu Feb 15 11:09:50 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
-
-        * tao/PortableServer/POA.cpp (key_to_stub_i):
-          Added missing clause for handling the case when the priority
-          of the object being created differ from the priority of the POA
-          in the SERVER_DECLARED priority model, and there are priority
-          bands.
-
-        * tao/Stub.cpp:
-          Fixed compilation error on some platform caused by a wrong
-          de-referencing of a var type.
-
-Thu Feb 15 10:47:18 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
-
-          Minor change to code that creates an octet sequence _var to avoid
-          warnings in the Debian builds when compiling generated code for
-          the AMI test.
-
-Thu Feb 15 06:02:55 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp (next_one):
-          Initialize the hash_entry pointer to 0 to avoid a warning from
-          Compaq C++.
-
-Thu Feb 15 00:22:42 2001  Ossama Othman  <ossama@uci.edu>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp (process_message):
-
-          Merged Michael's reply dispatcher related changes from:
-          "Wed Feb 14 16:30:23 2001  Michael Kircher  <...>" below into
-          the SSLIOP pluggable protocol.
-
-Wed Feb 14 20:59:00 2001  Pradeep Gore <pradeep@cs.wustl.edu>
-
-        * orbsvcs/examples/notify/Notify_Examples.dsw:
-        * orbsvcs/examples/notify/Filter/Filter.dsp:
-        * orbsvcs/examples/notify/Subscribe/Subscribe.dsp:
-        * orbsvcs/tests/notify/Notify_Tests.dsw:
-        * orbsvcs/tests/notify/basic/AdminProperties_Test.dsp:
-        * orbsvcs/tests/notify/basic/ConnectDisconnect.dsp:
-        * orbsvcs/tests/notify/basic/Events_Test.dsp:
-        * orbsvcs/tests/notify/basic/IdAssignment.dsp:
-        * orbsvcs/tests/notify/basic/LifeCycleTest.dsp:
-        * orbsvcs/tests/notify/basic/Simple.dsp:
-        * orbsvcs/tests/notify/basic/Updates.dsp:
-        * orbsvcs/tests/notify/lib/TAO_NotifyTests.dsp:
-        * orbsvcs/tests/notify/performance-tests/Throughput/Throughput.dsp:
-        * orbsvcs/tests/notify/performance-tests/RedGreen/RedGreen.dsp:
-          Added Notification tests and example project files for Windows.
-
-Wed Feb 14 16:30:23 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-
-        * tao/Muxed_TMS.cpp: Changed the return value in the case of a
-          not found reply dispatcher from -1 to 0. The semantics of the
-          return values is 1, for success, 0, for a not found reply dispatcher
-          (which is not critical, as this can easily happen with timeouts), and
-          -1 on a critical error.
-          Added in-source documentation for this.
-
-        * tao/Exclusive_TMS.cpp: Documented the return value, see description
-          for Muxed_TMS.cpp.
-
-        * tao/IIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+        * tao/Strategies/SHMIOP_Transport.h:
         * tao/Strategies/SHMIOP_Transport.cpp:
+        * tao/Strategies/UIOP_Transport.h:
         * tao/Strategies/UIOP_Transport.cpp:
-          Changed return path of the method <process_message>.
-          In the case that we could not find the right reply dispatcher because
-          of a (meanwhile) invalid reply ID, we continue processing messages
-          instead of giving up processing.
-          This should fix the problem with the tao/tests/Timeout test.
-
-        * tao/Wait_On_Leader_Follower.cpp:
-          Added code to remove the leader follower condition variable in the
-          case of a timeout. This should fix a bug, where the condition
-          variable of the follower thread kept being registered
-          with the leader follower model while it went already away.
-
-Wed Feb 14 15:36:23 2001  Pradeep Gore  <pradeep@cs.wustl.edu>
-
-        * docs/orbsvcs.html: Added the Notification Service and it's tests
-          into this page.Thanks to Samuel Qi Luo
-          <Samuel.QiLuo@ericsson.com.au> for pointing out the missing
-          documentation.
-
-        * docs/releasenotes/index.html: Updated Notify Status.
-
-Wed Feb 14 14:58:28 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
-
-          Removed use of a typedef for _tao_seq_Octet that is guarded
-          from g++ versions earlier than 2.8. Also replace use of 'new'
-          with 'ACE_NEW'.
-
-Wed Feb 14 11:49:17 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/CORBALOC_Parser.cpp (make_stub_from_mprofile):
-
-          Fixed "better conversion sequence" warning issued by g++ by
-          using the ".in()" accessor method.
-
-Wed Feb 14 11:34:55 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/Pluggable.cpp (make_mprofile):
-
-          Decrease the reference count on the profile before returning
-          with an exception on error.  Fixes a memory leak.
-
-        * tao/CORBALOC_Parser.h (parse_string_mprofile_helper):
-        * tao/CORBALOC_Parser.cpp (parse_string_mprofile_helper):
-
-          Changed CORBA::String_var parameter that was passed in by copy
-          to a const char *.  There was no point in passing in a
-          CORBA::String_var.
-
-          Added missing ACE_CHECK macro.
-
-          (make_stub_from_mprofile, parse_string_rir_helper ):
-
-          Fixed potential memory leak and improved exception safety.
-
-          (parse_string):
-
-          Removed unnecessary use of a CORBA::ORB_var, in addition to the
-          useless duplication of the ORB reference.
-
-        * tao/orbconf.h:
-
-          Removed "PriorityMappingManager" from the list of initial
-          services.  There is no need to list it in the static initial
-          services since it is registered when the RTCORBA support is
-          loaded into the ORB.
-
-        * tests/InterOp-Naming/run_test.pl:
-
-          Updated test script to excercise additional INS features to make
-          it possible to catch more problems in TAO's INS support, should
-          they exist.
+          Fixed all protocols to use the new send() method with iovec
+          parameters.
 
-Wed Feb 14 13:00:28 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Endpoint.h:
-        * tao/IIOP_Endpoint.i:
-        * tao/Strategies/UIOP_Profile.h:
-        * tao/Strategies/UIOP_Endpoint.h:
-        * tao/Strategies/UIOP_Endpoint.i:
-        * tao/Strategies/SHMIOP_Profile.h:
-        * tao/Strategies/SHMIOP_Endpoint.h:
-        * tao/Strategies/SHMIOP_Endpoint.i: Removed the references to the
-          obsolete Client_Connection_Handlers.
-
-Wed Feb 14 09:50:18 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Acceptor.h:
-          Updated TAO_IIOP_Acceptor::open and TAO_IIOP_Acceptor::hostname
-          to use the specified endpoint hostname instead of always
-          resolving the hostname and then looking it back up for what to
-          put in the IOR.  This fixed a problem on Windows 2000 when the
-          user specified an endpoint having the hostname "localhost".
-          This would end up causing the actual hostname of the computer
-          to be put into the IOR, but the server would bind to 127.0.0.1.
-          As a result, clients wouldn't be able to connect to the server.
-          This fix partially addresses bugzilla bug 506.
-
-Wed Feb 14 07:13:12 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * examples/Quoter/Quoter_i.cpp:
-          Fixed use of ACE_THROW.
-
-Tue Feb 13 18:44:19 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp:
-          Reset the reactor after deactivating the timeout adapter,
-          otherwise it tries to use it during shutdown, but at that point
-          the reactor is already destroyed.
-
-Tue Feb 13 17:42:16 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/tests/Event/Performance/Latency.dsp:
-        * orbsvcs/tests/Event/Performance/Latency_Server.dsp:
-          Add missing library
-
-Tue Feb 13 17:37:54 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * examples/Quoter/Makefile:
-          Nothing was building under Unix.
-
-        * examples/Quoter/Factory_Finder.cpp:
-        * examples/Quoter/Generic_Factory.cpp:
-        * examples/Quoter/server.cpp:
-          More fixes for ORB::run()
-
-Tue Feb 13 17:24:43 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
-          Fixed problems with the ORB::run() method
-
-        * orbsvcs/tests/EC_Custom_Marshal/Makefile:
-          Fixed dependencies, my builds failed to recompile some files in
-          this directory even after the ORB::run() changes, thus the
-          previous problem went undetected.
-
-Tue Feb 13 12:54:33 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * tao/RT_ORB.h:
-          Changed TAO_RT_ORB to inherit from TAO_Local_RefCounted_Object
-          to fix memory leak found with Purify.
-
-Tue Feb 13 09:48:53 2001  Ossama Othman  <ossama@uci.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
-          (cube_any, cube_any_struct):
-
-          Call delete() on the returned Any once it is no longer needed.
-          This fixes a memory leak.  The caller is responsible for
-          storage.
-
-Tue Feb 13 11:25:19 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * orbsvcs/tests/Makefile:
-
-          Added guard to prevent the Interface Repository tests
-          from being compiled under SunCC4.2, which does not
-          support namespaces.
-
-Tue Feb 13 11:37:03 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * tao/ORB.cpp:
-          Changed ACE_CHECK_RETURN macros to be ACE_CHECK in
-          ORB::run() and ORB::perform_work().
-
-Tue Feb 13 09:17:30 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-          The spec says that ORB::run() and ORB::perform_work() return
-          void.  If there are errors an exception is raised.  Having both
-          exceptions and error codes only results in confusing and broken
-          code.
-          This fixes bug #785
-
-        * tao/PortableServer/ORB_Manager.cpp:
-        * examples/Borland/ORBThread.cpp:
-        * examples/Buffered_AMI/client.cpp:
-        * examples/Buffered_AMI/server.cpp:
-        * examples/Buffered_Oneways/client.cpp:
-        * examples/Buffered_Oneways/server.cpp:
-        * examples/Callback_Quoter/Consumer_Handler.cpp:
-        * examples/Callback_Quoter/Notifier_Input_Handler.cpp:
-        * examples/Callback_Quoter/Supplier_i.cpp:
-        * examples/Event_Comm/Consumer_Handler.cpp:
-        * examples/POA/Adapter_Activator/server.cpp:
-        * examples/POA/DSI/server.cpp:
-        * examples/POA/Default_Servant/server.cpp:
-        * examples/POA/Explicit_Activation/server.cpp:
-        * examples/POA/Forwarding/server.cpp:
-        * examples/POA/Loader/Server_Manager.cpp:
-        * examples/POA/On_Demand_Activation/server.cpp:
-        * examples/POA/On_Demand_Loading/Server_Manager.cpp:
-        * examples/POA/Reference_Counted_Servant/server.cpp:
-        * examples/POA/TIE/server.cpp:
-        * examples/Simulator/Event_Supplier/Event_Con.cpp:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/IFR_Service/IFR_Service.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/ImplRepo_Service/NT_Service.cpp:
-        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp:
-        * orbsvcs/Logging_Service/Logging_Service.cpp:
-        * orbsvcs/Naming_Service/NT_Naming_Server.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-        * orbsvcs/Notify_Service/Notify_Service.cpp:
-        * orbsvcs/Time_Service/Server_i.cpp:
-        * orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp:
-        * orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp:
-        * orbsvcs/examples/Security/Send_File/server.cpp:
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
-        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Latency/control.cpp:
-        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
-        * orbsvcs/tests/AVStreams/Latency/pong.cpp:
-        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
-        * orbsvcs/tests/AVStreams/benchmark/server.cpp:
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp:
-        * orbsvcs/tests/Event/Performance/Latency.cpp:
-        * orbsvcs/tests/Event/Performance/Latency_Server.cpp:
-        * orbsvcs/tests/Event/Performance/Makefile:
-        * orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_client.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_server.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
-        * orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp:
-        * orbsvcs/tests/ior_corbaname/server.cpp:
-        * performance-tests/Callback/Callback_i.cpp:
-        * performance-tests/Callback/Callback_i.h:
-        * performance-tests/Callback/Server_i.cpp:
-        * performance-tests/Callback/Server_i.h:
-        * performance-tests/Callback/callback.idl:
-        * performance-tests/Callback/client.cpp:
-        * performance-tests/Latency/client.conf:
-        * performance-tests/Latency/st_client.conf:
-        * performance-tests/POA/Demux/demux_test_server.cpp:
-        * performance-tests/RTCorba/Oneways/Reliable/server.cpp:
-        * performance-tests/Thruput/TAO/server.cpp:
-        * tests/AMI/server.cpp:
-        * tests/AMI_Timeouts/client.cpp:
-        * tests/AMI_Timeouts/server.cpp:
-        * tests/AMI_Timeouts/timeout_client.cpp:
-        * tests/BiDirectional/client.cpp:
-        * tests/BiDirectional_NestedUpcall/server.cpp:
-        * tests/DSI_Gateway/gateway.cpp:
-        * tests/DSI_Gateway/server.cpp:
-        * tests/Faults/middle.cpp:
-        * tests/Faults/ping.cpp:
-        * tests/Faults/pong.cpp:
-        * tests/Faults/server.cpp:
-        * tests/Forwarding/server.cpp:
-        * tests/InterOp-Naming/Server_i.cpp:
-        * tests/Leader_Followers/client.cpp:
-        * tests/Leader_Followers/server.cpp:
-        * tests/LongUpcalls/AMI_Manager.cpp:
-        * tests/LongUpcalls/ami_client.cpp:
-        * tests/LongUpcalls/ami_server.cpp:
-        * tests/LongUpcalls/blocking_server.cpp:
-        * tests/MProfile/server.cpp:
-        * tests/MProfile_Forwarding/Manager.cpp:
-        * tests/MProfile_Forwarding/server.cpp:
-        * tests/MT_Client/server.cpp:
-        * tests/MT_Server/server.cpp:
-        * tests/Native_Exceptions/server.cpp:
-        * tests/NestedUpcall/Simple/server.cpp:
-        * tests/Nested_Event_Loop/server.cpp:
-        * tests/OctetSeq/server.cpp:
-        * tests/Param_Test/server.cpp:
-        * tests/Single_Read/server.cpp:
-        * tests/Smart_Proxies/server.cpp:
-        * tests/Smart_Proxies/On_Demand/server.cpp:
-        * tests/Strategies/server.cpp:
-        * tests/Timed_Buffered_Oneways/server.cpp:
-        * tests/Timeout/client.cpp:
-        * tests/Timeout/server.cpp:
-        * tests/ior_corbaloc/server.cpp:
-          Don't check for return code from ORB::run()
-
-        * tests/ior_corbaloc/Makefile:
-          Reorder libraries, -lTAO_CosNaming should appear *before*
-          -lTAO.
-
-Tue Feb 13 09:16:42 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * orbsvcs/ImplRepo_Service/Forwarder.cpp:
-
-          Initialized forward_obj to remove warnings.
-
-Tue Feb 13 09:09:01 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * TAO-INSTALL.html:
-          Document and IMHO slightly better way to configure TAO for
-          cross-compilation environments.
-
-Tue Feb 13 10:17:35 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
-
-        * tao/RT_ORB.cpp:
-          Fixed broken template instantiation.
-
-Tue Feb 13 01:14:26 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/RT_ORB.cpp (create_named_mutex):
-
-          Fixed misuse of ACE_THROW macro.  ACE_THROW_RETURN is the
-          correct macro.  Fixes a compile-time problem.
-
-        * tao/ORB_Core.i (poa_current):
-
-          If the cached POACurrent reference is nil then initialize the
-          RootPOA.  Doing so causes the POACurrent object to be
-          initialized and cached in the ORB Core.  Fixes problems where it
-          wasn't possible to obtain the POACurrent reference before the
-          RootPOA reference.
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp (pre_init):
-
-          Moved registration of "SSLIOPCurrent" object reference to the
-          ORBInitializer::pre_init() method so that it is available to
-          the resolve_initial_references() mechanism in
-          ORBInitializer::post_init().
-
-Mon Feb 12 22:52:34 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * tao/RT_Mutex.h:
-        * tao/RT_Mutex.cpp:
-        * tao/RT_ORB.cpp:
-        * tao/RT_ORB.h:
-        * tests/RTCORBA/RTMutex/server.cpp:
-          Changed named mutexes to conform more closely to Win32 named
-          mutex semantics.  Also simplified and cleaned up most of the
-          RT Mutex code.  Thanks to Irfan for much help.
-
-Mon Feb 12 18:53:05 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/tests/ior_corbaname/Makefile:
-          Add missing file to the list of sources for make depend.  This
-          should fix some intermittent failures in our nightly builds.
-
-Mon Feb 12 13:14:24 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * orbsvcs/Makefile:
-
-          Added guard to prevent SunCC4.2, which does not
-          support namespaces, from compiling the Interface
-          Repository, which requires them.
-
-Sun Feb 11 23:45:41 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/RT_ORBInitializer.cpp (register_policy_factories):
-
-          Fixed "unused parameter" warning that occured when native
-          exceptions were enabled.
-
-2001-02-12  Yamuna Krishnamurthy  <yamuna@ace.cs.wustl.edu>
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp:
-
-        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
-        * orbsvcs/tests/AVStreams/Multicast/serevr.cpp:
-
-        * orbsvcs/tests/AVStreams/Full_Profile/server.cpp:
-        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
-
-        * orbsvcs/tests/AVStreams/Latency/pong.cpp:
-        * orbsvcs/tests/AVStreams/Latency/ping.cpp:
-
-        * orbsvcs/tests/AVStreams/Pluggable/server.cpp:
-        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
-
-        * orbsvcs/tests/AVStreams/benchmark/server.cpp:
-        * orbsvcs/tests/AVStreams/benchmark/client.cpp:
-
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h:
-
-          Added an init method to the endpoint strategies to initialize
-          the orb and poa and hence fix the SUNCC5 compile errors.
-
-Mon Feb 12 00:28:26 2001  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Strategies/SHMIOP_Acceptor.cpp (open): Added error detection
-          to make sure we have something that looks like a port number.
-          Otherwise, don't open the acceptor.
-
-        * docs/ORBEndpoint.html:
-        * docs/Options.html: Fixed incorrect shmiop endpoint examples.  A
-          shmiop endpoint should be the form "shmiop://1234", not
-          "shmiop://:1234".                                     [Bug 686]
-
-Sun Feb 11 18:33:47 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp:
-
-          The problem with the nestea test on Redhat was that the server
-          was crashing (but the perl script seemed to hide that).  Thanks
-          to Mountain Dew <mountaindew@mountaindew.com> for assisting in
-          this debugging session.
-
-          [Bug 495]
-
-Sun Feb 11 17:06:06 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/Priority_Mapping_Manager.h (~TAO_Priority_Mapping_Manager):
-        * tao/RT_Current.h (~TAO_RT_Current):
-
-          Made destructor protected instead of private.  This fixes a
-          compile-time warning about the fact that the class had a private
-          destructor but had no friends.
-
-        * tao/RT_Current.cpp (the_priority):
-
-          Corrected typo.
-
-Sun Feb 11 16:52:55 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/Connection_Cache_Manager.cpp
-          (TAO_Connection_Cache_Mananger):
-
-          Initialize the lock pointer to zero in the base member
-          initializer list.  Fixes an access violation that occured upon
-          premature destruction of the Connection_Cache_Manager.  This
-          also makes it possible to determine if
-          Connection_Cache_Manager::open() was ever called.
-
-        * tao/Connection_Cache_Manager.inl (close):
-
-          Do not attempt to close the connection cache manager if the lock
-          pointer is zero.  Such a condition implies that the connection
-          cache was never open()ed.
-
-        * tao/ORB.h:
-        * tao/ORB.cpp (resolve_priority_mapping_manager):
-
-          Removed resolve_priority_mapping_manager() helper method.  It is
-          no longer needed since the RT_ORBInitializer registers the
-          "PriorityMappingManager" reference with the ORB.
-
-        * tao/ORB_Core.h (priority_mapping_manager_):
-
-          This class member is now a local member, instead of a static
-          one.  This fixes access violations that occured in the presence
-          of multiple ORBs.
-
-          It is also now a "_var".  This cleans up several memory
-          management issues.
-
-          (root_poa_):
-
-          Changed this class member from "_var" to a "_ptr".  The code
-          from which this reference is obtained
-          (TAO_Object_Adapter::root()) does not duplicate the RootPOA
-          reference, so the ORB Core should not attempt to release it.
-          Rather than duplicate the reference in the ORB core, the code
-          from which the RootPOA reference is obtained should perform the
-          duplication.  For now, the class member will remain a "_ptr".
-
-          (rt_orb_, rt_current_):
-
-          Changed this class member from "_var" to a "_ptr".  This
-          addresses some memory leaks.
-
-        * tao/ORB_Core.cpp (TAO_ORB_Core):
-
-          Initialize the RootPOA reference to the nil reference in the
-          base member initializer list.
-
-          (~TAO_ORB_Core):
-
-          Do not call delete() on the PolicyManager and PolicyCurrent
-          object references.  They are reference counted.  As such, call
-          CORBA::release() on them.  Fixes memory violations due to
-          attempts to release dangling references/pointers.
-
-          (fini):
-
-          No need to explicitly release the PriorityMappingManager
-          reference.  It will be released by the "_var" it is stored in
-          when the ORB Core is destroyed.
-
-          (root_poa):
-
-          The root_poa_ member is no longer a "_var".  Adjusted all
-          references to this member accordingly (i.e., removed the ".in()"
-          calls).
-
-          (priority_mapping_manager):
-
-          Obtain the PriorityMappingManager object reference from the
-          Object_Ref_Table, if it hasn't already been cached in the ORB
-          Core.
-
-          Removed method that sets the reference to the
-          PriorityMappingManager object.  It is longer needed since each
-          ORB now has its own PriorityMappingManager.
-
-          These two changes address memory access violations that occured
-          in the presence of multiple ORBs.
-
-        * tao/ORB_Core.i (rt_orb):
-
-          The rt_orb_ class member is now "_var".  Updated code to use
-          ".in()" accessors.
-
-          (rt_current):
-
-          Make sure the RTORB has been initialized prior to returning the
-          reference to the RTCurrent object.  This is necessary since
-          RTORB initialization causes the RTCurrent object to be
-          initialized as well.
-
-        * tao/RT_Current.h (TAO_RT_Current):
-
-          Derive this class from the reference counted version of
-          CORBA::LocalObject, i.e. the "TAO_Local_RefCounted_Object"
-          extension.  This addresses memory management issues.
-
-        * tao/Priority_Mapping_Manager.h (TAO_Priority_Mapping_Manager):
-        * tao/RT_Current.h (~TAO_RT_Current):
-        * tao/RT_Mutex.h (~TAO_RT_Mutex):
-
-          Made destructor private to enforce proper memory management of
-          this reference counted object.
-
-        * tao/RT_Current.cpp (the_priority):
-
-          Check the return value of the call to
-          {get,set}_thread_priority().  It isn't enough just to check for
-          exceptions.
-
-        * tao/RT_ORB.cpp (create_named_mutex):
-
-          Do not call delete() on a reference counted object.  The code
-          now properly calls CORBA::release() on the object.
-
-          Added missing ACE_CHECK_RETURN macro.
-
-        * tao/RT_ORBInitializer.h:
-
-          The RTCORBA policy factory is stateless and reentrant, so share
-          a single instance between all ORBs.
-
-        * tao/RT_ORBInitializer.cpp (pre_init):
-
-          Register the "PriorityMappingManager" object reference with the
-          ORB's resolve_initial_references() mechanism.
-
-          (post_init):
-
-          Do not instantiate the RT policy factory.  It is now a
-          TAO_RT_ORBInitializer class member (stack allocated).
-
-        * tao/RT_ORB_Loader.h (set_objects):
-
-          Made this helper method protected.  There is no reason why it
-          should be public.
-
-        * tao/RT_ORB_Loader.cpp (create_object):
-
-          Use ACE_NEW_THROW_EX instead ACE_NEW_RETURN.
-
-          Store RTORB reference in a CORBA::Object_var and relinquish
-          ownership upon return to the caller.  This improves exception
-          safety of this method.
-
-          (set_objects):
-
-          Use ACE_NEW_THROW_EX instead of the raw "new()" operator.
-
-        * tao/RT_PolicyFactory.h (TAO_RT_PolicyFactory):
-
-          Derive from CORBA::LocalObject to make reference counting a
-          no-op.  The TAO_RT_PolicyFactory is now stack allocated.
-
-        * tao/RT_Policy_i.h:
-
-          Made all policy and property class destructors protected to
-          enforce proper memory management of those reference counted
-          objects.
-
-        * tao/RT_Protocols_Hooks.cpp (set_priority_mapping):
-
-          If the reference to the PriorityMappingManager is nil, then
-          throw a CORBA::INV_OBJREF exception, i.e. don't just die
-          quietly.
-
-          (set_default_policies):
-
-          Store the newly allocated ServerProtocolPolicy and
-          ClientProtocolPolicy objects in their corresponding "_var"
-          objects.  This fixes memory leaks, in addition to making the
-          code exception safe.
-
-Sun Feb 11 14:44:24 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tao/orbconf.h:
-
-          On AIX, define TAO_USE_SEQUENCE_TEMPLATES.  Thanks to Scott Bolin
-          <scott.bolin@pgs.com> for the fix.  [Bug 767]
-
-        * tao/Exception.cpp:
-        * tao/corbafwd.h:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-
-          Changed the minor code TAO_IMPLREPO_SERVER_MANUAL_ACTIVATION to
-          TAO_IMPLREPO_MINOR_CODE, so I can now use it for ImR exceptions in
-          general.
-
-        * tao/PortableServer/POA.cpp:
-        * orbsvcs/ImplRepo_Service/Forwarder.cpp:
-
-          As reported by Mark L Boriack <mboriack@std.saic.com> in [Bug 724],
-          the ImplRepo_Service and POA code was letting through ImR specific
-          exceptions, even when throw specs didn't allow it.  I added catch
-          blocks to translate to TRANSIENT exceptions, when appropriate.
-
-Fri Feb  9 18:11:35 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * orbsvcs/ImplRepo_Service/README.txt:
-
-          Added a new page just for using the Naming Service with the
-          ImR.  THe page should show up on
-
-          http://doc.ece.uci.edu/Doxygen/Current/html/tao/implrepo_service/pages.html
-
-          in the next couple of days.
-
-Fri Feb  9 11:38:06 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * tao/PortableServer/Servant_Base.cpp:
-          Fixed problem with expressions like:
-
-          PortableServer::ServantBase_var foo = ...;
-          foo = foo.in ();
-
-          they used to crash.  Thanks to Jody Hagins <jody@atdesk.com> for
-          pointing this out.
-
-Fri Feb  9 11:35:17 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/tests/Interoperable_Naming/client.cpp:
-          Fixed warning about unreachable statement
-
-Fri Feb  9 12:13:44 2001  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-
-          Created duplicates of streamendpoint _ptrs before assigning them
-          to _vars.
-
-          Thanks to Bruce McIntosh<Bruce.McIntosh@Australia.Boeing.com>
-          for suggesting this.
-
-Thu Feb  8 18:47:52 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/MProfile.cpp (init_policy_list):
-
-          Added missing ACE_CHECK macro.
-
-Thu Feb  8 18:34:15 2001  Ossama Othman  <ossama@uci.edu>
-
-        * tao/ORB_Core.cpp (create_stub_object):
-
-          Fixed misuse of ACE_CHECK.  ACE_CHECK_RETURN should have been
-          used.
-
-        * tao/MProfile.cpp:
-        * tao/Stub.cpp:
-
-          Added missing ACE_CHECK_RETURN macros.
-
-          Fixed build errors and warnings.
-
-        * tao/Profile.cpp:
-
-          Fixed build warnings.
-
-Thu Feb  8 20:00:49 2001  Jeff Parsons <parsons@cs.wustl.edu>
-
-        * orbsvcs/IFR_Service/InterfaceS.cpp:
+        * tao/GIOP_Message_Lite.cpp:
+          Use the send() method with iovec arguments.
 
-          Chnages corresponding to the changes to generated
-          code in the the entry below.
+        * tao/Sync_Strategies.h:
+        * tao/Sync_Strategies.cpp:
+        * tao/Transport.cpp:
+          More cleanup for the Sync_Strategies, the must_queue() method
+          does not require a Stub argument.
 
-Thu Feb  8 19:22:00 2001  Jeff Parsons <parsons@cs.wustl.edu>
+Mon Feb 12 10:15:47 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_visitor_root/root.cpp:
+        * tao/Transport.h:
+        * tao/Transport.cpp:
+          Add new method to send a message block chain.
+          The template method to send data takes an iovec argument.
 
-          Added #ifndef guards agains including the skeleton
-          source file more than once, similar to the generated
-          header files and skeleton template source file. When
-          the _tie classes (which are templates) are used in a
-          service or application, the SunCC compiler tries to
-          compile the skeleton source file twice, even though
-          it contains no template code.
+        * tao/IIOP_Transport.h:
+        * tao/IIOP_Transport.cpp:
+          Implement the iovec-based send() template method.
 
-          Also consolidated several occurrences of the code
-          block that generates the #ifndef clause (with minor
-          variations) into a separate function.
+        * tao/Queued_Message.cpp:
+          The cleanup code was broken.
 
-Thu Feb 08 18:15:59 2001  Angelo Corsaro  <corsaro@cs.wustl.edu>
+        * tao/GIOP_Message_Base.cpp:
+          Use the message block chain method to send short critical
+          messages.
 
-        * tests/Exposed_Policies/server.conf:
-        * tests/Exposed_Policies/Object.cfg:
-        * tests/Exposed_Policies/POA.cfg:
-        * tests/Exposed_Policies/README:
-        * tests/Exposed_Policies/run_test.pl:
+Fri Feb 09 10:50:47 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/Queued_Message.h:
+        * tao/Queued_Message.inl:
+        * tao/Queued_Message.cpp:
+          Add new class to represent a queued message in the outgoing
+          path.  This class has to keep more than just the message block,
+          it also takes care of timeouts and signaling any waiting thread
+          when the message is sent.
+
+        * tao/Message_Sent_Callback.h:
+        * tao/Message_Sent_Callback.inl:
+        * tao/Message_Sent_Callback.cpp:
+          Define interface to signal threads waiting for a message to be
+          sent out, e.g. twoway requests blocked waiting for a queued
+          message.
+
+        * tao/Flushing_Strategy.h:
+        * tao/Flushing_Strategy.cpp:
+        * tao/Block_Flushing_Strategy.h:
+        * tao/Block_Flushing_Strategy.cpp:
+        * tao/Reactive_Flushing_Strategy.h
+        * tao/Reactive_Flushing_Strategy.cpp:
+          New classes to control how the outgoing data is flushed,
+          either by blocking on write() or by using the reactor.
 
-          Added service configuration file to set up one ORB endpoint
-          for each bands used in the server orb. Updated test specific
-          configuration files.
+        * tao/Resource_Factory.h:
+        * tao/default_resource.h:
+        * tao/default_resource.cpp:
+          Add new methods to create the flushing strategy.
 
-        * tao/Invocation_Endpoint_Selectors.cpp:
-        * tao/MProfile.cpp:
-        * tao/MProfile.h:
-        * tao/MProfile.i:
+        * tao/ORB_Core.h:
+        * tao/ORB_Core.i:
         * tao/ORB_Core.cpp:
-        * tao/Profile.cpp:
-        * tao/Profile.h:
-        * tao/Stub.cpp:
-        * tao/Stub.h:
-
-          Added ACE_TRY_ENV to a bounch of methods that deal with
-          policies, fixed some part of code that was leading to memory
-          leaks.
-
-        * tao/PortableServer/POA.cpp:
-
-          In the method <key_to_stub_i> there was a bug that has currently
-          been fixed, but more investigation is needed. The problem was
-          that when an object was created with a priority that was
-          overriding the POA priority, if that object also had lanes as
-          policy then the stub would have not been created.
-
-
-Thu Feb  8 14:53:07 2001  Darrell Brunsch <brunsch@uci.edu>
-
-        * tests/AMI_Timeouts/AMI_Timeouts.dsw:
-
-          Inserted client.dsp.
-
-        * tests/AMI_Timeouts/client.dsp:
-        * tests/AMI_Timeouts/server.dsp:
+          Add accessor for the flushing strategy.  Notice that the
+          strategy is stateless so a single instance (per-ORB) is needed.
 
-          Fixed/Added idl custom build commands.
+        * tao/Sync_Strategies.h:
+        * tao/Sync_Strategies.cpp:
+          The Sync_Strategies have been simplified.  They are now
+          stateless, and they only need to answer a couple of questions
+          (1) should a message be buffered, (2) should the ORB flush a
+          queue.
 
-Thu Feb  8 14:29:13 2001  Darrell Brunsch <brunsch@uci.edu>
+        * performance-tests/Latency/st_client.cpp:
+          Destroy the ORB on shutdown.
 
-        * tao/GIOP_Message_Handler.cpp:
+        * tao/TAO.dsp:
+        * tao/TAO_Static.dsp:
+          Add the new files to the TAO project files.
 
-          TAO_GIOP_Message_Handler::read_parse_message was checking
-          the errno after trnasport->recv (..) and was masking out
-          a ECONNRESET error.  In the ImR at least, this would cause
-          the ImR + a server to get into an infinite loop.
+        * tao/Transport.h:
+        * tao/Transport.inl:
+        * tao/Transport.cpp:
+          Move much of the functionality of sending and outgoing message
+          queue up to the base transport class.  Remove a lot of code
+          deailing with the previous (blocking) queues.
 
-          I removed this code so the error does get propogated up.
+        * tao/IIOP_Transport.cpp:
+        * tao/IIOP_Connection_Handler.cpp:
+        * tao/Strategies/SHMIOP_Transport.cpp:
+        * tao/Strategies/SHMIOP_Connection_Handler.cpp:
+        * tao/Strategies/UIOP_Transport.cpp:
+        * tao/Strategies/UIOP_Connection_Handler.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp:
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
+          Change the transport and connection handlers to use the new
+          outgoing message queue, the flushing strategy and the changes to
+          the SyncStrategy.
 
-Thu Feb  8 12:21:35 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
+        * tao/GIOP_Message_Base.cpp:
+          Propagate a few interface changes.
 
-        * tao/stub.cpp:
-        * tao/Policy_Manager.cpp:
-          Fixed policy object reference counting in several places
-          to fix bad pointer references when running the RT Corba
-          Client Protocol Unit Test.  Thanks to Nanbor for most of
-          the changes and thanks to Christian Ewald
-          <christian.ewald@zuehlke.com> for reporting this.
+        * tests/LongWrites/LongWrites.dsw:
+        * tests/LongWrites/client.dsp:
+        * tests/LongWrites/server.dsp:
+        * tests/LongWrites/run_test.pl:
+          Got the test to compile (and run) under NT.
 
 Wed Feb  7 14:31:48 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
@@ -3932,6 +848,7 @@ Thu Feb  1 20:29:54 2001  Frank Hunleth  <fhunleth@cs.wustl.edu>
           Ace_Recursive_Thread_Mutex, and Ace_RW_Thread_Mutex
           were changed to their TAO_SYNCH_ forms.
 
+
 Thu Feb  1 09:36:26 2001  Jeff Parsons <parsons@cs.wustl.edu>
 
         * examples/AMI/FL_Callback/peer.cpp:
diff --git a/TAO/Makefile.bor b/TAO/Makefile.bor
index 408f5249bfb..225593eeadb 100644
--- a/TAO/Makefile.bor
+++ b/TAO/Makefile.bor
@@ -40,7 +40,6 @@ DIRS = \
 	examples \
 	tests \
         performance-tests \
-        orbsvcs\tests \
 	utils
 
 !else
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 00da159595b..edb7d075b3c 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -35,8 +35,8 @@
 To: tao-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.1.13
-    ACE VERSION: 5.1.13
+    TAO VERSION: 1.1.12
+    ACE VERSION: 5.1.12
 
     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 ae4cc31269c..6f1d68799bd 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -78,7 +78,6 @@ likely unpredictable and erroneous results. <P>
       <UL>
         <LI>Change directory to <CODE>$ACE_ROOT/ace</CODE> and execute
             <CODE><A HREF="#makenotes">make</A></CODE>.<P>
-        <LI>Also build GPERF under <CODE>$ACE_ROOT/apps/gperf</CODE><P>
       </UL>
 
   <LI>Set <CODE>TAO_ROOT</CODE> environment variable to
@@ -133,101 +132,16 @@ If you are building TAO for a VxWorks target, please see the detailed
 instructions for building and installing ACE and TAO in <a
 href="../ACE-INSTALL.html#vxworks">$ACE_ROOT/ACE-INSTALL.html</a>.<p>
 
-    <P>Cross-compiling TAO is not much different than building it for
-      self-host.  The one major difference is that TAO's IDL compiler
-      must be built and run on the host; it's not necessary to run it
-      on the target.
-      There are several ways to do this, below we document the two
-      most common approaches:
-      </P>
-
-    <H4>Modifying the default location for the IDL compiler</H4>
-
-    <P>By default TAO assumes that the IDL compiler is located in:
-      <CODE>$TAO_ROOT/TAO_IDL/tao_idl</CODE> and that the GPERF tool
-      is located in <CODE>$ACE_ROOT/bin/gperf</CODE>, this is fine for
-      hosted builds, but not for cross-compilation.
-      Unfortunately there is no good default for cross-compilation
-      builds because different sites choose a different location for
-      their tools.
-    </P>
-    <P>You can override the default values by adding two lines in your
-      platform_macros.GNU file, as follows:
-<PRE>
-$ echo 'TAO_IDL := /your/path/tao_idl' \
-     >> platform_macros.GNU
-$ echo 'TAO_IDLFLAGS := -g /your/path/gperf' \
-</PRE>
-    </P>
-    <P>You could even use:
-<PRE>
-$ echo 'TAO_IDL := tao_idl' \
-     >> platform_macros.GNU
-$ echo 'TAO_IDLFLAGS := -g gperf' \
-</PRE>
-    if the tools are in your path.
-    </P>
-    
-    <P>Obviously you must first build the tools for the host platform,
-      typically you would do this as follows:
-<PRE>
-# (1) Create a clone directory for the host:
-
-$ cd ACE_wrappers
-$ mkdir -p build/HOST
-$ ./bin/create_ace_build build/HOST
-
-# (2) Configure the host build:
-
-$ echo '#include "ace/config-HOST.h"' > build/HOST/ace/config.h
-$ echo 'include $(ACE_ROOT)/include/makeinclude/platform_HOST.GNU' \
-     > build/HOST/include/makeinclude/platform_macros.GNU
-
-# Often host builds are static:
-$ echo 'static_libs_only=1' \
-     >> build/HOST/include/makeinclude/platform_macros.GNU
-
-# (3) Build the host tools
-
-$ cd build/HOST
-$ export ACE_ROOT=$PWD
-$ make -C ace
-$ make -C apps/gperf
-$ make -C TAO/TAO_IDL
-</PRE>
-
-    <P>Then configuring the location of the tools for the target
-      could be done as shown here:
-<PRE>
-# (4) Create a clone directory for the target:
-
-$ cd ACE_wrappers
-$ mkdir -p build/TARGET
-$ ./bin/create_ace_build build/TARGET
-
-# (5) Configure the target build:
-
-$ echo '#include "ace/config-TARGET.h"' > build/HOST/ace/config.h
-$ echo 'include $(ACE_ROOT)/include/makeinclude/platform_TARGET.GNU' \
-     > build/TARGET/include/makeinclude/platform_macros.GNU
-
-# (6) Configure the TARGET build to use the HOST IDL compiler and
-#     gperf tools, as described above.
-</PRE>
-
-    <H4>Alternative configuration, using links</H4>
-
-    <P>Some developers prefer to set up the host tools using symbolic
-      links (Unix) or copy of <code>tao_idl</code> (NT).
-      By way of example, here is how you could setup a
-      croos-compilation environment for Unix,
-      the host is <CODE>SunOS5/g++</CODE>,
-      the target is <CODE>VxWorks</CODE>.
-      It assumes that the ACE+TAO distribution has been
-      unpacked, with TAO below ACE_wrappers.  It uses the
-      ACE_wrappers/bin/create_ace_build script to create a shadow
-      build 
-      tree:
+Cross-compiling TAO is not much different than building it for
+self-host.  The one major difference is that TAO's IDL compiler must
+be built and run on the host; it's not necessary to run it on the
+target.  It's easiest to set this up by using a symlink (Unix) or copy
+of <code>tao_idl</code> (NT).  By way of example, here is how I setup
+my Unix (SunOS5, using g++) workspace to support cross-compilation
+(for VxWorks).  It assumes that the ACE+TAO distribution has been
+unpacked, with TAO below ACE_wrappers.  It uses the
+ACE_wrappers/bin/create_ace_build script to create a shadow build
+tree:<p>
 <ol>
   <li><code>cd ACE_wrappers</code>
   <li><code>bin/create_ace_build SunOS5_g++</code>
@@ -235,10 +149,9 @@ $ echo 'include $(ACE_ROOT)/include/makeinclude/platform_TARGET.GNU' \
   <li><code>cd build/vxworks/TAO</code>
   <li><code>/bin/rm -r TAO_IDL</code>
   <li><code>ln -s ../../SunOS5_g++/TAO/TAO_IDL</code>
-</ol>
-  </P>
+</ol><p>
 
-      <P>To build on the host:
+To build on the host:
 <ol>
   <li><code>cd build/SunOS5_g++</code>
   <li><code>export ACE_ROOT=`pwd`;
@@ -249,38 +162,24 @@ $ echo 'include $(ACE_ROOT)/include/makeinclude/platform_TARGET.GNU' \
   <li><code>export ACE_ROOT=`pwd`</code>
   <li><code>(cd ace; make && cd ../tests; make && cd ../TAO; make) &gt;
     make.log</code>
-</ol></p>
-
-    <P>For NT hosts, please see the detailed instructions for building
-      and installing ACE and TAO in
-      <a href="../ACE-INSTALL.html#vxworks">../ACE-INSTALL.html</a>,
-      and
-      <a href="../ACE-INSTALL.html#VxWorks/NT">Building ACE on
-	Tornado/NT hosts for VxWorks targets</a>
-    </P> 
-
-    <P>Please note that dynamic loading of libraries is not supported
-      by TAO for any cross-compiled target.  Therefore, dynamic
-      service configuration of the TAO ORB is not supported.
-    </p>
-
-    <P>If using perfect hashing, TAO_IDL needs gperf to be built on
-      the host. That's the default on many platforms.  First, build
-      <code>gperf</code> in the
-      <code>ACE_wrappers/apps/gperf/src/</code> directory.  Then, add
-      a symlink or copy to the <code>bin/</code> directory for the
-      target.
-    </P>
-
-    <H4>Which one is right for me?</H4>
-    
-    <P>Using links to cross-compile TAO may appear simpler at first
-      glance.  However, storing the location in the
-      <CODE>platform_macros.GNU</CODE> is more amenable for
-      sites where many developers share the same configuration files,
-      or where ACE+TAO are compiled once and used by a medium or large
-      size group.
-    </P>
+</ol><p>
+
+For NT hosts, please see the detailed instructions for building and
+installing ACE and TAO in <a
+href="../ACE-INSTALL.html#vxworks">../ACE-INSTALL.html</a>.  For
+NT hosts, see <a href="../ACE-INSTALL.html#VxWorks/NT">Building
+ACE on Tornado/NT hosts for VxWorks targets</a><p>
+
+Please note that dynamic loading of libraries is not supported by TAO
+for any cross-compiled target.  Therefore, dynamic service
+configuration of the TAO ORB is not supported.<p>
+
+If using perfect hashing, TAO_IDL needs gperf to be built on the host.
+That's the default on many platforms.  First, build <code>gperf</code>
+in the <code>ACE_wrappers/apps/gperf/src/</code> directory.  Then, add
+a symlink or copy to the <code>bin/</code> directory for the
+target.<p>
+
 
 <HR><P>
 <H3>On Windows NT</H3>
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 674591db9cd..a30a13b7111 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -963,6 +963,21 @@ Package=<4>
 

 ###############################################################################

 

+Project: "gperf_lib"=..\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

 Project: "tao_ifr"=.\orbsvcs\IFR_Service\tao_ifr.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw
index 395d8bfbacf..0e4f38520ab 100644
--- a/TAO/TAOACE_Static.dsw
+++ b/TAO/TAOACE_Static.dsw
@@ -501,6 +501,18 @@ Package=<4>
 

 ###############################################################################

 

+Project: "gperf_lib"=..\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

 Global:

 

 Package=<5>

diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 63c95518c13..b6052d905bf 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -108,12 +108,6 @@ TAO_CodeGen::upcase (const char *str)
 int
 TAO_CodeGen::start_client_header (const char *fname)
 {
-  if (fname == 0)
-    {
-      // Bad file name.
-      return -1;
-    }
-
   // @@ We are making use of "included_idl_files" that is in the
   // idl_global. We need to make sure the validity of those files.
   idl_global->validate_included_idl_files ();
@@ -138,11 +132,56 @@ TAO_CodeGen::start_client_header (const char *fname)
       // Generate the #ident string, if any.
       this->gen_ident_string (this->client_header_);
 
-      // Generate the #ifndef clause.
-      this->gen_ifndef_string (fname,
-                               this->client_header_,
-                               "_TAO_IDL_",
-                               "_H_");
+      // Now generate the #if !defined clause.
+      static char macro_name [NAMEBUFSIZE];
+
+      ACE_OS::memset (macro_name, 
+                      '\0', 
+                      NAMEBUFSIZE);
+
+      const char *suffix = ACE_OS::strrchr (fname, '.');
+
+      if (suffix == 0)
+        {
+          // File seems to have no extension, so let us take the name
+          // as it is.
+          if (fname == 0)
+            {
+              // Bad file name.
+              return -1;
+            }
+          else
+            {
+              suffix = fname;
+            }
+        }
+
+      ACE_OS::sprintf (macro_name, "_TAO_IDL_");
+
+      // Convert letters in fname to upper case.
+      for (int i = 0; i < (suffix - fname); i++)
+        {
+          if (isalpha (fname [i]))
+            {
+              macro_name[i + 9] = (char) toupper (fname [i]);
+            }
+          else if (isdigit (fname [i]))
+            {
+              macro_name[i + 9] = fname[i];
+            }
+          else
+            {
+              macro_name[i + 9] = '_';
+            }
+        }
+
+      ACE_OS::strcat (macro_name, "_H_");
+
+      // Generate the #ifndef ... #define statements.
+      this->client_header_->print ("#ifndef %s\n", 
+                                   macro_name);
+      this->client_header_->print ("#define %s\n\n", 
+                                   macro_name);
 
       if (be_global->pre_include () != 0)
         {
@@ -503,11 +542,50 @@ TAO_CodeGen::start_server_header (const char *fname)
       // Generate the ident string, if any.
       this->gen_ident_string (this->server_header_);
 
-      // Generate the #ifndef clause.
-      this->gen_ifndef_string (fname,
-                               this->server_header_,
-                               "_TAO_IDL_",
-                               "_H_");
+      // Now generate the #if !defined clause.
+      static char macro_name [NAMEBUFSIZE];
+
+      ACE_OS::memset (macro_name, '\0', NAMEBUFSIZE);
+      const char *suffix = ACE_OS::strrchr (fname, '.');
+
+      if (suffix == 0)
+        {
+          // File seems to have no extension, so let us take the name
+          // as it is.
+          if (fname == 0)
+            {
+              // Bad file name.
+              return -1;
+            }
+          else
+            {
+              suffix = fname;
+            }
+        }
+
+      ACE_OS::sprintf (macro_name, "_TAO_IDL_");
+
+      // Convert letters in fname to upper case.
+      for (int i=0; i < (suffix - fname); i++)
+        {
+          if (isalpha (fname [i]))
+            {
+              macro_name[i+9] = (char) toupper (fname [i]);
+            }
+          else if (isdigit (fname [i]))
+            {
+              macro_name[i+9] = fname[i];
+            }
+          else
+            {
+              macro_name[i+9] = '_';
+            }
+        }
+
+      ACE_OS::strcat (macro_name, "_H_");
+
+      this->server_header_->print ("#ifndef %s\n", macro_name);
+      this->server_header_->print ("#define %s\n\n", macro_name);
 
       if (be_global->pre_include () != 0)
         {
@@ -693,11 +771,54 @@ TAO_CodeGen::start_server_template_header (const char *fname)
       // Generate the ident string, if any.
       this->gen_ident_string (this->server_template_header_);
 
-      // Generate the #ifndef clause.
-      this->gen_ifndef_string (fname,
-                               this->server_template_header_,
-                               "_TAO_IDL_",
-                               "_H_");
+      // Now generate the #if !defined clause.
+      static char macro_name [NAMEBUFSIZE];
+
+      ACE_OS::memset (macro_name, 
+                      '\0', 
+                      NAMEBUFSIZE);
+
+      const char *suffix = ACE_OS::strrchr (fname, '.');
+
+      if (suffix == 0)
+        {
+          // File seems to have no extension, so let us take the name
+          // as it is.
+          if (fname == 0)
+            {
+              // Bad file name.
+              return -1;
+            }
+          else
+            {
+              suffix = fname;
+            }
+        }
+
+      ACE_OS::sprintf (macro_name, 
+                       "_TAO_IDL_");
+
+      // Convert letters in fname to upper case.
+      for (int i = 0; i < (suffix - fname); ++i)
+        {
+          if (isalpha (fname [i]))
+            {
+              macro_name[i+9] = (char) toupper (fname [i]);
+            }
+          else if (isdigit (fname [i]))
+            {
+              macro_name[i+9] = fname[i];
+            }
+          else
+            {
+              macro_name[i+9] = '_';
+            }
+        }
+
+      ACE_OS::strcat (macro_name, "_H_");
+
+      this->server_template_header_->print ("#ifndef %s\n", macro_name);
+      this->server_template_header_->print ("#define %s\n\n", macro_name);
 
       if (be_global->pre_include () != 0)
         {
@@ -755,12 +876,6 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
   // Generate the ident string, if any.
   this->gen_ident_string (this->server_skeletons_);
 
-  // Generate the #ifndef clause.
-  this->gen_ifndef_string (fname,
-                           this->server_skeletons_,
-                           "_TAO_IDL_",
-                           "_CPP_");
-
   // Generate the include statement for the precompiled header file.
   if (be_global->pch_include ())
     {
@@ -854,11 +969,53 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       // Generate the ident string, if any.
       this->gen_ident_string (this->server_template_skeletons_);
 
-      // Generate the #ifndef clause.
-      this->gen_ifndef_string (fname,
-                               this->server_template_skeletons_,
-                               "_TAO_IDL_",
-                               "_CPP_");
+      // Now generate the #if !defined clause.
+      static char macro_name [NAMEBUFSIZE];
+
+      ACE_OS::memset (macro_name, 
+                      '\0', 
+                      NAMEBUFSIZE);
+
+      const char *suffix = ACE_OS::strrchr (fname, '.');
+
+      if (suffix == 0)
+        {
+          // File seems to have no extension, so let us take the name
+          // as it is.
+          if (fname == 0)
+            {
+              // Bad file name.
+              return -1;
+            }
+          else
+            {
+              suffix = fname;
+            }
+        }
+
+      ACE_OS::sprintf (macro_name, "_TAO_IDL_");
+
+      // Convert letters in fname to upper case.
+      for (int i=0; i < (suffix - fname); i++)
+        {
+          if (isalpha (fname [i]))
+            {
+              macro_name[i+9] = (char) toupper (fname [i]);
+            }
+          else if (isdigit (fname [i]))
+            {
+              macro_name[i+9] = fname[i];
+            }
+          else
+            {
+              macro_name[i+9] = '_';
+            }
+        }
+
+      ACE_OS::strcat (macro_name, "_CPP_");
+
+      this->server_template_skeletons_->print ("#ifndef %s\n", macro_name);
+      this->server_template_skeletons_->print ("#define %s\n\n", macro_name);
 
       // Generate the include statement for the server header.
       *this->server_template_skeletons_
@@ -987,11 +1144,50 @@ TAO_CodeGen::start_implementation_header (const char *fname)
       // Generate the ident string, if any.
       this->gen_ident_string (this->implementation_header_);
 
-      // Generate the #ifndef clause.
-      this->gen_ifndef_string (fname,
-                               this->implementation_header_,
-                               "",
-                               "_H_");
+      // Now generate the #ifndef clause.
+      static char macro_name [NAMEBUFSIZE];
+
+      ACE_OS::memset (macro_name, 
+                      '\0', 
+                      NAMEBUFSIZE);
+
+      const char *suffix = ACE_OS::strrchr (fname, '.');
+
+      if (suffix == 0)
+        {
+          // File seems to have no extension, so let us take the name
+          // as it is.
+          if (fname == 0)
+            {
+              // Bad file name.
+              return -1;
+            }
+          else
+            {
+              suffix = fname;
+            }
+        }
+
+      for (int i = 0; i < (suffix - fname); ++i)
+        {
+          if (isalpha (fname [i]))
+            {
+              macro_name[i] = (char) toupper (fname [i]);
+            }
+          else if (isdigit (fname [i]))
+            {
+              macro_name[i] = fname[i];
+            }
+          else
+            {
+              macro_name[i] = '_';
+            }
+        }
+
+      ACE_OS::strcat (macro_name, "_H_");
+
+      this->implementation_header_->print ("#ifndef %s\n", macro_name);
+      this->implementation_header_->print ("#define %s\n\n", macro_name);
 
       const char* server_hdr = BE_GlobalData::be_get_server_hdr_fname (1);
 
@@ -1045,6 +1241,43 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname)
       // Generate the ident string, if any.
       this->gen_ident_string (this->implementation_skeleton_);
 
+      static char macro_name [NAMEBUFSIZE];
+
+      ACE_OS::memset (macro_name, 
+                      '\0', 
+                      NAMEBUFSIZE);
+
+      const char *suffix = ACE_OS::strrchr (fname, '.');
+
+
+      if (suffix == 0)
+        {
+          // File seems to have no extension, so let us take the name
+          // as it is.
+          if (fname == 0)
+            {
+              // Bad file name.
+              return -1;
+            }
+          else
+            {
+              suffix = fname;
+            }
+        }
+
+      // Convert letters in fname to upper case.
+      for (int i = 0; i < (suffix - fname); ++i)
+        {
+          if (isalpha (fname [i]))
+            {
+              macro_name[i] = fname [i];
+            }
+          else
+            {
+              macro_name[i] = fname[i];
+            }
+        }
+
       const char* impl_hdr =
         BE_GlobalData::be_get_implementation_hdr_fname ();
 
@@ -1246,15 +1479,6 @@ TAO_CodeGen::end_server_template_skeletons (void)
   return 0;
 }
 
-int
-TAO_CodeGen::end_server_skeletons (void)
-{
-  // Code to put the last #endif.
-  *this->server_skeletons_ << "\n#endif /* ifndef */\n";
-
-  return 0;
-}
-
 // We use the following helper functions to pass information. This class is the
 // best place to pass such information rather than passing information through
 // global variables spread everywhere. This class is a singleton and is
@@ -1332,57 +1556,6 @@ TAO_CodeGen::gen_ident_string (TAO_OutStream *stream) const
     }
 }
 
-void
-TAO_CodeGen::gen_ifndef_string (const char *fname,
-                                TAO_OutStream *stream,
-                                const char *prefix,
-                                const char *suffix)
-{
-  static char macro_name [NAMEBUFSIZE];
-
-  ACE_OS::memset (macro_name, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  const char *extension = ACE_OS::strrchr (fname, '.');
-
-  if (extension == 0)
-    {
-      // File seems to have no extension, so let us take the name
-      // as it is.
-      extension = fname;
-    }
-
-  ACE_OS::sprintf (macro_name, prefix);
-
-  int offset = ACE_OS::strlen (prefix);
-
-  // Convert letters in fname to upper case.
-  for (int i = 0; i < (extension - fname); i++)
-    {
-      if (isalpha (fname [i]))
-        {
-          macro_name[i + offset] = (char) toupper (fname [i]);
-        }
-      else if (isdigit (fname [i]))
-        {
-          macro_name[i + offset] = fname[i];
-        }
-      else
-        {
-          macro_name[i + offset] = '_';
-        }
-    }
-
-  ACE_OS::strcat (macro_name, suffix);
-
-  // Generate the #ifndef ... #define statements.
-  stream->print ("#ifndef %s\n", 
-                 macro_name);
-  stream->print ("#define %s\n\n", 
-                 macro_name);
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX>;
 template class ACE_Singleton<TAO_OutStream_Factory, ACE_SYNCH_RECURSIVE_MUTEX>;
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index 5b5b4d32575..ae0b44e6e0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -139,35 +139,60 @@ int be_visitor_array_ch::visit_array (be_array *node)
     }
   *os << ";\n";
 
-  // No _var or _out class for an anonymous (non-typedef'd) array.
-  if (this->ctx_->tdef () != 0)
+  // typedef the _var, _out, and _forany types
+  if (this->gen_var_defn (node) == -1)
     {
-      // Generate the _var and _out class declarations.
-      if (this->gen_var_defn (node) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_array_ch::"
+                         "visit_argument - "
+                         "var_defn failed\n"),
+                        -1);
+    }
+  // a class is generated for an out defn only for a variable length struct
+  if (node->size_type () == be_decl::VARIABLE)
+    {
+      if (this->gen_out_defn (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_array_ch::"
                              "visit_argument - "
-                             "var_defn failed\n"),
+                             "out_defn failed\n"),
                             -1);
         }
-      // An out defn is generated only for a variable length struct
-      if (node->size_type () == be_decl::VARIABLE)
+    }
+  else
+    {
+      // fixed size
+      os->indent ();
+      // if we are a typedefed array, we can use the TYPE name to define an
+      // _out type. However, for anonymous arrays that do not give rise to a
+      // new type, we use the base type for defining an out type
+      if (this->ctx_->tdef ())
         {
-          if (this->gen_out_defn (node) == -1)
+          *os << "typedef " << node->local_name () << " "
+              << node->local_name () << "_out;\n";
+        }
+      else
+        {
+          *os << "typedef ";
+          if (bt->accept (this) == -1)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "be_visitor_array_ch::"
-                                 "visit_argument - "
-                                 "out_defn failed\n"),
+                                 "visit_array - "
+                                 "base type decl failed\n"),
                                 -1);
             }
-        }
-      else
-        {
-          os->indent ();
-          *os << "typedef " << node->local_name () << " "
-              << node->local_name () << "_out;\n";
+          *os << " _" << node->local_name () << "_out";
+          if (node->gen_dimensions (os) == -1)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "be_visitor_array_ch::"
+                                 "visit_array - "
+                                 "gen dimensions failed\n"),
+                                -1);
+            }
+          *os << ";\n";
         }
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index e89dc21302f..7dedb5491b8 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -74,32 +74,27 @@ int be_visitor_array_ci::visit_array (be_array *node)
         }
     }
 
-  // No _var or _out class for an anonymous (non-typedef'd) array.
-  if (this->ctx_->tdef () != 0)
+  // generate code for the _var, _out, and _forany types
+  if (this->gen_var_impl (node) == -1)
     {
-      // Generate code for the _var and _out types
-      if (this->gen_var_impl (node) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_array_ci::"
+                         "visit_array - "
+                         "var_defn failed\n"),
+                        -1);
+    }
+  if (node->size_type () == be_decl::VARIABLE)
+    {
+      if (this->gen_out_impl (node) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_array_ci::"
                              "visit_array - "
-                             "var_defn failed\n"),
+                             "out_defn failed\n"),
                             -1);
         }
-      if (node->size_type () == be_decl::VARIABLE)
-        {
-          if (this->gen_out_impl (node) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_array_ci::"
-                                 "visit_array - "
-                                 "out_defn failed\n"),
-                                -1);
-            }
-        }
     }
 
-  // Generate code for the forany type.
   if (this->gen_forany_impl (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 3e319a41985..2adcb042740 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -226,22 +226,16 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (be_op
   *os << " ()" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
-  *os << "Messaging::ExceptionHolder::_tao_seq_Octet *"
-      << "marshaled_exception_ptr = 0;" << be_nl
-      << "ACE_NEW (" << be_idt << be_idt_nl
-      << "marshaled_exception_ptr," << be_nl
-      << "Messaging::ExceptionHolder::_tao_seq_Octet (" 
+  *os << "Messaging::ExceptionHolder::_tao_seq_Octet_var marshaled_exception_var =" 
+      << be_idt_nl
+      << "new Messaging::ExceptionHolder::_marshaled_exception_seq ("
       << be_idt << be_idt_nl 
       << "cdr->length (), // max" 
       << be_nl
       << "cdr->length (), // length" << be_nl
       << "(unsigned char*) cdr->rd_ptr (), // data" << be_nl
       << "0 // release" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl
-      << ");" << be_uidt_nl << be_nl
-      << "Messaging::ExceptionHolder::_tao_seq_Octet_var "
-      << "marshaled_exception_var =" << be_idt_nl 
-      << "marshaled_exception_ptr;" << be_uidt_nl << be_nl
+      << ");" << be_uidt << be_uidt_nl << be_nl
       << "exception_holder_var->marshaled_exception (marshaled_exception_var.in ());" 
       << be_nl << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
index c8c2e544779..c1462d2ff54 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
@@ -156,7 +156,7 @@ be_visitor_operation_interceptors_ss::visit_operation (be_operation *node)
     }
 
   // Get the right object implementation.
-  *os << intf->full_skel_name () << " *tao_impl";
+  *os << intf->full_skel_name () << " *tao_impl" << be_nl;
 
   // Generate the argument list with the appropriate mapping. For these
   // we grab a visitor that generates the parameter listing.
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 2b81ee9dcc3..257a2813b94 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -146,21 +146,19 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   os->indent ();
   // Get the right object implementation.
   *os << intf->full_skel_name () << " *_tao_impl = ("
-      << intf->full_skel_name () << " *)_tao_object_reference;" 
-      << be_nl << be_nl;
+      << intf->full_skel_name () << " *)_tao_object_reference;\n\n";
 
   // Declare a return type variable.
   be_visitor_context ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_DECL_SS);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
 
-  // Do we have any arguments in the operation that needs marshalling.
+  // Do we have any arguments in the operation that needs marshalling
   UTL_ScopeActiveIterator si (node,
                               UTL_Scope::IK_decls);
   AST_Decl *d = 0;
   AST_Argument *arg = 0;
   int flag = 0;
-
   while (!si.is_done ())
   {
     d = si.item ();
@@ -169,19 +167,19 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     if (arg->direction () == AST_Argument::dir_INOUT ||
         arg->direction () == AST_Argument::dir_OUT)
       {
-        // There are return type that needs to get marshalled.
+        // There are return type that needs to get marshalled
         flag = 1;
         break;
       }
-
     si.next ();
   }
 
-  // Check if the flag is zero and for the return type.
-  if (flag == 0 && node->void_return_type () == 1)
+  // Check if the flag is zero and for the return type
+  if (flag == 0 &&
+      node->void_return_type () == 1)
     {
       // There are no return type and argument values that needs to be
-      // marshalled.
+      // marshalled
       *os << "_tao_server_request.argument_flag (0);" << be_nl;
     }
 
@@ -271,7 +269,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
 
   *os << " ri (" << be_idt << be_idt_nl
       << "_tao_server_request," << be_nl
-      << "_tao_impl";
+      << "_tao_impl" << be_nl;
 
   // Generate the formal argument fields which are passed to the
   // RequestInfo object.
@@ -299,7 +297,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   *os << "_tao_vfr.receive_request (&ri, ACE_TRY_ENV);" << be_nl
       << "ACE_TRY_CHECK;" << be_nl;
 
-  *os << "\n#endif /* TAO_HAS_INTERCEPTORS */\n";
+  *os << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_nl;
 
   // Make the upcall and assign to the return val.
   ctx = *this->ctx_;
@@ -317,7 +315,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     }
 
   // Make the upcall.
-  *os << be_nl
+  *os << "\n" << be_nl
       << "_tao_impl->" << node->local_name () << " (" << be_idt << be_idt_nl;
   ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_UPCALL_SS);
@@ -334,12 +332,8 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     }
 
   // End the upcall.
-  *os << be_uidt_nl << ");" << be_uidt_nl;
-
-  if (!be_global->exception_support ())
-    {
-      *os << "TAO_INTERCEPTOR_CHECK;" << be_nl;
-    }
+  *os << be_uidt_nl << ");" << be_uidt_nl
+      << "TAO_INTERCEPTOR_CHECK;" << be_nl << be_nl;
 
   // Update the result.
   bt = be_type::narrow_from_decl (node->return_type ());
@@ -375,7 +369,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_OTHERS);
       visitor = tao_cg->make_visitor (&ctx);
 
-//      os->indent ();
+      os->indent ();
 
       if ((!visitor) || (bt->accept (visitor) == -1))
         {
@@ -459,7 +453,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
           << "&& !_tao_server_request.sync_with_server ())" << be_uidt_nl
           << "{" << be_idt_nl
           << "_tao_server_request.init_reply ();" << be_uidt_nl
-          << "}" << be_uidt_nl << be_nl;
+          << "}" << be_uidt << be_uidt_nl;
     }
 
   // Marshal outgoing parameters.
@@ -472,9 +466,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << "// In case ACE_TRY_ENV is not used in this function" << be_nl
-      << "ACE_UNUSED_ARG (ACE_TRY_ENV);" << be_uidt_nl
-      << "}\n\n";
+  *os << "}\n\n";
   return 0;
 }
 
@@ -604,7 +596,8 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node,
 
   // We will be here only if we are 2way
   // first initialize a reply message
-  *os << "_tao_server_request.init_reply ();" << be_nl << be_nl;
+  os->indent ();
+  *os << "_tao_server_request.init_reply ();";
 
   // We still need the following check because we maybe 2way and yet have no
   // parameters and a void return type.
@@ -612,8 +605,13 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node,
       !this->has_param_type (node, AST_Argument::dir_INOUT) &&
       !this->has_param_type (node, AST_Argument::dir_OUT))
     {
+      *os << be_uidt_nl;
       return 0;
     }
+  else
+    {
+      *os << be_nl;
+    }
 
   // Create temporary variables for the out and return parameters.
   if (!this->void_return_type (bt))
@@ -650,9 +648,8 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node,
                         -1);
     }
 
-  *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" 
-      << be_nl << be_nl;
-  *os << "if (!(\n" << be_idt << be_idt;
+  *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
+  *os << "if (!(\n" << be_idt;
 
   if (!this->void_return_type (bt))
     {
@@ -700,7 +697,7 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node,
         }
     }
 
-  *os << be_uidt_nl << "))\n";
+  *os << be_uidt_nl << "))\n" << be_idt;
   // if marshaling fails, raise exception
   if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
                                  "",
@@ -713,7 +710,7 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node,
                         -1);
     }
 
-  *os << be_uidt_nl;
+  *os << be_uidt << be_uidt << "\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 734ed792527..929b67ad76e 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -165,12 +165,8 @@ int be_visitor_root::visit_root (be_root *node)
       break;
     case TAO_CodeGen::TAO_ROOT_SH:
       (void) tao_cg->end_server_header ();
-
       if (be_global->gen_tie_classes ())
-        {
-          (void) tao_cg->end_server_template_header ();
-        }
-
+        (void) tao_cg->end_server_template_header ();
       return 0;
 
     case TAO_CodeGen::TAO_ROOT_CI:
@@ -181,11 +177,7 @@ int be_visitor_root::visit_root (be_root *node)
       return 0; // nothing to be done
     case TAO_CodeGen::TAO_ROOT_SS:
       if (be_global->gen_tie_classes ())
-        {
-          (void) tao_cg->end_server_template_skeletons ();
-        }
-
-      (void) tao_cg->end_server_skeletons ();
+        (void) tao_cg->end_server_template_skeletons ();
       return 0; // nothing to be done
     default:
       {
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 cc2ce275d93..3e5ce556459 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -474,38 +474,33 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
   os->gen_endif (); // Endif macro.
 
-  // No _var or _out class for an anonymous (non-typedef'd) sequence.
-  if (this->ctx_->tdef () != 0)
-    {
-      // Generate the ifdefined macro for the var type.
-      os->gen_ifdef_macro (node->flat_name (), "_var");
+  // Generate the ifdefined macro for the var type.
+  os->gen_ifdef_macro (node->flat_name (), "_var");
 
-      // Generate the var and out types.
-      if (this->gen_var_defn (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ch::"
-                             "visit_sequence - "
-                             "codegen for _var failed\n"), -1);
-        }
+  // Generate the var and out types.
+  if (this->gen_var_defn (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_sequence_ch::"
+                         "visit_sequence - "
+                         "codegen for _var failed\n"), -1);
+    }
 
-      os->gen_endif ();
+  os->gen_endif ();
 
-      // Generate the ifdefined macro for the _out type.
-      os->gen_ifdef_macro (node->flat_name (), "_out");
+  // Generate the ifdefined macro for the _out type.
+  os->gen_ifdef_macro (node->flat_name (), "_out");
 
-      if (this->gen_out_defn (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ch::"
-                             "visit_sequence - "
-                             "codegen for _out failed\n"),
-                            -1);
-        }
-
-      os->gen_endif ();
+  if (this->gen_out_defn (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_sequence_ch::"
+                         "visit_sequence - "
+                         "codegen for _out failed\n"),
+                        -1);
     }
 
+  os->gen_endif ();
   node->cli_hdr_gen (1);
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
index 151610e5c37..003ce0e444f 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp
@@ -64,33 +64,28 @@ be_visitor_sequence_ci::visit_sequence (be_sequence *node)
 
   // End of instantiation.
 
-  // No _var or _out class for an anonymous (non-typedef'd) sequence.
-  if (this->ctx_->tdef () != 0)
-    {
-      // Generate the ifdefined macro for the sequence type.
-      os->gen_ifdef_macro (node->flat_name ());
-
-      // All we do is generate the _var and _out implementations.
-      if (this->gen_var_impl (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "visit_sequence - "
-                             "codegen for _var failed\n"), -1);
-        }
+  // Generate the ifdefined macro for the sequence type.
+  os->gen_ifdef_macro (node->flat_name ());
 
-      if (this->gen_out_impl (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_ci::"
-                             "visit_sequence - "
-                             "codegen for _out failed\n"), -1);
-        }
+  // All we do is generate the _var and _out implementations.
+  if (this->gen_var_impl (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_sequence_ci::"
+                         "visit_sequence - "
+                         "codegen for _var failed\n"), -1);
+    }
 
-      // Generate the endif macro for the sequence type.
-      os->gen_endif ();
+  if (this->gen_out_impl (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_sequence_ci::"
+                         "visit_sequence - "
+                         "codegen for _out failed\n"), -1);
     }
 
+  // Generate the endif macro for the sequence type.
+  os->gen_endif ();
   node->cli_inline_gen (1);
 
   return 0;
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index ab6710b8ffd..686ed38e22f 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -607,9 +607,6 @@ public:
   int end_server_template_skeletons (void);
   // Put a last #endif in the server skeletons.
 
-  int end_server_skeletons (void);
-  // Put a last #endif in the server skeletons.
-
   TAO_OutStream *client_header (void);
   // Get the client header stream.
 
@@ -682,11 +679,6 @@ public:
   // Pass along the #ident string, if any, from the IDL file.
 
 private:
-  void gen_ifndef_string (const char *fname,
-                          TAO_OutStream *stream,
-                          const char *prefix,
-                          const char *suffix);
-
   TAO_OutStream *client_header_;
   // Client header stream.
 
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 397d302ce91..a02186d8590 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -1335,10 +1335,6 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
           return d;
         }
 
-      // For the possible call to look_in_inherited() below.
-      AST_Decl::NodeType nt = d->node_type ();
-      t = DeclAsScope (d);
-
       // OK, start of name is defined. Now loop doing local lookups
       // of subsequent elements of the name, if any.
       UTL_ScopedName *sn = (UTL_ScopedName *) e->tail ();
@@ -1350,17 +1346,6 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
                                          0);
         }
 
-      // If the start of the scoped name is an interface, and the
-      // above lookup failed, it's possible that what we're looking
-      // up was inherited into that interface. The first call to
-      // look_in_inherited() is this function only checks base classes
-      // of the scope (interface) we started the lookup from.
-      if (d == 0 && nt == AST_Decl::NT_interface)
-        {
-          d = t->look_in_inherited (sn,
-                                    treat_as_ref);
-        }
-
       // If treat_as_ref is true and d is not 0, add d to
       // set of nodes referenced here.
       if (treat_as_ref && d != 0)
diff --git a/TAO/VERSION b/TAO/VERSION
index a708cc38f74..168aba5f075 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.1.13, released Fri Feb 23 19:48:08 2001.
+This is TAO version 1.1.12, released Thu Jan 11 10:00:06 2001.
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-users@cs.wustl.edu), using the
diff --git a/TAO/docs/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index 4e0928dc2bd..32429ebff1f 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -1,4 +1,4 @@
-1<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 
 <!-- $Id$ -->
 
@@ -36,11 +36,11 @@
     <CODE>-ORBEndpoint</CODE> options or by delimiting endpoints with
     a semi-colon (;).  For example:
     <blockquote><CODE>
-        -ORBEndpoint iiop://localhost:9999 -ORBEndpoint uiop:///tmp/mylocalsock -ORBEndpoint shmiop://10002
+        -ORBEndpoint iiop://localhost:9999 -ORBEndpoint uiop:///tmp/mylocalsock -ORBEndpoint shmiop://:10002
       </CODE></blockquote>
     is equivalent to:
     <blockquote><CODE>
-        -ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://10002'
+        -ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://:10002'
       </CODE></blockquote>
     Notice the single quotes (') in the latter option specification.
     Single quotes are needed to prevent the shell from interpreting
@@ -449,7 +449,7 @@
       directory.  Rendezvous points chosen by TAO are prepended with
       "<CODE>TAO</CODE>."  TAO will always choose rendezvous points
       with absolute paths.
-
+ 
     <P>
     <h3>UIOP Endpoint Examples</h3>
     <P>
@@ -467,7 +467,7 @@
     <address><a href="mailto:ossama@uci.edu">Ossama Othman</a></address>
 <!-- Created: Thu May 18 08:37:25 PDT 2000 -->
 <!-- hhmts start -->
-Last modified: Mon Feb 12 00:21:48 Central Standard Time 2001
+Last modified: Thu Oct  5 14:25:05 PDT 2000
 <!-- hhmts end -->
   </body>
 </html>
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index c68e4f4a138..a1d8b8872ec 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -155,7 +155,7 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
   </TR>
   <TR>
     <TD><CODE><A HREF="ORBEndpoint.html">-ORBEndpoint</A></CODE>
-              <EM>endpoint</EM></TD>
+	      <EM>endpoint</EM></TD>
     <TD><a name="-ORBEndpoint"></a>Tells the ORB to listen for requests on the
         interface specified by <I><EM>endpoint</EM></I>.  Endpoints are
         specified using a URL style format.  An endpoint has the form:
@@ -170,11 +170,11 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
         Sets of endpoints may be specified using multiple <CODE>-ORBEndpoint</CODE>
         options or by delimiting endpoints with a semi-colon (;).  For example,
         <blockquote><CODE>
-        -ORBEndpoint iiop://localhost:9999 -ORBEndpoint uiop:///tmp/mylocalsock -ORBEndpoint shmiop://10002
+        -ORBEndpoint iiop://localhost:9999 -ORBEndpoint uiop:///tmp/mylocalsock -ORBEndpoint shmiop://:10002
         </CODE></blockquote>
         is equivalent to:
         <blockquote><CODE>
-        -ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://10002'
+        -ORBEndpoint 'iiop://localhost:9999;uiop:///tmp/mylocalsock;shmiop://:10002'
         </CODE></blockquote>
         Notice the single quotes (') in the latter option specification.  Single
         quotes are needed to prevent the shell from interpreting text after the
@@ -276,11 +276,11 @@ merged with <a href="#-ORBCollocation"><code>-ORBCollocation</code></a>.
         <CODE>-ORBEndpoint</CODE> option.
         <P>
         This is a client-side option.
-        <P>
-        <FONT COLOR=RED>-ORBPreconnect is <STRONG>deprecated</STRONG>.
-        This option will be removed in the near future.  The Real-Time CORBA standard
-        <CODE>validate_connection()</CODE> method should be used
-        instead.
+	<P>
+	<FONT COLOR=RED>-ORBPreconnect is <STRONG>deprecated</STRONG>.
+	This option will be removed in the near future.  The Real-Time CORBA standard
+	<CODE>validate_connection()</CODE> method should be used
+	instead.   
     </TD>
   </TR>
   <TR>
@@ -403,7 +403,7 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
         <TABLE BORDER="1" CELLSPACING="2" CELLPADDING="0">
           <TR><TH><em>which</em></TH><TH>Reactor</TH>
         </TR>
-        <TR>
+	<TR>
           <TD><CODE>select_mt</CODE></TD>
           <TD>Use the multi-thread select-based reactor.</TD>
         </TR>
@@ -431,7 +431,7 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
         <TR>
           <TD><CODE>tp</CODE></TD>
           <TD>Use the <CODE>ACE_TP_Reactor</CODE>, a select based
-              thread-pool reactor.</TD>
+	      thread-pool reactor.</TD>
         </TR>
       </TABLE>
 </TD>
@@ -439,10 +439,10 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
   <TR>
     <TD><CODE>-ORBReactorMaskSignals</CODE> <EM>0/1</EM></TD>
     <TD>ACE select reactors mask signals during upcalls to the event
-        handlers.  This is only useful if the application is going to
+	handlers.  This is only useful if the application is going to
         trap those signals and handle them in any way.
         Disabling the mask can improve performance by reducing the
-        number of kernel level locks.
+	number of kernel level locks.
     </TD>
   </TR>
 <TR>
@@ -458,25 +458,7 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
       <code>-ORBProtocolFactory Foo_Factory</code> in the service
       configurator file. The
       <em><code>Foo</code></em> pluggable protocol would then be available
-      for use.
-  </TD>
-</TR>
-<TR>
-  <TD><CODE>-ORBIORParser</CODE> <EM>parser</EM></TD>
-  <TD><a name="-ORBIORParser"></a>
-      Name an IOR Parser to load.
-      IOR Parsers are used to interpret strings passed to
-      <CODE>ORB::string_to_object()</CODE>.
-      By default the ORB can handle multiple string formats,
-      including <CODE>IOR:</CODE>,
-      <CODE>corbaloc:</CODE>,
-      <CODE>corbaname:</CODE>,
-      and <CODE>file:</CODE>.
-      The application developer can
-      <A HREF="ior_parsing.html">
-        add new IOR formats
-      </A>
-      using this option.
+      for use.		
   </TD>
 </TR>
 <TR>
@@ -500,31 +482,33 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
 <TR>
   <TD><CODE>-ORBConnectionCachingStrategy</CODE> <EM>type</EM></TD>
   <TD><a name="-ORBConnectionCachingStrategy"></a>
-      This option is not supported in the present beta.
+      Specify the strategy to use for caching and purging connections.
+      By default, TAO_CONNECTION_CACHING_STRATEGY is used which has
+      been set to Least Recently Used (LRU).
+      For example, for choosing the First In First Out option just add
+      <code>-ORBConnectionCachingStrategy fifo</code> to the service
+      configurator file.
   </TD>
 </TR>
 <TR>
   <TD><CODE>-ORBPurgePercentage</CODE> <EM>percent</EM></TD>
   <TD><a name="-ORBPurgePercentage"></a>
-      This option is not supported in the present beta.
+      Specify the number of connections to remove form the connection
+      cache during auto-purging. By default, TAO_PURGE_PERCENT is used
+      which has been set to 20.
+      For example, for choosing 75% just add
+      <code>-ORBPurgePercentage 75</code> to the service configurator
+      file.
   </TD>
 </TR>
 <TR>
   <TD><CODE>-ORBConnectionLock</CODE> <EM>locktype</EM></TD>
   <TD><a name="-ORBConnectionLock"></a>
-      This option deprecated. Usage of this option will switch usage
-      automatically to "-ORBConnectionCacheLock". Please see the
-      documentation of "-ORBConnectionCacheLock" for details.
-  </TD>
-</TR>
-<TR>
-  <TD><CODE>-ORBConnectionCacheLock</CODE> <EM>locktype</EM></TD>
-  <TD><a name="-ORBConnectionCacheLock"></a>
       Specify the type of lock to be used by the Connection
       Cache. Possible values for lock type are thread, which specifies
       that an inter-thread mutex is used to guarantee exclusive
       access, and null, which specifies that no locking be
-      performed. The default is thread.
+      performed. The default is thread. 
   </TD>
 </TR>
 <TR>
@@ -562,7 +546,7 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
       Select the type of reactor registry.
       Currently two implementations are provided:
       <B>single</B> uses a single reactor per ORB, this is the default
-            and is sufficient for most applications.
+	    and is sufficient for most applications.
       Applications with stringent QoS requirements may prefer
       the <B>per-priority</B> strategy, in this case threads at
       different CORBA priorities are assigned different
@@ -594,12 +578,12 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
         for a purely Reactor-driven concurrency strategy or
         <code>thread-per-connection</code> for creating a new thread to
         service each connection. The default is reactive.
-              <P>
-                TAO also supports the thread-pool concurrency model
-                but this is implemented by the user, creating multiple
-                threads that call <CODE>ORB::run()</CODE> and using
-                the <CODE>-ORBReactorType tp</CODE> option.
-              </P>
+	      <P>
+		TAO also supports the thread-pool concurrency model
+		but this is implemented by the user, creating multiple
+		threads that call <CODE>ORB::run()</CODE> and using
+		the <CODE>-ORBReactorType tp</CODE> option.
+	      </P>
     </TD>
   </TR>
   <TR>
@@ -607,33 +591,33 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
     <TD><a name="server_timeout"><CODE>-ORBThreadPerConnectionTimeout</CODE></a>
         <EM>milliseconds</EM></TD>
     <TD>In many platforms it is impossible to interrupt the server
-              threads created by the
-              <code>thread-per-connection</code> model.
-              This is because these threads are blocked in
-              <CODE>read()</CODE> operations (and not in
-              <CODE>select()</CODE>).
-              As a workaround, the server threads
-              periodically poll the ORB to find out if they should
-              shutdown.
-              This option controls the period of the polling,
-              expressed in milliseconds.
-              Applications that do not shutdown, or that can otherwise
-              ensure that no server threads will be running at
-              shutdown (for example if all the clients terminate
-              before the server) can disable the polling using  the
-              magic value <CODE>INFINITE</CODE>.
-
-              <P>
-                If the option is not provided then the ORB uses the
-                compile time flag
-                <CODE>TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT</CODE>,
-                this flag also expresses the time in milliseconds (as
-                a string constant) and the magic value
-                <CODE>"INFINITE"</CODE> can be used to disable polling
-                entirely. This yields a slight performance improvement
-                (around 1%).
-              </P>
-            </TD>
+	      threads created by the
+	      <code>thread-per-connection</code> model.
+	      This is because these threads are blocked in
+	      <CODE>read()</CODE> operations (and not in
+	      <CODE>select()</CODE>).
+	      As a workaround, the server threads
+	      periodically poll the ORB to find out if they should
+	      shutdown.
+	      This option controls the period of the polling,
+	      expressed in milliseconds.
+	      Applications that do not shutdown, or that can otherwise
+	      ensure that no server threads will be running at
+	      shutdown (for example if all the clients terminate
+	      before the server) can disable the polling using  the
+	      magic value <CODE>INFINITE</CODE>.
+
+	      <P>
+		If the option is not provided then the ORB uses the
+		compile time flag
+		<CODE>TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT</CODE>,
+		this flag also expresses the time in milliseconds (as
+		a string constant) and the magic value
+		<CODE>"INFINITE"</CODE> can be used to disable polling
+		entirely. This yields a slight performance improvement
+		(around 1%).
+	      </P>
+	    </TD>
   </TR>
   <TR>
     <TD><CODE>-ORBActiveObjectMapSize</CODE> <EM>active object map
@@ -837,8 +821,8 @@ superseded by <code><A HREF="#-ORBReactorType">-ORBReactorType</A></code>.
 
         MUXED means that Transport multiplexes more than one request at the
         same time on a connection.  This option is often used in
-        conjunction with Asynchronous Method Invocation, because
-        multiple requests can be sent 'in bulk'. <p>
+	conjunction with Asynchronous Method Invocation, because
+	multiple requests can be sent 'in bulk'. <p>
 
         Default for this option is EXCLUSIVE.
 
diff --git a/TAO/docs/TAO-metrics.html b/TAO/docs/TAO-metrics.html
index 51affd4e528..646f89c13e2 100644
--- a/TAO/docs/TAO-metrics.html
+++ b/TAO/docs/TAO-metrics.html
@@ -31,7 +31,7 @@ benchmarking of TAO.
 <LI> <A HREF="http://www.cs.wustl.edu/~schmidt/ami2.ps.gz">TAO's AMI performance</A>
 <LI> <A HREF="http://www.cs.wustl.edu/~schmidt/pluggable_protocols.ps.gz">TAO's
     pluggable protocols performance</A>
-<LI> <A HREF="../../docs/ACE-subsets.html">Subsetting of ACE and minimum TAO</A>
+<LI> <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/ACE-subsets.html">Subsetting of ACE and minimum TAO</A>
 <LI> Current and past performance and footprint metrics are available 
   from our <A HREF="http://doc.ece.uci.edu/Stats/">nightly builds
 </A>.
diff --git a/TAO/docs/TAO-tutorials.html b/TAO/docs/TAO-tutorials.html
index 74b70920c3c..3934566ac7b 100644
--- a/TAO/docs/TAO-tutorials.html
+++ b/TAO/docs/TAO-tutorials.html
@@ -15,7 +15,7 @@
           <DL>
           <DL>
 <DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> <A
-HREF="tutorials/Quoter/">Quoter
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/tutorials/Quoter/">Quoter
     tutorial</A> <P>
 
 <DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> This
@@ -35,13 +35,15 @@ Developer's Guide</A> available from <A
 HREF="http://www.theaceorb.com/">OCI</A>. <P>
 
             <DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"> 
-              <A  HREF="tutorials/new-tutorials.html">Developing new
+              <A  HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/tutorials/new-tutorials.html">Developing new
                 tutorials</A> <P>
 
           </DL>
 
     <HR><P>
-      Back to the <A HREF="index.html">TAO documents</A> page.
+      Back to the <A
+        HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/">TAO
+        documents</A> page.
 
       <!--#include virtual="/~schmidt/cgi-sig.html" -->
   </BODY>
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 8dafa3143d2..f7146680cb7 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -10,7 +10,7 @@
 
 <hr>
 <h3>
-TAO IDL Compiler User's Guide</h3>
+TAO IDL compiler User's Guide</h3>
 
 <h3> Scope</h3> This document describes the options and features of
 TAO IDL compiler.  It is not a reference manual or tutorial on OMG
diff --git a/TAO/docs/components.html b/TAO/docs/components.html
index 59f95be0468..c24b6622cdd 100644
--- a/TAO/docs/components.html
+++ b/TAO/docs/components.html
@@ -29,9 +29,11 @@ bgcolor="#ffffff">
       all request in one thread, each request in a separate thread, or each connection
       in a separate thread, <em>etc.</em><P>
 
-      <LI> Mapping of all <A HREF="../">TAO files</A>
-      into a manageable set of <A HREF="../TAO-inheritance.ps.gz">inheritance
-      hierarchies</A>. <P>
+      <LI> Mapping of all <A
+      HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/">TAO files</A>
+      into a manageable set of <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/TAO-inheritance.ps.gz">inheritance
+hierarchies</A>. <P>
     </UL>
   </BODY>
 
diff --git a/TAO/docs/events_tutorial.html b/TAO/docs/events_tutorial.html
index c8e3a3561d2..20097005bea 100644
--- a/TAO/docs/events_tutorial.html
+++ b/TAO/docs/events_tutorial.html
@@ -628,7 +628,7 @@ defaults to 1.
 <tr><td>
 The following code is derived from the EC_Throughput consumer code, which can be 
 found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a>
 
 <tr><td>
@@ -711,7 +711,7 @@ Test_Consumer::connect (const char* name,
 <tr><td>
 The following code is derived from the EC_Throughput consumer driver code, which
 can be found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp</a>
 
 <tr><td>
@@ -858,7 +858,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 <tr><td>
 The following code is derived from the EC_Throughput consumer code, which
 can be found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a>
 
 <tr><td>
@@ -924,7 +924,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 <tr><td>
 The following code is derived from the EC_Throughput consumer code, which can be 
 found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp</a>
 
 <tr><td>
@@ -1087,7 +1087,7 @@ server.
 <tr><td>
 The following code is derived from the EC_Throughput supplier code, which
 can be found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a>
 
 
@@ -1201,7 +1201,7 @@ Test_Supplier::connect (const char* name,
 <tr><td>
 The following code is derived from the EC_Throughput supplier driver code, which
 can be found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp</a>
 
 <tr><td>
@@ -1352,7 +1352,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 <tr><td>
 The following code is derived from the EC_Throughput supplier code, which
 can be found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a>
 
 <tr><td>
@@ -1456,7 +1456,7 @@ Test_Supplier::svc ()
 <tr><td>
 The following code is derived from the EC_Throughput supplier code, which
 can be found in TAO in the file: 
-<A HREF="../orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp">
 $TAO_ROOT/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp</a>
 
 
@@ -1523,7 +1523,7 @@ Test_Supplier::disconnect (CORBA::Environment &_env)
 <tr><td>
 The following code is derived from the Event_Service executable, which can be
 found in TAO in the file: 
-<A HREF="../orbsvcs/Event_Service/Event_Service.cpp">
+<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/Event_Service/Event_Service.cpp">
 $TAO_ROOT/orbsvcs/Event_Service/Event_Service.cpp</a>
 
 <tr><td>
@@ -1719,38 +1719,38 @@ int main (int argc, char *argv[])
 
 <tr><td> 
 A number of sample applications are available in the directories under 
-<a href="../orbsvcs/tests/">
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/">
 TAO's ORB Services tests</a>.
 
 <tr><td>
 In particular, much of the code shown in this tutorial was drawn from the
-<a href="../orbsvcs/tests/EC_Throughput/"> 
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Throughput/"> 
 EC_Throughput</a> test.  This test exercises the Event Service and measures its
 throughput capabilities.
 
 <tr><td>
 A similar test,
-<a href="../orbsvcs/tests/Event_Latency/"> 
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/Event_Latency/"> 
 Event_Latency</a>, measures the latency of events through the Event Service.
 
 <tr><td>
 The
-<a href="../orbsvcs/tests/EC_Basic/"> 
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Basic/"> 
 EC_Basic</a> test demonstrates the basic use the Event Service.
 
 <tr><td>
 The
-<a href="../orbsvcs/tests/EC_Multiple/"> 
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/tests/EC_Multiple/"> 
 EC_Multiple</a> test shows a number of ways to connect multiple Event Channels.
 
 
 <tr><td>
 For the IDL source for the various interfaces, please see
-<a href="../orbsvcs/orbsvcs/RtecScheduler.idl">RtecScheduler.idl</a>,
-<a href="../orbsvcs/orbsvcs/CosEventChannelAdmin.idl">CosEventChannelAdmin.idl</a>,
-<a href="../orbsvcs/orbsvcs/CosEventComm.idl">CosEventComm.idl</a>
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/RtecScheduler.idl">RtecScheduler.idl</a>,
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl">CosEventChannelAdmin.idl</a>,
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/CosEventComm.idl">CosEventComm.idl</a>
 and
-<a href="../orbsvcs/orbsvcs/CosNaming.idl">CosNaming.idl</a>.
+<a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/orbsvcs/orbsvcs/CosNaming.idl">CosNaming.idl</a>.
 
 
 </table>
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index 47c768ffbaa..337fe854ab0 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -20,23 +20,23 @@ HREF="http://www.omg.org/library/c2indx.html">CORBA</a> Documentation</h3>
       <dt>TAO <a HREF="http://www.cs.wustl.edu/~schmidt/corba-research-realtime.html">Technical
         Papers</a> </dt><P>
       <dt>TAO <a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">Tutorials</a></dt><P>
-      <dt>TAO <a HREF="releasenotes/index.html">Release Notes</a> </dt><P>
+      <dt>TAO <a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/index.html">Release Notes</a> </dt><P>
       <dt><A HREF="http://www.theaceorb.com">OCI</A> TAO <a HREF="http://www.theaceorb.com/faq/">FAQ</a> </dt><P>
-      <dt><a HREF="components.html">ORB Configuration Options</a> </dt><P>
-      <dt>TAO <a HREF="compiler.html">IDL Compiler Options</a> </dt><P>
-      <dt><a HREF="orbsvcs.html">ORB Services Directories</a> </dt><P>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/components.html">ORB Configuration Options</a> </dt><P>
+      <dt>TAO <a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/compiler.html">IDL Compiler Options</a> </dt><P>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/orbsvcs.html">ORB Services Directories</a> </dt><P>
     </dl>
     </td>
 
     <td><font SIZE="+1"><dl>
-      <dt>TAO <a href="rtcorba/index.html">Real-Time CORBA</a> </dt>
+      <dt>TAO <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/rtcorba/index.html">Real-Time CORBA</a> </dt>
       <dt>&nbsp; </dt>
-      <dt><a HREF="INS.html">Interoperable Naming Service</a> </dt><P>
-      <dt><a HREF="implrepo/index.html">Implementation Repository</a> </dt><P>
-      <dt>ACE+TAO <a HREF="minimumTAO.html">Subsetting</a></dt><p>
-      <dt>TAO <a href="exceptions.html">Exception Handling</a></dt><p>
-      <dt><a HREF="Tags.html">Tags and Magic Numbers</a> </dt><P>
-      <dt><a HREF="pluggable_protocols/index.html">Writing Pluggable Protocols</a> </dt><P>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/INS.html">Interoperable Naming Service</a> </dt><P>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/implrepo/">Implementation Repository</a> </dt><P>
+      <dt>ACE+TAO <a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/minimumTAO.html">Subsetting</a></dt><p>
+      <dt>TAO <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/exceptions.html">Exception Handling</a></dt><p>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/Tags.html">Tags and Magic Numbers</a> </dt><P>
+      <dt><a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/pluggable_protocols/index.html">Writing Pluggable Protocols</a> </dt><P>
     </dl>
       </font>
     </td>
diff --git a/TAO/docs/interceptors.html b/TAO/docs/interceptors.html
index 05f52723cfb..18348877633 100644
--- a/TAO/docs/interceptors.html
+++ b/TAO/docs/interceptors.html
@@ -339,23 +339,14 @@ module PortableInterceptor
       mechanism since they can't be stringified and registered via
       <CODE>-ORBInitRef</CODE> ORB option.
   <li>Basically, all <CODE>ORBInitInfo</CODE> methods have been
-      implemented except <CODE>allocate_slot_id</CODE>.
+      implemented except <CODE>allocate_slot_id</CODE> and
+      <CODE>codec_factory</CODE>.
   <li>Implemented most of the remaining
       <CODE>ClientRequestInfo</CODE>, <CODE>ServerRequestInfo</CODE>
       and <CODE>IORInfo</CODE> methods.
   <li>Added support for the
       <CODE>PortableInterceptor::ForwardRequest</CODE>
       exception on both the client and server sides.
-  <li>Implemented the <CODE>IOP::CodecFactory</CODE> and the CDR
-      encapsulation <CODE>IOP::Codec</CODE> objects.  The CDR
-      encapsulation <CODE>Codec</CODE> is useful for embedding data in
-      an <CODE>octet</CODE> sequence that conforms to the CDR
-      encapsulation rules.  For example, it could be used to marshal
-      data into the <CODE>octet</CODE> sequence that is part of an
-      <CODE>IOP::ServiceContext</CODE> or an
-      <CODE>IOP::TaggedComponent</CODE>.  This means that it could
-      compliment the IOR interceptor support, and the service context
-      manipulation support found in request interceptors.
 </ul>
 
 <hr><P>
@@ -367,6 +358,15 @@ module PortableInterceptor
       chain.
   <li>Implement the <CODE>PortableInterceptor::Current</CODE>
       interface.  Useful for passing data between interceptors.
+  <li>Implement the <CODE>CodecFactory</CODE> interface, and an
+      accompanying CDR encapsulation <CODE>Codec</CODE>.
+      Implementations of each are almost ready and should be available
+      soon.  The CDR encapsulation <CODE>Codec</CODE> is useful for
+      embedding data in an <CODE>octet</CODE> sequence that conforms
+      to the CDR encapsulation rules.  For example, it could be used
+      to create the <CODE>octet</CODE> sequence that is part of an
+      <CODE>IOP::TaggedComponent</CODE>.  This means that it could
+      compliment the IOR interceptor support.
   <li>The <CODE>send_poll</CODE> request interception point
       implementation will most likely be deferred until TII is
       supported in TAO.
@@ -385,10 +385,12 @@ module PortableInterceptor
 <hr><P>
 <H3><a name="ref">References</a></H3>
 <UL>
-  <LI><A
-HREF="ftp://ftp.omg.org/pub/docs/ptc/00-04-05.pdf">ptc/2000-04-05</A>
-Portable Interceptors -- final published draft</LI>
-
+  <LI><p><a href="ftp://ftp.omg.org/pub/docs/orbos/99-12-02.pdf">
+      99-12-02</a> Portable Interceptors -- Joint Revised
+      Submission.</p>
+  <LI><p><a href="ftp://ftp.omg.org/pub/docs/orbos/99-12-14.zip">
+      99-12-14</a> Portable Interceptors related IDL files (in zip
+      format.) </p>
 </UL>
 <hr>
 
diff --git a/TAO/docs/ior_parsing.html b/TAO/docs/ior_parsing.html
deleted file mode 100644
index 9f51a690fe0..00000000000
--- a/TAO/docs/ior_parsing.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <head>
-    <!-- $Id$ -->
-    <title>Adding new IOR Parsers to TAO</title>
-  </head>
-
-  <body text="#000000" link="#0000ff" vlink="#cc0000" bgcolor="#ffffff">
-
-    <CENTER>
-      <H1>Introduction</H2>
-    </CENTER>
-
-    <h4>What is an IOR Parser?</h4>
-
-    <P>TAO supports several IOR formats, including
-      <CODE>IOR:</CODE>, <CODE>corbaloc:</CODE>,
-      <CODE>corbaname:</CODE> and <CODE>file:</CODE>.
-      However, some applications may benefit from other formats, for
-      example, <CODE>http:</CODE> could allow applications to download
-      an object reference from a web server.
-    </P>
-    <P>Adding new IOR formats to the ORB is a simple task, the ORB
-      takes advantage ACE's
-      <A HREF="http://www.cs.wustl.edu/~schmidt/DSEJ-94.ps.gz">
-        Service Configurator
-      </A>
-      to dynamically load new <EM>IOR Parsers</EM>.
-      The implementation of <CODE>string_to_object()</CODE> queries
-      each available IOR Parser to convert an string into an object
-      reference.
-      Application developers can implement their own parsers and
-      dynamically (or statically) add them to the ORB, without any
-      need to recompile TAO.
-    </P>
-
-    <H4>Why aren't the IOR parsers in TAO enough?</H4>
-
-    <P>TAO provides a basic set of IOR parsers,
-      but it would be detrimental to TAO's footprint to implement a
-      huge collection of IOR parsers into the ORB.
-      Moreover, the DOC group does not have the ability to create all
-      possible IOR parsers: many applications will use proprietary
-      databases to configure the ORB.
-    <P>
-
-    <H4>Why should I use an IOR parser?</H4>
-
-    <P>Using an IOR parser is more convenient than, say,
-      setting up the ad-hoc configuration code in
-      <CODE>main()</CODE>.
-      It also allows for easier integration with other TAO components,
-      such as the <CODE>-ORBInitRef</CODE> options.
-    </P>
-
-    <HR>
-
-    <CENTER>
-      <H1>Implementation</H2>
-    </CENTER>
-
-    <H1>How do you Implement an IOR Parser?</H1>
-
-    <P>Implementing an IOR parser is easy,
-      you must implement a class derived from
-      <CODE>TAO_IOR_Parser</CODE>.
-      As an example we will develop an HTTP IOR parser,
-      the class declaration will probably look like this:
-<PRE>
-class HTTP_Parser : public TAO_IOR_Parser
-{
-public:
-  virtual int match_prefix (const char *ior_string) const;
-  virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb,
-                                          CORBA::Environment &)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-};
-</PRE>
-      For maximal portability this class uses the alternative mapping
-      for exception handling, if you are not familiar with the
-      alternative mapping you can safely ignore the
-      <CODE>CORBA::Environment</CODE> argument.
-      Please read the exception handling
-      <A HREF="exceptions.html">
-        documentation
-      </A>
-      for more details.
-    </P>
-
-    <UL>
-      <LI><B>match_prefix</B> This method must recognize all the IOR
-        prefixes that this parser supports.  Normally this is a single
-        prefix, a typical implementation will look like this:
-<PRE>
-int
-HTTP_Parser::match_prefix (const char *ior_string) const
-{
-  static char http_prefix[] = "http:";
-  int cmp = ACE_OS::strncmp (ior_string, http_prefix, sizeof(http_prefix));
-  return (cmp == 0);
-}
-</PRE>
-      </LI>
-      <LI><B>parse_string</B> This method implements the real string
-        parsing, you can safely assume that the string has been
-        validated by the <CODE>match_prefix()</CODE> method.
-        Typically, this method will obtain the IOR string, in our
-        example by downloading the document from the web server,
-        and then uses <CODE>string_to_object()</CODE> to return the
-        object reference:
-<PRE>
-CORBA::Object_ptr
-HTTP_Parser::parse_string (const char *ior,
-                           CORBA::ORB_ptr orb,
-                           CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Parse IOR as if it was an http:-URL
-  ACE_URL_Addr *url_addr =
-    ACE_URL_Addr::create_addr (ior);
-
-  ACE_HTTP_Addr *http_addr =
-    ACE_dynamic_cast(ACE_HTTP_Addr*,url_addr);
-
-  // Connect to the remote host and download the web page, store the
-  // contents in:
-  char *document_contents = ...;
-
-  return orb->string_to_object (document_contents, ACE_TRY_ENV);
-}
-</PRE>
-      </LI>
-    </UL>
-
-    <H4>How do you add an IOR Parser to the ORB?</H4>
-
-    <P>As we mentioned above, TAO uses the ACE Service Configurator
-      framework to find (dynamically or statically) the IOR parsers.
-      You may want to read the
-      <A HREF="../../docs/tutorials/022/page01.html">
-        ACE tutorial
-      </A>
-      on this subject, but the process is mostly mechanic, and
-      described here.
-    </P>
-    <P>First you must declare, in the header file, a factory method
-      and a description of the service,
-      this is easily accomplished via the following ACE macros:
-<PRE>
-ACE_FACTORY_DECLARE (Export_Prefix, HTTP_Parser)
-ACE_STATIC_SVC_DELCARE_EXPORT (Export_Prefix, HTTP_Parser)
-</PRE>
-      If you are only going to use Unix-like compilers and linkers,
-      then you can simply use <CODE>TAO</CODE> in place of
-      <CODE>Export_Prefix</CODE>.
-      However, under Microsoft Windows variants, this string must be
-      the prefix of the DLL export/import macros used by your library.
-      If you are going to statically link your IOR Parser into the
-      application you will also need to add
-      <CODE>ACE_STATIC_SVC_REQUIRE</CODE>, as follows:
-<PRE>
-ACE_FACTORY_DECLARE (Export_Prefix, HTTP_Parser)
-ACE_STATIC_SVC_DELCARE_EXPORT (Export_Prefix, HTTP_Parser)
-ACE_STATIC_SVC_REQUIRE (HTTP_Parser)
-</PRE>
-    </P>
-
-    <P>Next you must implement the services defined above, using some
-      other group of helper macros, in your source file you should
-      add:
-<PRE>
-ACE_STATIC_SVC_DEFINE (HTTP_Parser,
-                       ACE_TEXT ("HTTP_Parser"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (HTTP_Parser),
-                       ACE_Service_Type::DELETE_THIS |
-                       ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (Export_Prefix, HTTP_Parser)
-</PRE>
-      The second argument to <CODE>ACE_STATIC_SVC_DEFINE</CODE> is
-      the name of the service in ACE's Service Configurator.
-      It is customary, but not required, to use the name of the class.
-    </P>
-
-    <P>Finally you can dynamically add your IOR parser to the ORB
-      using the <CODE>-ORBIORParser</CODE> option in the
-      Resource Factory
-      (see
-      <A HREF="Options.html">
-        Options for TAO Components
-      </A>
-      for details about ORB and Resource Factory options),
-      for example:
-<PRE>
-# svc.conf file
-static Resource_Factory "-ORBIORPaser HTTP_Parser"
-</PRE>
-      would add our new parser to the ORB.
-    </P>
-<PRE>
-
-</PRE>
-    </P>
-
-    <H4>Are there any complete examples?</H4>
-
-    <P>Yes, the IOR parsers in the ORB can serve as complete examples,
-      please check:
-      <CODE>FILE_Parser.h</CODE>,
-      <CODE>CORBALOC_Parser.h</CODE>,
-      <CODE>CORBANAME_Parser.h</CODE>,
-      or <CODE>DLL_Parser.h</CODE>.
-      Unfortunately there are no examples that show how to dynamically
-      add a new IOR parser into the ORB.
-    </P>
-
-    <hr>
-    <address><a href="mailto:coryan@uci.edu">Carlos O'Ryan</a></address>
-<!-- Created: Tue Feb 20 08:42:57 PST 2001 -->
-<!-- hhmts start -->
-Last modified: Tue Feb 20 16:32:13 PST 2001
-<!-- hhmts end -->
-  </body>
-</html>
diff --git a/TAO/docs/minimumTAO.html b/TAO/docs/minimumTAO.html
index e2a33b88125..6603055f8b4 100644
--- a/TAO/docs/minimumTAO.html
+++ b/TAO/docs/minimumTAO.html
@@ -18,7 +18,7 @@
 <p>
 
 In addition to our work on <A
-HREF="../../docs/ACE-subsets.html">ACE
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/ACE-subsets.html">ACE
 subsetting</A>, we have also been reducing the footprint of TAO.  We
 are pursuing two complementary strategies to reduce TAO's footprint:
 
@@ -49,11 +49,12 @@ specification. <P>
 
 The implicit subsetting of TAO requires no explicit application
 programmer intervention.  In contrast, to minimize the footprint of
-TAO explicitly, you must first <a href="../../ACE-INSTALL.html">configure</a>
+TAO explicitly, you must first <a href=
+"http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">configure</a>
 ACE to support only those <a href =
-"../../docs/ACE-subsets.html">components</a>
+"http://www.cs.wustl.edu/~schmidt/ACE_wrappers/docs/ACE-subsets.html">components</a>
 that are required by TAO. Second, you must <a href =
-"../TAO-INSTALL.html">configure</a>
+"http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/TAO-INSTALL.html">configure</a>
 TAO to only support the components specified by the
 <em>minimumCORBA</em> specification.  The following two tables show
 the footprint reduction achievable via explicit subsetting.  Note that
@@ -67,7 +68,7 @@ Note: All measurement are for ACE 5.0 and TAO 1.0 using egcs-2.91.60
 on SunOS5.7<P>
 
 The <a
-href="../../ACE-INSTALL.html#flags">make
+href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html#flags">make
 flags</a> options used were: <P>
 
 <code> debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0 </code> <P>
@@ -84,7 +85,7 @@ These options translate into:<P>
 To build a TAO static library, if shared libraries are the default,
 use <code>make static_libs_only=1</code> (make sure to do this for
 ACE, as well).  If you're using recent versions of GNU GCC, you can
-use the <A HREF="../../ACE-INSTALL.html#repo">-frepo</A> option, which
+use the <A HREF="../ACE-INSTALL.html#repo">-frepo</A> option, which
 typically reduces the footprint by another 25 percent. <P>
 
 <p><hr width=50% align=left> <p>
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html
index 296f9f58252..7b5e59448ac 100644
--- a/TAO/docs/orbsvcs.html
+++ b/TAO/docs/orbsvcs.html
@@ -66,41 +66,39 @@ bgcolor="#ffffff">
       CELLSPACING="2"
       CELLPADDING= "0">
       <TR>
-        <TH>Service</TH>
-        <TH>Implementation Sub-directory</TH></TR>
+	<TH>Service</TH>
+	<TH>Implementation Sub-directory</TH></TR>
       <TR>
-        <TD>A/V Streams Service</TD><TD><CODE>orbsvcs/AV</CODE></TD></TR>
+	<TD>A/V Streams Service</TD><TD><CODE>orbsvcs/AV</CODE></TD></TR>
       <TR>
-        <TD>Concurrency Service</TD><TD><CODE>orbsvcs/Concurrency</CODE></TD></TR>
+	<TD>Concurrency Service</TD><TD><CODE>orbsvcs/Concurrency</CODE></TD></TR>
       <TR>
-        <TD>Event Service</TD><TD><CODE>orbsvcs/CosEvent</CODE></TD></TR>
+	<TD>Event Service</TD><TD><CODE>orbsvcs/CosEvent</CODE></TD></TR>
       <TR>
-        <TD>Real-time Event Service</TD><TD><CODE>orbsvcs/Event</CODE></TD></TR>
+	<TD>Real-time Event Service</TD><TD><CODE>orbsvcs/Event</CODE></TD></TR>
       <TR>
-        <TD>LifeCycle Service</TD><TD><CODE>orbsvcs/LifeCycle</CODE></TD></TR>
+	<TD>LifeCycle Service</TD><TD><CODE>orbsvcs/LifeCycle</CODE></TD></TR>
       <TR>
         <TD>Load Balancing Service</TD>
           <TD><CODE>orbsvcs/LoadBalancing</CODE></TD></TR>
       <TR>
-        <TD>Logging Service</TD><TD><CODE>orbsvcs/Log</CODE></TD></TR>
+	<TD>Logging Service</TD><TD><CODE>orbsvcs/Log</CODE></TD></TR>
       <TR>
-        <TD>Naming Service</TD><TD><CODE>orbsvcs/Naming</CODE></TD></TR>
+	<TD>Naming Service</TD><TD><CODE>orbsvcs/Naming</CODE></TD></TR>
       <TR>
-        <TD>Property Service</TD><TD><CODE>orbsvcs/Property</CODE></TD></TR>
+	<TD>Property Service</TD><TD><CODE>orbsvcs/Property</CODE></TD></TR>
       <TR>
-        <TD>Scheduling Service</TD><TD><CODE>orbsvcs/Sched</CODE></TD></TR>
+	<TD>Scheduling Service</TD><TD><CODE>orbsvcs/Sched</CODE></TD></TR>
       <TR>
-        <TD>Security Service</TD>
+	<TD>Security Service</TD>
           <TD><CODE>orbsvcs/Security</CODE></TD></TR>
       <TR>
         <TD>SSLIOP Pluggable Protocol</TD>
           <TD><CODE>orbsvcs/SSLIOP</CODE></TD></TR>
       <TR>
-        <TD>Trading Service</TD><TD><CODE>orbsvcs/Trader</CODE></TD></TR>
+	<TD>Trading Service</TD><TD><CODE>orbsvcs/Trader</CODE></TD></TR>
       <TR>
-        <TD>Time Service</TD><TD><CODE>orbsvcs/Time</CODE></TD></TR>
-      <TR>
-        <TD>Notification Service</TD><TD><CODE>orbsvcs/Notify</CODE></TD></TR>
+	<TD>Time Service</TD><TD><CODE>orbsvcs/Time</CODE></TD></TR>
   </TABLE>
     </P>
 
@@ -125,7 +123,6 @@ bgcolor="#ffffff">
       <LI>Trading_Service</LI>
       <LI>Time_Service</LI>
       <LI>ImplRepo_Service *(see below)*</LI>
-      <LI>Notify_Service</LI>
     </UL>
 
     <P>In the future we plan to use a single binary and ACE Service
@@ -150,24 +147,24 @@ bgcolor="#ffffff">
       CELLSPACING="2"
       CELLPADDING= "0">
       <TR>
-        <TH>Test directory</TH>
-        <TH>Purpose</TH></TR>
+	<TH>Test directory</TH>
+	<TH>Purpose</TH></TR>
       <TR>
-        <TD><CODE>AVStreams</CODE></TD>
-        <TD>A complete A/V server and client.</TD></TR>
+	<TD><CODE>AVStreams</CODE></TD>
+	<TD>A complete A/V server and client.</TD></TR>
       <TR>
-        <TD><CODE>Concurrency</CODE></TD>
-        <TD>Test the Concurrency Service.</TD></TR>
+	<TD><CODE>Concurrency</CODE></TD>
+	<TD>Test the Concurrency Service.</TD></TR>
 
       <TR>
-        <TD><CODE>CosEC_Basic</CODE></TD>
+	<TD><CODE>CosEC_Basic</CODE></TD>
           <TD>Test the basic functionality of the standard Event
             Service.
           </TD>
         </TR>
 
       <TR>
-        <TD><CODE>CosEC_Multiple</CODE></TD>
+	<TD><CODE>CosEC_Multiple</CODE></TD>
           <TD>Simple example that connects multiple consumers and/or
             suppliers to the standard event service. It can be used to
             show how composing a standard event-service and the
@@ -176,45 +173,45 @@ bgcolor="#ffffff">
         </TR>
 
       <TR>
-        <TD><CODE>EC_Basic</CODE></TD>
+	<TD><CODE>EC_Basic</CODE></TD>
           <TD>Test the basic functionality of the real-time Event
             Service.
           </TD>
         </TR>
 
       <TR>
-        <TD><CODE>EC_Custom_Marshal</CODE></TD>
+	<TD><CODE>EC_Custom_Marshal</CODE></TD>
           <TD>Show how the Real-time event service can send user
             defined data using custom marshaling.
           </TD>
         </TR>
 
       <TR>
-        <TD><CODE>EC_Mcast</CODE></TD>
+	<TD><CODE>EC_Mcast</CODE></TD>
           <TD>Multiple real-time event channels can communicate using
             multicast, this example shows how to do it.
           </TD>
         </TR>
 
       <TR>
-        <TD><CODE>EC_Multiple</CODE></TD>
-        <TD>Connect two Real-time Event Channels using the
-          <CODE>EC_Gateway</CODE>,
-          measure latency, utilization and minimum spacing.
+	<TD><CODE>EC_Multiple</CODE></TD>
+	<TD>Connect two Real-time Event Channels using the
+	  <CODE>EC_Gateway</CODE>,
+	  measure latency, utilization and minimum spacing.
           </TD>
         </TR>
 
       <TR>
-        <TD><CODE>EC_Throughput</CODE></TD>
-        <TD>Measure throughput and latency for collocated and remote
+	<TD><CODE>EC_Throughput</CODE></TD>
+	<TD>Measure throughput and latency for collocated and remote
             real-time event services.
           </TD>
         </TR>
 
       <TR>
-        <TD><CODE>Event_Latency</CODE></TD>
-        <TD>Test the Real-time Event Service and measure end-to-end latency,
-        it also uses the Scheduling and Naming services.</TD></TR>
+	<TD><CODE>Event_Latency</CODE></TD>
+	<TD>Test the Real-time Event Service and measure end-to-end latency,
+	it also uses the Scheduling and Naming services.</TD></TR>
 
       <TR>
         <TD><CODE>ImplRepo</CODE></TD>
@@ -226,19 +223,19 @@ bgcolor="#ffffff">
         <TD>Test that exercises the Load Balancing service.</TD></TR>
 
       <TR>
-        <TD><CODE>Logger</CODE></TD>
-        <TD>An example logging service using the Naming Service to
-          locate a factory.</TD></TR>
+	<TD><CODE>Logger</CODE></TD>
+	<TD>An example logging service using the Naming Service to
+	  locate a factory.</TD></TR>
       <TR>
-        <TD><CODE>Naming</CODE></TD>
-        <TD>This is an obsolete directory.</TD></TR>
+	<TD><CODE>Naming</CODE></TD>
+	<TD>This is an obsolete directory.</TD></TR>
       <TR>
-        <TD><CODE>Property</CODE></TD>
-        <TD>Testing for the Property Service.</TD></TR>
+	<TD><CODE>Property</CODE></TD>
+	<TD>Testing for the Property Service.</TD></TR>
 
       <TR>
-        <TD><CODE>Sched</CODE></TD>
-        <TD>A test of the Scheduling Service.</TD></TR>
+	<TD><CODE>Sched</CODE></TD>
+	<TD>A test of the Scheduling Service.</TD></TR>
 
       <TR>
         <TD><CODE>Security</CODE></TD>
@@ -248,30 +245,20 @@ bgcolor="#ffffff">
             directory.</TD></TR>
 
       <TR>
-        <TD><CODE>Simple_Naming</CODE></TD>
-        <TD>A number of Naming Service tests: from very simple to more fancy.</TD></TR>
+	<TD><CODE>Simple_Naming</CODE></TD>
+	<TD>A number of Naming Service tests: from very simple to more fancy.</TD></TR>
       <TR>
-        <TD><CODE>Simulator</CODE></TD>
-        <TD>Prototype implementation of DOVE (DOVE Agent, DOVE
+	<TD><CODE>Simulator</CODE></TD>
+	<TD>Prototype implementation of DOVE (DOVE Agent, DOVE
             Browser, DOVE MIB, DOVE Application).  The DOVE Agent
             consists of the Event Channel, which is then connected to
             a DOVE Browser implemented in Java.</TD></TR>
       <TR>
-        <TD><CODE>Trading</CODE></TD>
-        <TD>Tests for the Trading Service.</TD></TR>
-      <TR>
-        <TD><CODE>Time</CODE></TD>
-        <TD> A test for the Time Service.</TD></TR>
-       <TR>
-        <TD><CODE>Notify</CODE></TD>
-        <TD>
-            Consists of basic tests foe the Notification Service
-            - Simple event transfer,
-            client Connect-Disconnect to event channel, creating and
-            destroying channel/admin objects,test for Admin
-            properties, test to check offer/subscription changes.
-            The directory also has performance tests for throughput.
-        </TD></TR>
+	<TD><CODE>Trading</CODE></TD>
+	<TD>Tests for the Trading Service.</TD></TR>
+      <TR>
+	<TD><CODE>Time</CODE></TD>
+	<TD> A test for the Time Service.</TD></TR>
     </TABLE>
     </P>
 
diff --git a/TAO/docs/pluggable_protocols/index.html b/TAO/docs/pluggable_protocols/index.html
index 5183202f4e1..640124c4274 100644
--- a/TAO/docs/pluggable_protocols/index.html
+++ b/TAO/docs/pluggable_protocols/index.html
@@ -57,7 +57,7 @@ applications.  This document explains how to develop pluggable
 protocols using TAO's pluggable protocols framework.  Here are some
 links that describe TAO's pluggable protocols framework, though not
 how to implement one: <BLOCKQUOTE> <A
-HREF="../releasenotes/index.html#pp">../releasenotes/index.html#pp</A><BR>
+HREF="../releasenotes/index.html#pp">http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/index.html#pp</A><BR>
 
 <A HREF="http://www.cs.wustl.edu/~schmidt/PfHSN.ps.gz">http://www.cs.wustl.edu/~schmidt/PfHSN.ps.gz</A><BR>
 <A
@@ -374,7 +374,7 @@ object, hiding the transport- and strategy-specific details of the acceptor.
 
 <P>
 TAO's <TT>Acceptor</TT> interface, shown below, is declared in the  file
-<TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
+<TT>&lt;<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
 All <TT>Acceptor</TT> implementations must inherit from the <TT>TAO_Acceptor</TT>
 abstract base class.
 
@@ -969,7 +969,7 @@ object and to the <TT>Transport</TT> objects that were created.
 </H3>
 
 <P>
-TAO's <TT>Connector</TT> interface, shown below, is declared in the file <TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
+TAO's <TT>Connector</TT> interface, shown below, is declared in the file <TT>&lt;<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
 All <TT>Connector</TT> implementations must inherit from the <TT>TAO_Connector</TT>
 abstract base class.
 
@@ -1373,7 +1373,7 @@ definitions.
 All protocol-specific <TT>Profile</TT> implementations should inherit from the
 <TT>TAO_Profile</TT> abstract base class. The <TT>TAO_Profile</TT> interface
 is declared in the file
-<TT>&lt;<A HREF="../../tao/Profile.h">tao/Profile.h&gt;</A></TT>.
+<TT>&lt;<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Profile.h">tao/Profile.h&gt;</A></TT>.
 Its interface follows. Only the methods that must be implemented are shown:
 
 
@@ -1714,7 +1714,7 @@ an <TT>Acceptor</TT> on the server-side, and a <TT>Connector</TT> on the client-
 <P>
 All <TT>Protocol_Factory</TT> implementations should be derived from the <TT>TAO_Protocol_Factory</TT>
 abstract base class defined in
-<TT>&lt;<A HREF="../../tao/Protocol_Factory.h">tao/Protocol_Factory.h</A>&gt;</TT>.
+<TT>&lt;<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Protocol_Factory.h">tao/Protocol_Factory.h</A>&gt;</TT>.
 The <TT>TAO_Protocol_Factory</TT> interface is shown below:
 
 <P>
@@ -2199,7 +2199,7 @@ class.
 
 <P>
 All TAO pluggable protocol <TT>Transport</TT> classes must inherit from the
-<TT>TAO_Transport</TT> abstract base class defined in <TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
+<TT>TAO_Transport</TT> abstract base class defined in <TT>&lt;<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
 The <TT>TAO_Transport</TT> interface is shown below. Again, only the methods
 that should be implemented for a given pluggable protocol are shown:
 
@@ -2520,16 +2520,16 @@ subclass.
 TAO pluggable transport protocol <TT>Connection_Handler</TT>s should
 be derived from the <TT>ACE_Svc_Handler</TT> class declared in
 &lt;<A
-      HREF="../../../ace/Svc_Handler.h"><TT>ace/Svc_Handler.h</TT></A>&gt;.  TAO's existing pluggable transport protocol
+      HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace/Svc_Handler.h"><TT>ace/Svc_Handler.h</TT></A>&gt;.  TAO's existing pluggable transport protocol
 implementations define three classes, a base class derived from an
 <TT>ACE_Svc_Handler</TT> specific to that protocol, and a client-side
 and a server-side class derived from that base class.  Generally, it
 is a good idea to base new <TT>Connection_Handler</TT> implementations
 on TAO's existing ones.  The interfaces for the existing
 <TT>Connection_Handler</TT>s are defined in
-&lt;<A HREF="../../tao/IIOP_Connect.h"><TT>tao/IIOP_Connect.h</TT></A>&gt;
+&lt;<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/IIOP_Connect.h"><TT>tao/IIOP_Connect.h</TT></A>&gt;
 and
-&lt;<A HREF="../../tao/UIOP_Connect.h"><TT>tao/UIOP_Connect.h</TT></A>&gt;.
+&lt;<A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/UIOP_Connect.h"><TT>tao/UIOP_Connect.h</TT></A>&gt;.
 
 <P>
 <HR>
@@ -2710,14 +2710,14 @@ See (TBD) ftp site for this Rose diagram.
 The new classes created were.
 <BR>
 <BLOCKQUOTE>
-TAO_SCRAMNet_Profile  (Derived from TAO_Profile in <A HREF="../../tao/Profile.h">Profile.h</A>)<BR>
-TAO_SCRAMNet_Acceptor (Derived from TAO_Acceptor in <A HREF="../../tao/Pluggable.h">Pluggable.h</A>) <BR>
-TAO_SCRAMNet_Connector  (Derived from TAO_Connector in <A HREF="../../tao/Pluggable.h">Pluggable.h</A>)<BR>
-TAO_SCRAMNet_Transport  (Derived from TAO_Transport in <A HREF="../../tao/Pluggable.h">Pluggable.h</A>)
+TAO_SCRAMNet_Profile  (Derived from TAO_Profile in <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Profile.h">Profile.h</A>)<BR>
+TAO_SCRAMNet_Acceptor (Derived from TAO_Acceptor in <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Pluggable.h">Pluggable.h</A>) <BR>
+TAO_SCRAMNet_Connector  (Derived from TAO_Connector in <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Pluggable.h">Pluggable.h</A>)<BR>
+TAO_SCRAMNet_Transport  (Derived from TAO_Transport in <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Pluggable.h">Pluggable.h</A>)
 	<BLOCKQUOTE>TAO_SCRAMNet_Server_Transport<BR>
 	TAO_SCRAMNet_Client_Transport</BLOCKQUOTE>
-TAO_SCRAMNet_Protocol_Factory (Derived from TAO_Protocol Factory in <A HREF="../../tao/Protocol_Factory.h">Protocol_Factory.h</A>)<BR>
-TAO_SCRAMNet_Handler_Base (as in <A HREF="../../tao/IIOP_Connect.h">IIOP_Connect.h</A>)
+TAO_SCRAMNet_Protocol_Factory (Derived from TAO_Protocol Factory in <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/Protocol_Factory.h">Protocol_Factory.h</A>)<BR>
+TAO_SCRAMNet_Handler_Base (as in <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/tao/IIOP_Connect.h">IIOP_Connect.h</A>)
 	<BLOCKQUOTE>TAO_SCRAMNet_Client_Connection_Handler<BR>
 	TAO_SCRAMNet_Server_Connection_Handler</BLOCKQUOTE></BLOCKQUOTE>
 <BLOCKQUOTE>ACE_SCRAMNet_Addr<BR>
diff --git a/TAO/docs/poa_migration.html b/TAO/docs/poa_migration.html
index fc52188f985..bcb446b1d4d 100644
--- a/TAO/docs/poa_migration.html
+++ b/TAO/docs/poa_migration.html
@@ -51,7 +51,7 @@ 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="../performance-tests/Cubit/TAO/IDL_Cubit">IDL_Cubit</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
@@ -193,14 +193,15 @@ the following to your header file:
 
 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/PortableServer/POA.cpp">POA.cpp</A> and <A
-HREF="../tao/PortableServer/POA.h">POA.h</A>. </li> <p>
+and/or <A HREF="../tao/POA.cpp">POA.cpp</A> and <A
+HREF="../tao/POA.h">POA.h</A>. </li> <p>
 
 </ul>
 
 <hr><P>
 
-Back to the <A HREF="index.html">TAO
+Back to the <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/index.html">TAO
 documentation</A> page.
 
 <!--#include virtual="/~schmidt/cgi-sig.html" -->
diff --git a/TAO/docs/reactivator.html b/TAO/docs/reactivator.html
index 43e853d572e..a1f7ecbc440 100644
--- a/TAO/docs/reactivator.html
+++ b/TAO/docs/reactivator.html
@@ -16,7 +16,7 @@
 
 <hr>
 
-<p>Back to the <a HREF="index.html">TAO
+<p>Back to the <a HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/index.html">TAO
 documentation</a> page. <!--#include virtual="/~schmidt/cgi-sig.html" --> </p>
 </body>
 </html>
diff --git a/TAO/docs/releasenotes.html b/TAO/docs/releasenotes.html
index 03f1b5b2c73..21854918af1 100644
--- a/TAO/docs/releasenotes.html
+++ b/TAO/docs/releasenotes.html
@@ -21,6 +21,6 @@ Version 0.0.12</H3></CENTER>
 
 <HR>
 
-This document has moved <a href="releasenotes/index.html">here</a>.
+This document has moved <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/releasenotes/index.html">here</a>.
 
 </HTML>
diff --git a/TAO/docs/releasenotes/OBV.html b/TAO/docs/releasenotes/OBV.html
index 4e6b619585b..b0d729c4179 100644
--- a/TAO/docs/releasenotes/OBV.html
+++ b/TAO/docs/releasenotes/OBV.html
@@ -61,7 +61,7 @@
         </li>
         <li><p><CODE>Valuetype</CODE>s can be used as arguments in CORBA invocations.
             There is an example in
-            <A HREF="../../examples/OBV/Typed_Events">$TAO_ROOT/TAO/examples/OBV/Typed_Events</A>.
+            <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>
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index b2f9763364a..41ebda669a4 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -12,7 +12,7 @@
 <center>
 <h3>
 Release Information for The ACE ORB (TAO)</h3></center>
-This document contains information on the following topics related to the <a href="../../VERSION">current
+This document contains information on the following topics related to the <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/VERSION">current
 release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 
 <TABLE cellpadding=10 cellspacing=0 border=0>
@@ -134,7 +134,7 @@ release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 
 </TABLE>
 
-A complete list of all modifications to TAO is available in the <a href="../../ChangeLog">ChangeLog</a>.
+A complete list of all modifications to TAO is available in the <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/ChangeLog">ChangeLog</a>.
 <p>
 <hr>
 
@@ -153,9 +153,9 @@ IDL compiler is now able to generate code that support native C++
 exceptions on the stubs and skeletons. With this strict mapping, the
 CORBA::Environment parameter is no longer generated.
 The default behavior is to generate code without the extra parameter
-        on plaforms with native exceptions and with the extra
-        parameter in platforms without native exceptions.
-        Use the -Ge flag to override the defaults.
+	on plaforms with native exceptions and with the extra
+	parameter in platforms without native exceptions.
+	Use the -Ge flag to override the defaults.
 </li>
 
 <li>
@@ -205,7 +205,7 @@ are #include'd in the main idl file.</li>
 
 <li>
 Added options to IDL compiler to specify file name endings for the IDL-generated
-stubs, skeletons and the various header files. Please refer to the <a href="../compiler.html">IDL
+stubs, skeletons and the various header files. Please refer to the <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/compiler.html">IDL
 compiler options</a> for details.</li>
 
 <li>
@@ -529,7 +529,7 @@ can be used to verify performance using the new framework.</li>
             If the user does not specify a list of endpoints then the
             ORB creates a default endpoint for each protocol
             configured, unless the pluggable protocol explicitly
-            prevents that in an effort to prevent resource leaks.
+	    prevents that in an effort to prevent resource leaks.
 </li>
 
 <P><li>
@@ -539,7 +539,7 @@ can be used to verify performance using the new framework.</li>
 </li>
 
 <P><li>
-            Added support for multiple profiles in the IORs, when the
+	    Added support for multiple profiles in the IORs, when the
             ORB demarshals an IOR it queries the Connector Registry to
             create the right kind of profile for the known protocols.
             If one of the protocols is unknown we create a special
@@ -548,29 +548,29 @@ can be used to verify performance using the new framework.</li>
 </li>
 
 <P><li>
-            Enabled the UIOP protocol.  This protocol uses local IPC
+	    Enabled the UIOP protocol.  This protocol uses local IPC
             (aka UNIX domain sockets) as the transport mechanism.  The
             protocol is loaded by default.
 
 </li>
 
 <P><li>
-            Enabled the SHMIOP protocol.  This protocol uses shared
-            memory as the transport mechanism.  The protocol is loaded
-            by default.
+	    Enabled the SHMIOP protocol.  This protocol uses shared
+	    memory as the transport mechanism.  The protocol is loaded
+	    by default.
 </li>
 
 <P><li>
-            An IIOP over SSL pluggable protocol called "SSLIOP" has
-            been implemented.  It provides secure communication
-            between hosts that support IIOP over SSL, and is meant to
-            be a drop-in replacement for the IIOP pluggable protocol.
-            TAO's SSLIOP pluggable protocol implementation supports
-            both the standard IIOP transport protocol and the secure
-            IIOP over SSL transport protocol.
-
-            <P>
-              No changes were made to the core TAO sources to provide
+	    An IIOP over SSL pluggable protocol called "SSLIOP" has
+	    been implemented.  It provides secure communication
+	    between hosts that support IIOP over SSL, and is meant to
+	    be a drop-in replacement for the IIOP pluggable protocol.
+	    TAO's SSLIOP pluggable protocol implementation supports
+	    both the standard IIOP transport protocol and the secure
+	    IIOP over SSL transport protocol.
+
+	    <P>
+	      No changes were made to the core TAO sources to provide
               to this SSL support, nor does TAO contain any security
               related hooks.  TAO's SSLIOP implementation is
               completely self-contained.  This ensures that the core
@@ -578,7 +578,7 @@ can be used to verify performance using the new framework.</li>
 </li>
 
 <P><li>
-            Protocols can be dynamically loaded into the ORB: The
+	    Protocols can be dynamically loaded into the ORB: The
             default resource factory reads the protocol "names" from
             its list of arguments.  These protocol names are used to
             load an abstract factory via the service configurator.
@@ -593,12 +593,12 @@ The service configurator is now used to load protocol factories.
 </li>
 
 <P><li>
-            Support for the <code>-ORBHost</code> and
+	    Support for the <code>-ORBHost</code> and
             <code>-ORBPort</code> has been removed. The new
             <a href="../ORBEndpoint.html"><code>-ORBEndpoint</code></a>
             option supersedes them, and provides the same
             functionality in a protocol-neutral way.  If the
-            deprecated options are used, the ORB exits with a
+            deprecated options are used, the ORB exits with a 
             <code>CORBA::BAD_PARAM</code> exception, indicating an
             unknown <code>-ORB</code> option.
 </li>
@@ -635,7 +635,7 @@ The service configurator is now used to load protocol factories.
 &lt;future_prot_addr&gt;    = &lt;future_prot_id>&lt;future_prot_addr&gt;
 &lt;future_prot_id&gt;    = &lt;future_prot_token&gt;":"
 &lt;future_prot_token&gt; = possible examples: "atm" | "dce"
-&lt;future_prot_addr&gt;    = protocol specific address
+&lt;future_prot_addr&gt;    = protocol specific address 
 &lt;key_string&gt; = &lt;string&gt; | empty_string<br>
 </code></blockquote>
 
@@ -663,7 +663,7 @@ The service configurator is now used to load protocol factories.
             string begins since both may contain forward
             slashes in them.  The new <code>corbaloc:uiop</code> URL
             format may also be used.
-            <p>
+	    <p>
             It should be noted that these formats have been superseded
             by the new <code>corbaloc</code>
             <a href="../INS.html">Interoperable Naming Service</a>
@@ -734,27 +734,27 @@ The service configurator is now used to load protocol factories.
             option uses a syntax similar to that of the URL style
             object reference shown above.  The only difference is that
             the object key delimiter and the object key string are not
-            specified.
+            specified. 
 </li>
 
 <P><li>
-            Added documentation that describes how to implement
-            pluggable transport protocols for TAO.  The document is
-            available
-            <A HREF="../pluggable_protocols/index.html">here</A>.
+	    Added documentation that describes how to implement
+	    pluggable transport protocols for TAO.  The document is
+	    available
+	    <A HREF="../pluggable_protocols/index.html">here</A>.
 </li>
 
 <P><li>
-            TAO's IIOP pluggable protocol now supports automatic
-            creation of profiles for endpoints created on a host with
-            multiple network interfaces.  It should no longer be
-            necessary to manually specify an endpoint for each network
-            interface.
-            <P>
-              This means that server IORs will contain profiles for
-              all of the default endpoints created on each network
-              interface the server is listening on, if no explicit
-              endpoints were specified.
+	    TAO's IIOP pluggable protocol now supports automatic
+	    creation of profiles for endpoints created on a host with
+	    multiple network interfaces.  It should no longer be
+	    necessary to manually specify an endpoint for each network
+	    interface.
+	    <P>
+	      This means that server IORs will contain profiles for
+	      all of the default endpoints created on each network
+	      interface the server is listening on, if no explicit
+	      endpoints were specified.
 </li>
 
 </ul>
@@ -949,7 +949,7 @@ encounter an object whose interface was not known when the program was
 compiled, yet, be able to determine what operations are valid on the
 object and make invocations on it using the DII.
 
-<p>Current Status (as of February 19, 2001):
+<p>Current Status (as of August 27, 2000):
 <ul>
 
 <LI><P>First pass implementing the new Dynamic Any interfaces.
@@ -971,18 +971,6 @@ resolve_initial_references ("InterfaceRespository") completed.</li><p>
 
 <li> Persistent IFR tested.</li><p>
 
-<li> tao_ifr executable implemented, which will process IDL files, either
-adding or subtracting their contents from the IFR. Test for this capability
-also added.</li><p>
-
-<li> Build of IFR and associated tests disabled for GCC compilers before version
-2.8, SunCC compiler version 4.2 and for all builds on Lynx OS. We currently have
-two builds on Lynx OS. One uses the Intel 86386 chip, and the compiler is GCC 2.7.2,
-so the build is disabled for the reason given above for older versions of GCC. The
-other Lynx OS build is on a PowerPC chip, and uses GCC version 2.9-gnupro-98r2. There 
-are currently configuration problems with this build, and ACE_HAS_USING_KEYWORD, which
-is necessary for namespace recognition by the preprocessor, is not defined.</li><p>
-
 </ul>
 
 <p>Known Issues:
@@ -1034,14 +1022,6 @@ chooses the thread-per-request threading model.</li><p>
 <li> A test of the persistence option for the IFR added in the directory
 ACE_wrappers/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test.</li><p>
 
-<li> Executable to add or subtract the contents of an IDL file to/from the
-IFR, has been added. This executable uses the TAO IDL compiler front end library,
-with a new back end library and top level executable. An application-style test has
-also been added wherein a server is started, the IFR started, the contents of the IDL
-file added to the IFR, a client started, which discovers information about a desired
-operation by searching the IFR, and a DII request constructed from this information.
-</li><p>
-
 </ul>
 
 <p>Future Work:
@@ -1367,28 +1347,28 @@ Features in this release:</h3>
 
 <ul>
       <li><P>There is a new implementation of the COS Event Service
-          available.
-          This new implementation supports both the Push and Pull
-          styles for event communication, and it does not require the
-          Real-time Event Service to work.
-        </P>
+	  available.
+	  This new implementation supports both the Push and Pull
+	  styles for event communication, and it does not require the
+	  Real-time Event Service to work.
+	</P>
       </LI>
 
       <LI><P>A new testsuite for the COS Event Service has been
-          started, they are available at:
-          <CODE>$TAO_ROOT/orbsvcs/tests/CosEvent/</CODE>
-        </P>
+	  started, they are available at:
+	  <CODE>$TAO_ROOT/orbsvcs/tests/CosEvent/</CODE>
+	</P>
       </LI>
 
       <LI><P>A new example for the COS Event Service is provided in
-          <CODE>$TAO_ROOT/orbsvcs/examples/CosEC/Simple/</CODE>
-        </P>
+	  <CODE>$TAO_ROOT/orbsvcs/examples/CosEC/Simple/</CODE>
+	</P>
       </LI>
 
       <LI><P>A new binary to run the native COS Event Service was
-          added, it is compiled in:
-          <CODE>$TAO_ROOT/orbsvcs/CosEvent_Service/CosEvent_Service_Native</CODE>
-        </P>
+	  added, it is compiled in:
+	  <CODE>$TAO_ROOT/orbsvcs/CosEvent_Service/CosEvent_Service_Native</CODE>
+	</P>
       </LI>
 
 <li>
@@ -1449,9 +1429,9 @@ Point of contact: <a href="mailto:krish@cs.wustl.edu">Krishnakumar Elakkara Path
   </li>
   <li>
       The Query Language supported at present is "TCL".
-          The Log record id and Log record time are treated as properties
-          of the log and can be referenced in a query as "id" and "time"
-          respectively.
+	  The Log record id and Log record time are treated as properties
+	  of the log and can be referenced in a query as "id" and "time"
+	  respectively.
       <br>
   </li>
 </ul>
@@ -1486,33 +1466,32 @@ Point of contact: <a href="mailto:krish@cs.wustl.edu">Krishnakumar Elakkara Path
   <li>
       Support "Extended TCL" as the Query Language.
       <br>
-          Support the record attributes as name-value pair properties.
-          <br>
+	  Support the record attributes as name-value pair properties.
+	  <br>
   </li>
   <li>
-        Use Red-Black trees to optimize lookup on frequently used query keys -
-        namely record id's and time.
-        <br>
+	Use Red-Black trees to optimize lookup on frequently used query keys -
+	namely record id's and time.
+	<br>
   </li>
 </ul>
 
-
 <hr WIDTH="100%">
 <h3><a NAME="notify"></a>CORBA Notification Service </h3>
 
-<h4> Last updated:Wed Feb 14 15:14:15 CST 2001 </h4>
+<h4> Last updated: Wed Jul 19 16:49:50 CDT 2000 </h4>
 Point of contact: <a href="mailto:pradeep@cs.wustl.edu">Pradeep Gore</a>
 <p>
 Work is in progress to implement the CORBA <a href="ftp://ftp.omg.org/pub/docs/telecom/99-07-01.pdf"> Notification Service </a>.
-The implementation released in TAO 1.1.12 consists of the following
+The implementation released in TAO 1.1 consists of the following
 (see the associated README's for more information):
 <ul>
-        <li>
+	<li>
             The implementation of the interfaces in the Notification Service
             spec is in <tt>$TAO_ROOT/orbsvcs/orbsvcs/Notify</tt>.
-        </li>
+	</li>
 
-        <li>
+	<li>
             The service executable is implemented in
             <tt>$TAO_ROOT/orbsvcs/Notify_Service</tt>.
         </li>
@@ -1520,7 +1499,7 @@ The implementation released in TAO 1.1.12 consists of the following
         <li>
             The example in <tt>$TAO_ROOT/orbsvcs/examples/Notify/Filter</tt>
             shows a basic example of using filters.
-        </li>
+	</li>
 
         <li>
             The example in <tt>$TAO_ROOT/orbsvcs/examples/Notify/Subscribe
@@ -1535,16 +1514,14 @@ The implementation released in TAO 1.1.12 consists of the following
 </ul>
 
 <h3> Features supported thus far:</h3>
-
+The Notification Service supports all the interfaces defined in the spec
+*except* Qos Properties, Pull interfaces and Typed Event style communication.
+<br>
+Please note the following:
 <ul>
   <li>
-      The following QoS properties are supported - per-message event
-      priority,order policy and discard policy.
-  </li>
-
-  <li>
-      The following Admin. properties are supported - max. queue
-      length, max_consumers, max_suppliers and reject_new_events.
+      All features implemented so far are *code* complete and we are
+      currently testing them.
   </li>
 
   <li>
@@ -1555,6 +1532,7 @@ The implementation released in TAO 1.1.12 consists of the following
 
   <li>
       Assignment of ID's: All object factories assign ID's to objects created.
+      The ID's are recycled when the objects are destroyed.
   </li>
 
   <li>
@@ -1565,6 +1543,13 @@ The implementation released in TAO 1.1.12 consists of the following
   </li>
 
   <li>
+      There are helper classes TAO_Notify_StructuredPushConsumer,
+      TAO_Notify_StructuredPushSupplier and TAO_Notify_PushConsumer,
+      TAO_Notify_PushSupplier to write client consumers and suppliers
+      in <tt> $TAO_ROOT/orbsvcs/tests/Notify/lib</tt>.
+  </li>
+
+  <li>
       The EventChannel's default Filter Factory can be used to create filters.
       For now we support the "TCL" grammer from the Trading Service.
   </li>
@@ -1594,7 +1579,7 @@ The implementation released in TAO 1.1.12 consists of the following
             that evaluated (checking subscriptions and filters) it.
         </li>
 
-        <li> MT Filter evaluation of events - Events delivered to the
+        <li> MT evaluation of events - Events delivered to the
             ProxySuppliers will be evaluated in another thread, different
             from the delivering thread.
         </li>
@@ -1625,17 +1610,14 @@ The implementation released in TAO 1.1.12 consists of the following
 
 </ul>
 
-Note that this implementation does not support Pull interfaces and
-Typed Event style communication.
-
 <h3> Project Schedule </h3>
 The TODO list runs like this:
 <ul>
 
   <li>
-      Implement the QoS properties - Expiry times, Earliest
-      delivery times, maximun events per consumer, deadline based ordering,
-      maximum batch size, pacing interval.
+      Implement the QoS properties - Priority, Expiry times, Earliest
+      delivery times, maximun events per consumer, order policy,
+      discard policy, maximum batch size, pacing interval.
   </li>
 
   <li>
@@ -1652,8 +1634,8 @@ The TODO list runs like this:
         </li>
 
         <li>
-            (Wish list) Add a "filter cache" to cache the expression
-            tree for frequently used constraint expressions.
+            (Wish list) Add a "filter cache" to cache the expression tree for frequently
+            used constraint expressions.
         </li>
 
       </ul>
@@ -1729,15 +1711,15 @@ Schedule:
     the remaining, more "interesting," CORBA Security Service features
     will be built on.  Once they are in place, it will also be
     possible to perform some real research on fault injection, and
-    real-time security.
+    real-time security. 
     <UL>
       <LI>
         Complete full <CODE>SecurityLevel1</CODE> interface
-        implementation.
+        implementation. 
       </LI>
       <LI>
         Partial implementation of <CODE>SecurityManager</CODE>
-        interface.
+        interface. 
       </LI>
       <LI>
         Full implementation of the <CODE>SecureInvocation</CODE>
@@ -1763,7 +1745,7 @@ Schedule:
       <LI>
         Partial implementation of the <CODE>SecurityLevel2</CODE>
         interfaces.  This includes the <CODE>Credential</CODE> and
-        <CODE>Current</CODE> objects.
+        <CODE>Current</CODE> objects. 
       </LI>
       <LI>
         Partial implementation of the <CODE>SecurityAdmin</CODE>
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html b/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
index d848f9c8ae7..833749a9cc1 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/index.html
@@ -96,6 +96,7 @@
       the object ID is valid and then check for the servant we want to
       create and create adn return the requested servant.
     <PRE>
+    <PRE>
      PortableServer::Servant
      Quoter_Stock_Factory_Locator_i::preinvoke (const PortableServer::ObjectId &oid, 
                                                  PortableServer::POA_ptr poa, 
@@ -253,6 +254,7 @@
       <a href="../AMI/Handler_i.cpp">Handler_i.cpp</a>.
     </P>
     <H3>More Reading</H3>
+    <P>The 
     <P>The <A HREF="http://www.triodia.com/staff/michi-henning.html">Henning</A> and
       <A HREF="http://www.iona.com/hyplan/vinoski/">Vinoski</A> 
       <A HREF="http://www.iona.com/hyplan/vinoski/#book">CORBA book</A> 
@@ -261,7 +263,7 @@
       in C++ Report also include several articles about the POA.  Finally,
       the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>
       distribution includes 
-      <A HREF="../../../../examples/POA">examples</A> that illustrate how to use the POA policies.
+      <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">examples</A> that illustrate how to use the POA policies.
     </P>
     <hr>
     <address><a href="mailto:pgontla@ece.uci.edu">Priyanka Gontla</a></address>
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
index 46c4d13dd6d..3311b0071a6 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/index.html
@@ -136,14 +136,14 @@
     </PRE>
     <H3>More Reading</H3>
     <P>More information on Implementation Repository is 
-     <A	HREF="../../../../implrepo/index.html">here</A>.  
+     <A	HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/implrepo/index.html">here</A>.  
     </P>
       <P>The <A HREF="http://www.triodia.com/staff/michi-henning.html">Henning</A> and <A HREF="http://www.iona.com/hyplan/vinoski/">Vinoski</A> 
       <A HREF="http://www.iona.com/hyplan/vinoski/#book">CORBA book</A> discusses POA policies in detail.  Likewise, 
       the Schmidt and Vinoski 
       <A HREF="http://www.cs.wustl.edu/~schmidt/report-doc.html">columns</A> in C++ Report also include several articles about the POA.  Finally,
       the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> 
-      distribution includes <A HREF="../../../../../examples/POA">examples</A> that illustrate how
+      distribution includes <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">examples</A> that illustrate how
       to use the POA policies.
     </P>
     <hr>
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
index 5c150bc540f..67dedb8820b 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/index.html
@@ -328,7 +328,7 @@ HREF="http://www.triodia.com/staff/michi-henning.html">Henning</A> and
       in C++ Report also include several articles about the POA.  Finally,
       the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a> distribution includes 
       <A
-HREF="../../../../../examples/POA">examples</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">examples</A>
 that illustrate how to use the POA policies.
     </P>
 
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html b/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
index 04451cddc4c..03a8120b216 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/index.html
@@ -359,7 +359,7 @@
 	TAO
       </A>
       distribution includes several
-      <A HREF="../../../../../examples/POA">
+      <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/POA">
 	examples
       </A>
       that illustrate how to use the POA policies.
diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html
index d5b75455b67..c764755cf39 100644
--- a/TAO/docs/tutorials/Quoter/index.html
+++ b/TAO/docs/tutorials/Quoter/index.html
@@ -33,7 +33,7 @@
         reliable oneways</A>,
       the <A HREF="http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz">
         real-time Events Service</A>,
-      the <A HREF="../../INS.html">
+      the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/INS.html">
         Interoperable Naming Service</A>
       support and much more.
     </P>
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 8ce86f4e6ec..2e47ca9ae55 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -73,10 +73,10 @@ main (int argc, char *argv[])
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
+  
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
                                               priority);
-
+  
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
                                               priority);
 
@@ -103,9 +103,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -121,7 +119,7 @@ main (int argc, char *argv[])
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       if (parse_args (argc, argv) != 0)
         return 1;
 
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index 80855d97f95..14c38bf9a13 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -75,14 +75,14 @@ main (int argc, char *argv[])
       int w = 320;
       int h = 30 * n_peers + 20;
       Fl_Window window(w, h);
-
+      
       Progress_Window sw (n_peers, n_iterations,
                           10,
                           10,
                           window.w () - 20,
                           window.h () - 20);
       window.resizable (&sw);
-
+      
       window.end ();
 
       char* targv[] = { argv[0] };
@@ -91,9 +91,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
diff --git a/TAO/examples/Borland/ORBThread.cpp b/TAO/examples/Borland/ORBThread.cpp
index 71b761ffb89..883729698bb 100644
--- a/TAO/examples/Borland/ORBThread.cpp
+++ b/TAO/examples/Borland/ORBThread.cpp
@@ -34,7 +34,7 @@ __fastcall TORBThread::~TORBThread ()
   catch (CORBA::Exception&)
     {
     }
-
+  
   WaitFor ();
 }
 //---------------------------------------------------------------------------
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index 03de4f5e928..5c7a23cfba5 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -314,8 +314,7 @@ main (int argc, char **argv)
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          orb->run (sleep_interval);
         }
 
       // Loop until all replies have been received.
diff --git a/TAO/examples/Buffered_AMI/run_test.pl b/TAO/examples/Buffered_AMI/run_test.pl
index cc4c782cf58..5b506755320 100755
--- a/TAO/examples/Buffered_AMI/run_test.pl
+++ b/TAO/examples/Buffered_AMI/run_test.pl
@@ -5,40 +5,39 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("ami.ior");
-
-$status = 0;
+$iorfile = "ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", "-x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 57565d8e20f..8db43471f86 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -87,7 +87,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run (ACE_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index 2bdf6317cee..f3c41136d34 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -308,8 +308,7 @@ main (int argc, char **argv)
           ACE_Time_Value sleep_interval (0,
                                          interval * 1000);
 
-          orb->run (sleep_interval, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          orb->run (sleep_interval);
         }
 
       // Shutdown server.
diff --git a/TAO/examples/Buffered_Oneways/run_test.pl b/TAO/examples/Buffered_Oneways/run_test.pl
index ff810f280c4..09d036acbf9 100755
--- a/TAO/examples/Buffered_Oneways/run_test.pl
+++ b/TAO/examples/Buffered_Oneways/run_test.pl
@@ -5,77 +5,75 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("oneways.ior");
+$iorfile = "ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT");
 
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-print STDERR "\nFlushing based on implicit message counts\n\n";
-
-$CL->Arguments ("-k file://$iorfile -c 5 -b -1 -f -1 -t -1");
+print STDOUT "\nFlushing based on implicit message counts\n\n";
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       "-c 5 -b -1 -f -1 -t -1");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-print STDERR "\nFlushing based on implicit message bytes\n\n";
+print STDOUT "\nFlushing based on implicit message bytes\n\n";
 
-$CL->Arguments ("-k file://$iorfile -b 250 -c -1 -f -1 -t -1");
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       "-b 250 -c -1 -f -1 -t -1");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-print STDERR "\nFlushing based on implicit timeout\n\n";
-
-$CL->Arguments ("-k file://$iorfile -t 5000 -b -1 -c -1 -f -1");
+print STDOUT "\nFlushing based on implicit timeout\n\n";
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       "-t 5000 -b -1 -c -1 -f -1");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-print STDERR "\nExplicit queue flushing (and server shutdown)\n\n";
+print STDOUT "\nExplicit queue flushing (and server shutdown)\n\n";
 
-$CL->Arguments ("-k file://$iorfile -f 5 -b -1 -c 100 -t -1 -x");
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       "-f 5 -b -1 -c 100 -t -1 -x");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 0833f740340..cf6412faf12 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -87,7 +87,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run (ACE_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/examples/Callback_Quoter/Consumer.dsp b/TAO/examples/Callback_Quoter/Consumer.dsp
index 33d52dddf85..8abdec0c9b0 100644
--- a/TAO/examples/Callback_Quoter/Consumer.dsp
+++ b/TAO/examples/Callback_Quoter/Consumer.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 9b1daa80a75..5d8d9ed57b8 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -185,7 +185,7 @@ Consumer_Handler::via_naming_service (void)
       ACE_TRY_CHECK;
 
     }
-  ACE_CATCHANY
+  ACE_CATCHANY 
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Consumer_Handler::via_naming_service\n");
       return -1;
@@ -200,7 +200,7 @@ Consumer_Handler::via_naming_service (void)
 int
 Consumer_Handler::init (int argc, char **argv)
 {
-
+  
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -217,13 +217,13 @@ Consumer_Handler::init (int argc, char **argv)
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-
+    
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   "parse_args failed\n"),
                           -1);
-
+      
       if (this->interactive_ == 1)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -231,11 +231,11 @@ Consumer_Handler::init (int argc, char **argv)
                       " * Registration <type 'r'>\n "
                       " * Unregistration <type 'u'>\n "
                       " * Quit <type 'q'>\n "));
-
+          
           ACE_NEW_RETURN (consumer_input_handler_,
                           Consumer_Input_Handler (this),
                           -1);
-
+      
           if (ACE_Event_Handler::register_stdin_handler
               (consumer_input_handler_,
                this->orb_->orb_core ()->reactor (),
@@ -244,12 +244,12 @@ Consumer_Handler::init (int argc, char **argv)
                                "%p\n",
                                "register_stdin_handler"),
                               -1);
-
+          
           // Register the signal event handler for ^C
           ACE_NEW_RETURN (consumer_signal_handler_,
                           Consumer_Signal_Handler (this),
                           -1);
-
+          
           if (this->reactor_used ()->register_handler
               (SIGINT,
                consumer_signal_handler_) == -1)
@@ -268,18 +268,18 @@ Consumer_Handler::init (int argc, char **argv)
          }
       else
         {
-
+          
           if (this->ior_ == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "%s: no ior specified\n",
                                this->argv_[0]),
                               -1);
-
+          
           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",
@@ -312,13 +312,13 @@ Consumer_Handler::run (void)
   ACE_TRY
     {
       // Obtain and activate the RootPOA.
-     CORBA::Object_var obj =
+     CORBA::Object_var obj = 
             this->orb_->resolve_initial_references ("RootPOA");
 
      PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
      ACE_TRY_CHECK;
-
+     
      PortableServer::POAManager_var poa_manager=
        root_poa->the_POAManager (ACE_TRY_ENV);
      ACE_TRY_CHECK;
@@ -331,22 +331,22 @@ Consumer_Handler::run (void)
                      -1);
      // Set the orb in the consumer_ object.
      this->consumer_servant_->orb (this->orb_.in ());
-
+     
      // Get the consumer stub (i.e consumer object) pointer.
      this->consumer_var_ =
        this->consumer_servant_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      ACE_TRY_CHECK;  
+      
       if (this->interactive_ == 0)
         {
-
+          
           // Register with the server.
           this->server_->register_callback (this->stock_name_,
                                             this->threshold_value_,
                                             this->consumer_var_.in (),
                                             ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
+          
           // Note the registration.
           this->registered_ = 1;
           this->unregistered_ = 0;
@@ -356,9 +356,8 @@ Consumer_Handler::run (void)
         }
 
       // Run the ORB.
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      this->orb_->run ();
+  
     }
   ACE_CATCHANY
     {
@@ -366,7 +365,7 @@ Consumer_Handler::run (void)
       return -1;
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
diff --git a/TAO/examples/Callback_Quoter/Notifier.dsp b/TAO/examples/Callback_Quoter/Notifier.dsp
index 0256aba7a41..41ccd7788df 100644
--- a/TAO/examples/Callback_Quoter/Notifier.dsp
+++ b/TAO/examples/Callback_Quoter/Notifier.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index 82c2c122464..a040da0ac6f 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -69,7 +69,7 @@ Notifier_Input_Handler::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
     {
       Notifier_var notifier_obj = notifier_i_._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       this->orb_manager_.activate_poa_manager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
diff --git a/TAO/examples/Callback_Quoter/README b/TAO/examples/Callback_Quoter/README
index 201c39fb56b..783e23b87cd 100644
--- a/TAO/examples/Callback_Quoter/README
+++ b/TAO/examples/Callback_Quoter/README
@@ -1,4 +1,5 @@
 ******************************************************************************
+
 CALLBACK QUOTER TEST EXAMPLE                           -- Kirthika Parameswaran
                                                           <kirthika@cs.wustl.edu>
 ******************************************************************************
@@ -119,3 +120,9 @@ The other option includes setting the period for the stock feed.
 -----------------------------------------------------------------------------
 
 Happy troubleshooting!!!
+
+
+
+
+
+
diff --git a/TAO/examples/Callback_Quoter/Supplier.dsp b/TAO/examples/Callback_Quoter/Supplier.dsp
index 9eda620d3f4..f7e156fab3b 100644
--- a/TAO/examples/Callback_Quoter/Supplier.dsp
+++ b/TAO/examples/Callback_Quoter/Supplier.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index f2c5ab1f9ba..9c405c80786 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -156,7 +156,7 @@ Supplier::send_market_status (const char *stock_name,
 
   ACE_TRY
     {
-
+      
       // Make the RMI.
       this->notifier_->market_status (stock_name,
                                       value,
@@ -249,7 +249,7 @@ Supplier::via_naming_service (void)
       return -1;
     }
   ACE_ENDTRY;
-
+    
   return 0;
 }
 
@@ -318,7 +318,7 @@ Supplier::init (int argc, char **argv)
       return -1;
     }
   ACE_ENDTRY;
-
+ 
   return 0;
 }
 
diff --git a/TAO/examples/Callback_Quoter/run_test.pl b/TAO/examples/Callback_Quoter/run_test.pl
index 78aeb41bd07..aac24db5939 100755
--- a/TAO/examples/Callback_Quoter/run_test.pl
+++ b/TAO/examples/Callback_Quoter/run_test.pl
@@ -5,67 +5,76 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$ns_ior = PerlACE::LocalFile ("NameService.ior");
-$sleeptime = 5;
-
-unlink $ns_ior;
-
-$NS = new PerlACE::Process ("../../orbsvcs/Naming_Service/Naming_Service", "-o $ns_ior");
-$N = new PerlACE::Process ("notifier", "-ORBInitRef NameService=file://$ns_ior");
-$C = new PerlACE::Process ("consumer", "-ORBInitRef NameService=file://$ns_ior -t 12 -a TAO");
-$S = new PerlACE::Process ("supplier", "-ORBInitRef NameService=file://$ns_ior -iexample.stocks");
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
 
 print STDERR "================ Remote test\n";
 
-$NS->Spawn ();
+$ns_ior = "NameService.ior";
 
-if (PerlACE::waitforfile_timed ($ns_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ns_ior>\n";
-    $NS->Kill (); 
-    exit 1;
+unlink $ns_ior;
+$NS = Process::Create ("..".$DIR_SEPARATOR.
+                       "..".$DIR_SEPARATOR.
+		       "orbsvcs".$DIR_SEPARATOR.
+                       "Naming_Service".$DIR_SEPARATOR.
+                       "Naming_Service".$EXE_EXT,
+                       " -o $ns_ior ");
+
+if (ACE::waitforfile_timed ($ns_ior, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$ns_ior>\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
+$N = Process::Create (".".$DIR_SEPARATOR.
+		      "notifier".$EXE_EXT,
+		      " -ORBInitRef NameService=file://$ns_ior ");
 
-$N->Spawn ();
+sleep 5;
 
-sleep $sleeptime;
+$C = Process::Create (".".$DIR_SEPARATOR.
+		      "consumer".$EXE_EXT,
+		      " -ORBInitRef NameService=file://$ns_ior "
+		      . " -t 12 -a TAO");
 
-$C->Spawn ();
+sleep 5;
 
-sleep $sleeptime;
+$S = Process::Create (".".$DIR_SEPARATOR.
+		      "supplier".$EXE_EXT,
+		      " -ORBInitRef NameService=file://$ns_ior "
+		      . " -iexample.stocks");
 
-$supplier = $S->SpawnWaitKill (60);
-
-if ($supplier != 0) {
-    print STDERR "ERROR: supplier returned $supplier\n";
-    $status = 1;
+if ($S->TimedWait (60) == -1) {
+  print STDERR "ERROR: supplier timedout\n";
+  $S->Kill (); $S->TimedWait (1);
+  $C->Kill (); $C->TimedWait (1);
+  $N->Kill (); $N->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$server = $C->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: consumer returned $server\n";
-    $status = 1;
+$C->Terminate (); if ($C->TimedWait (5) == -1) {
+  print STDERR "ERROR: consumer timedout\n";
+  $C->Kill (); $C->TimedWait (1);
+  $N->Kill (); $N->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$server = $N->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: notifier returned $server\n";
-    $status = 1;
+$N->Terminate (); if ($N->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate notifier\n";
+  $N->Kill (); $N->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$server = $NS->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: naming service returned $server\n";
-    $status = 1;
+$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate naming service\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
 unlink $ns_ior;
 
-exit $status;
+exit 0;
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
index 4892f086435..e46b83bff12 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp
@@ -140,9 +140,10 @@ Iterator_Handler::initialize_content_iterator
                          ACE_Addr::sap_any,
                          0,
                          O_CREAT | O_TRUNC | O_WRONLY,
-                         ACE_DEFAULT_FILE_PERMS) == -1)
+                         S_IRUSR | S_IWUSR) == -1)
     ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("Could not open file %p\n"),
+                ACE_TEXT ("%p\n"),
+                ACE_TEXT ("Could not open file %s"),
                 this->file_.get_path_name ()));
   else
     (*this->request_count_)++;
@@ -262,7 +263,9 @@ Iterator_Handler::spawn_viewer (void)
       return 0;
     case ACE_INVALID_PID:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Error during viewer spawn of %p\n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("Error during viewer spawn of ")
+                         ACE_TEXT ("\"%s\""),
                          opts.command_line_buf ()),
                         -1);
     default:
diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
index 1c379a57417..e2451c0ebbe 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp
@@ -29,10 +29,11 @@ Callback_i::Callback_i (int *request_count)
                          ACE_Addr::sap_any,
                          0,
                          O_CREAT | O_TRUNC | O_WRONLY,
-                         ACE_DEFAULT_FILE_PERMS) == -1)
+                         S_IRUSR | S_IWUSR) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Could not open file \"%s\"%p\n"),
+                  ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("Could not open file %s"),
                   this->file_.get_path_name ()));
     }
   else
@@ -257,13 +258,15 @@ Callback_i::spawn_viewer (void)
       return 0;
     case ACE_INVALID_PID:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Error during viewer spawn of %p\n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("Error during viewer spawn of ")
+                         ACE_TEXT ("\"%s\""),
                          opts.command_line_buf ()),
                         -1);
     default:
       // Parent
       ACE_DEBUG ((LM_INFO,
-                  ACE_TEXT ("Spawned viewer <%s> with PID <%d>.\n"),
+                  "Spawned viewer <%s> with PID <%d>.\n",
                   viewer,
                   result));
       break;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index cf7d7f1159f..bad90986181 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -165,10 +165,11 @@ int retrieve_data (const char *content_type,
                          ACE_Addr::sap_any,
                          0,
                          O_CREAT | O_TRUNC | O_WRONLY,
-                         ACE_DEFAULT_FILE_PERMS) == -1)
+                         S_IRUSR | S_IWUSR) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("Could not open file \"%s\"%p\n"),
+                  ACE_TEXT ("%p\n"),
+                  ACE_TEXT ("Could not open file %s"),
                   file_addr.get_path_name ()));
     }
 
@@ -301,7 +302,9 @@ spawn_viewer (const char *content_type,
       return 0;
     case ACE_INVALID_PID:
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("Error during viewer spawn of %p\n"),
+                         ACE_TEXT ("%p\n"),
+                         ACE_TEXT ("Error during viewer spawn of ")
+                         ACE_TEXT ("\"%s\""),
                          opts.command_line_buf ()),
                         -1);
     default:
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 9004347a4c4..46a30a7d912 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -152,16 +152,7 @@ Consumer_Handler::run (void)
               "Running the Consumer...\n"));
 
   // Run the ORB.
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  this->orb_->run ();
   return 0;
 }
 
diff --git a/TAO/examples/Load_Balancing/client.dsp b/TAO/examples/Load_Balancing/client.dsp
index 77a91590c20..a4a7fd130fe 100644
--- a/TAO/examples/Load_Balancing/client.dsp
+++ b/TAO/examples/Load_Balancing/client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ELSEIF  "$(CFG)" == "Load_Balancing client - Win32 Debug"

 

diff --git a/TAO/examples/Load_Balancing/run_test.pl b/TAO/examples/Load_Balancing/run_test.pl
index 724a1de22e1..5624dd18500 100755
--- a/TAO/examples/Load_Balancing/run_test.pl
+++ b/TAO/examples/Load_Balancing/run_test.pl
@@ -8,75 +8,99 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs a Load Balancing service demo.
 # See README file for details about the demo.
 
-use lib "../../../bin";
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
+require Uniqueid;
 
 # Amount of delay (in seconds) between starting a server and a client
 # to allow proper server initialization.
 $sleeptime = 4;
 
 # File used to pass load balancing service ior to its clients.
-$iorfile = PerlACE::LocalFile("lb.ior");
-
-unlink $iorfile;
-
-$LB = new PerlACE::Process ("load_balancer", "-o $iorfile");
-$SV = new PerlACE::Process ("server", "-i file://$iorfile");
-$CL = new PerlACE::Process ("client", "-i file://$iorfile -n 10");
-
-print STDERR "\n    Starting Load Balancing Server and Identity Server \n\n";
+$iorfile = "lb.ior";
 
 # Run the load balancing server.
-$LB->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-    print STDERR "ERROR: File containing Load Balancing Service ior,".
-        " <$iorfile>, cannot be found\n";
-    $LB->Kill ();
-    exit 1;
+sub load_balancing_server
+{
+  my $args = "@_"." -o $iorfile";
+  my $prog = $EXEPREFIX."load_balancer".$EXE_EXT;
+
+  unlink $iorfile;
+  $LB = Process::Create ($prog, $args);
+
+  if (ACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+      print STDERR "ERROR: File containing Load Balancing Service ior,".
+          " <$iorfile>, cannot be found\n";
+      $LB->Kill (); $LB->TimedWait (1);
+      exit 1;
+  }
 }
 
 # Run the identity server, which registers its objects with the load
 # balancing server.
+sub server
+{
+    my $args = "@_"." -i file://$iorfile ";
+    my $prog = $EXEPREFIX."server".$EXE_EXT;
+
+    if (ACE::waitforfile_timed ($iorfile, $sleeptime) == -1)
+    {
+        exit 1;
+    }
+
+    $S = Process::Create ($prog, $args);
+    sleep ($sleeptime);
+}
 
-$SV->Spawn ();
-sleep ($sleeptime);
+# Run client, which obtains references to Identity objects from the load balancing
+# service, and invokes operations on them.
+sub client
+{
+    my $args = "@_"." -i file://$iorfile -n 10";
+    my $prog = $EXEPREFIX."client".$EXE_EXT;
 
+    $CL = Process::Create ($prog, $args);
 
-# Run tests, i.e., run client with different command line options.
+    $client = $CL->TimedWait (60);
+    if ($client == -1) {
+        print STDERR "ERROR: client timedout\n";
+        $CL->Kill (); $CL->TimedWait (1);
+    }
+}
 
-print STDERR "\n     Client using Round Robin Object Group (10 iterations): \n\n";
-$client = $CL->SpawnWaitKill (60);
+# Data for each test we will run, i.e., client command-line options
+# and test description.
+@client_opts = ("", "-r");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
+@test_heading = ("Client using Round Robin Object Group (10 iterations): \n\n",
+                 "Client using Random Object Group (10 iterations): \n\n");
 
-$CL->Arguments ("-r " . $CL->Arguments ());
+print STDERR "\n    Starting Load Balancing Server and Identity Server \n\n";
+load_balancing_server ("");
+server ("");
 
-print STDERR "\n     Client using Random Object Group (10 iterations): \n\n";
-$client = $CL->SpawnWaitKill (60);
+# Run tests, i.e., run client with different command line options.
+$test_number = 0;
+foreach $o (@client_opts)
+{
+    print STDERR "\n     ".$test_heading[$test_number];
+    client ($o);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+    $test_number++;
 }
 
 # Clean up.
-$loadbalancer= $LB->TerminateWaitKill (5);
-
-if ($loadbalancer != 0) {
-    print STDERR "ERROR: load balancer returned $loadbalancer\n";
-    $status = 1;
+$LB->Terminate (); $lserver = $LB->TimedWait (5);
+if ($lserver == -1) {
+    print STDERR "ERROR: load balancing server timedout\n";
+    $LB->Kill (); $LB->TimedWait (1);
 }
-
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$S->Terminate (); $server = $S->TimedWait (5);
+if ($server == -1) {
+    print STDERR "ERROR: identity server timedout\n";
+    $S->Kill (); $S->TimedWait (1);
 }
-unlink $iorfile;
 
-exit $status;
+# @@ Capture any exit status from the processes.
+exit 0;
diff --git a/TAO/examples/Load_Balancing/server.dsp b/TAO/examples/Load_Balancing/server.dsp
index 0351494d51c..bbff4ad3e3b 100644
--- a/TAO/examples/Load_Balancing/server.dsp
+++ b/TAO/examples/Load_Balancing/server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ELSEIF  "$(CFG)" == "Load_Balancing server - Win32 Debug"

 

diff --git a/TAO/examples/Load_Balancing/service.dsp b/TAO/examples/Load_Balancing/service.dsp
index ffa34d25c49..18a5d69f596 100644
--- a/TAO/examples/Load_Balancing/service.dsp
+++ b/TAO/examples/Load_Balancing/service.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Release/load_balancer.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"service.exe" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ELSEIF  "$(CFG)" == "Load_Balancing service - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"load_balancer.exe" /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/PortableServer"

 

 !ENDIF 

 

diff --git a/TAO/examples/Logging/run_test.pl b/TAO/examples/Logging/run_test.pl
index 58aac5eaaed..891abc3421f 100755
--- a/TAO/examples/Logging/run_test.pl
+++ b/TAO/examples/Logging/run_test.pl
@@ -7,37 +7,41 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 # This is a Perl script that runs the Logger client and server
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
+unshift @INC, '../../../bin';
+require Process;
 
 # amount of delay between running the servers
 $sleeptime = 7;
 
-$SV = new PerlACE::Process ("Logging_Service");
-$CL = new PerlACE::Process ("Logging_Test");
+# Starts the Logging Service
+sub service
+{
+  my $args = "";
+  my $prog = $EXEPREFIX."Logging_Service"
+      .$EXE_EXT;
+  $SV = Process::Create ($prog, $args);
+}
+
+# Starts the test client
+sub test
+{
+  my $args = "";
+  my $prog = $EXEPREFIX."Logging_Test".$EXE_EXT;
+
+  system ("$prog $args");
+}
 
 # Start the service
-$SV->Spawn ();
+service ();
 
 # Give the service time to settle
 sleep $sleeptime;
 
-# Start the client 
-$client = $CL->SpawnWaitKill (60);
+# Start the client (which exits automatically)
+test ();
 
-if ($client != 0) {
-    print STDERR "ERROR: test returned $client\n";
-    $status = 1;
-}
+# Give the client time to log and exit
+sleep 3;
 
 # Kill the service
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: service returned $server\n";
-    $status = 1;
-}
-
-exit $status;
+$SV->Kill ();
diff --git a/TAO/examples/Makefile.bor b/TAO/examples/Makefile.bor
index 68314a4dd92..7d2ff83850e 100644
--- a/TAO/examples/Makefile.bor
+++ b/TAO/examples/Makefile.bor
@@ -8,7 +8,6 @@ DIRS = Buffered_Oneways \
        Event_Comm \
        Load_Balancing \
        Load_Balancing_persistent \
-       PluggableUDP \
        POA \
        Simple
 
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index dfbb351025f..e1c078844fc 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -37,8 +37,7 @@ Checkpoint_Client_i::run (const char *name,
       ACE_DEBUG ((LM_DEBUG, "Send some random events:\n"));
 
       CORBA::Float temperature = random_number (29, 34);
-      Temperature_var t_e (ACE_static_cast(Temperature*,
-                                           new Temperature_impl (temperature)));
+      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);
@@ -54,8 +53,7 @@ Checkpoint_Client_i::run (const char *name,
       Point point = { random_number (0,4),
                       random_number (0,4),
                       random_number (0,4)  };
-      Position_var p_e (ACE_static_cast(Position*,
-                                        new Position_impl (point)));
+      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);
@@ -65,8 +63,7 @@ Checkpoint_Client_i::run (const char *name,
       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 (ACE_static_cast(Log_Msg*,
-                                       new Log_Msg_impl (urgent, a_text)));
+      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);
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
index 7ba9154652a..8f49185e91b 100644
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
@@ -101,19 +101,19 @@ Position_impl::do_print (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA::Float Position_impl::x (CORBA::Environment &ACE_TRY_ENV)
-{
+{ 
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   return this->xyz()[0];
 }
 
 void Position_impl::x (CORBA::Float x, CORBA::Environment &ACE_TRY_ENV)
-{
+{ 
   ACE_UNUSED_ARG (ACE_TRY_ENV);
-  this->xyz()[0] = x;
+  this->xyz()[0] = x; 
 }
 
 CORBA::Float Position_impl::y (CORBA::Environment &ACE_TRY_ENV)
-{
+{ 
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   return this->xyz()[1];
 }
@@ -268,8 +268,7 @@ Event_List_impl::store_event (Event* e, CORBA::Environment &ACE_TRY_ENV)
   // guard against the access to the list from another thread.
   // But this is omitted in this example.
 
-  Event_List_Link_var new_link (ACE_static_cast(Event_List_Link*,
-                                                new Event_List_Link_impl (e)));
+   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
@@ -392,8 +391,7 @@ Temperature_Criterion_impl::
 Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp)
 {
   this->origin_id_ (origin_id);
-  Temperature_var tmp (ACE_static_cast(Temperature*,
-                                       new Temperature_impl (temp)));
+  Temperature_var tmp (new Temperature_impl (temp));
   this->meltingpoint (tmp.in ());
 }
 
@@ -570,7 +568,7 @@ Criterion_List_impl::store_criterion (Criterion *c, CORBA::Environment &ACE_TRY_
   ACE_UNUSED_ARG (ACE_TRY_ENV);
   if (!my_list ())
     {
-      Event_List_var ev(ACE_static_cast(Event_List*,new Event_List_impl));
+      Event_List_var ev(new Event_List_impl);
       my_list (ev);
     }
 
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
index 5f32780d899..70f2dad443f 100644
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp
@@ -43,32 +43,26 @@ Checkpoint_i::orb (CORBA::ORB_ptr o)
   // The conditions which will raise an alarm follow.
 
   // The first parameter is the origin_id and the second the temperature.
-  Temperature_Criterion_var tc (ACE_static_cast(Temperature_Criterion*,
-                                                new Temperature_Criterion_impl (KITCHEN, 32)));
+  Temperature_Criterion_var tc (new Temperature_Criterion_impl (KITCHEN, 32));
   criterions->store_criterion (tc.in ());
 
-  tc = ACE_static_cast(Temperature_Criterion*,
-                       new Temperature_Criterion_impl (BATHROOM, 27));
+  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 (ACE_static_cast(Position*,
-                                             new Position_impl (leftbottom)));
+  Position_var leftbottom_v (new Position_impl (leftbottom));
   Point topright = {2, 3, 4};
-  Position_var topright_v (ACE_static_cast(Position*,
-                                           new Position_impl (topright)));
-  Position_Criterion_var pc (ACE_static_cast(Position_Criterion*,
-                                             new Position_Criterion_impl (JONAS,
-                                                                          leftbottom_v,
-                                                                          topright_v)));
+  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 (ACE_static_cast(Log_Msg_Criterion*,
-                                            new Log_Msg_Criterion_impl));
+  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 ());
diff --git a/TAO/examples/OBV/Typed_Events/run_test.pl b/TAO/examples/OBV/Typed_Events/run_test.pl
index 3a125c5703c..6d9847d5a80 100755
--- a/TAO/examples/OBV/Typed_Events/run_test.pl
+++ b/TAO/examples/OBV/Typed_Events/run_test.pl
@@ -6,37 +6,33 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../bin";
-use PerlACE::Run_Test;
-
+require ACEutils;
+require Process;
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("obv.ior");
+$iorfile = "obv.ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: timed out waiting for file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: the client returned $client\n";
-    $status = 1;
+$client = Process::Create($EXEPREFIX."client$EXE_EXT","-f $iorfile");
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: the client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimedWait (1);
 }
 
-$server = $SV->TerminateWaitKill (5); 
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate the server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
index 362aeb84c0f..f733ce5e7e2 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -5,42 +5,50 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorfile = "ior";
 
-$status = 0;
 $oneway = "";
 $iterations = 100;
 
 $extra_args = "";
 
 # Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++) {
-    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;
+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;
     }
-    elsif ($ARGV[$i] eq "-o") {
-        $oneway = "-o";
+    if ($ARGV[$i] eq "-o")
+    {
+      $oneway = "-o";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-f") {
-        $iorfile = $ARGV[$i + 1];
-        $i++;
-    }
-    else {
-        $extra_args .= " " . $ARGV[$i];
+    if ($ARGV[$i] eq "-f")
+    {
+      $iorfile = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+    $extra_args .= " " . $ARGV[$i];
+  }
 }
 
 $iorfile_1 = $iorfile."_1";
@@ -51,65 +59,68 @@ unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
-$CL = new PerlACE::Process ("../Generic_Servant/client");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-    $SV->Kill ();
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
+if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_3, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_3>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_3, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_3>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_1");
+$CL_1  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_1");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
+$client_1 = $CL_1->TimedWait (60);
+if ($client_1 == -1) {
+  print STDERR "ERROR: client 1 timedout\n";
+  $CL_1->Kill (); $CL_1->TimedWait (1);
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_2");
-
-$client = $CL->SpawnWaitKill (60);
+$CL_2  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_2");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
+$client_2 = $CL_2->TimedWait (60);
+if ($client_2 == -1) {
+  print STDERR "ERROR: client 2 timedout\n";
+  $CL_2->Kill (); $CL_2->TimedWait (1);
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_3 -x");
+$CL_3  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 3 returned $client\n";
-    $status = 1;
+$client_3 = $CL_3->TimedWait (60);
+if ($client_3 == -1) {
+  print STDERR "ERROR: client 3 timedout\n";
+  $CL_3->Kill (); $CL_3->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-exit $status;
+if ($server != 0 ||
+    $client_1 != 0 ||
+    $client_2 != 0 ||
+    $client_3 != 0 )
+{
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 843161b5c86..03f10f6b015 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -280,10 +280,7 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
@@ -433,9 +430,8 @@ main (int argc, char **argv)
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/Adapter_Activator/server.dsp b/TAO/examples/POA/Adapter_Activator/server.dsp
index 6dd9ccb2a72..54adc81d7aa 100644
--- a/TAO/examples/POA/Adapter_Activator/server.dsp
+++ b/TAO/examples/POA/Adapter_Activator/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index e86fe3ffbfd..7adc29a9630 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -6,7 +6,7 @@
 ACE_RCSID(DSI, Database_i, "$Id$")
 
 DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc (void)
-  //  : DATABASE_MALLOC ()
+//  : DATABASE_MALLOC ()
 {
 }
 
diff --git a/TAO/examples/POA/DSI/client.dsp b/TAO/examples/POA/DSI/client.dsp
index dcd5bc292cf..fdf52ef6abe 100644
--- a/TAO/examples/POA/DSI/client.dsp
+++ b/TAO/examples/POA/DSI/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 tao.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "POA DSI Client - Win32 Debug"

diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl
index d6f3b2ff7bb..e0fae9a8394 100755
--- a/TAO/examples/POA/DSI/run_test.pl
+++ b/TAO/examples/POA/DSI/run_test.pl
@@ -5,38 +5,40 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfile = "server.ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile -x");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", " -f $iorfile");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (5);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+		       " -f $iorfile -x");
 
-unlink $iorfile;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
+  
+unlink $iorfile;
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 33678266e96..9fc3fc567d2 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -81,27 +81,29 @@ main (int argc, char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
+  char str[256];
   ACE_TRY
     {
+      ACE_OS::strcpy (str,"CORBA::ORB_init");
       // Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+
       int result = parse_args (argc, argv);
       if (result != 0)
         return result;
 
-      // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // Get the Root POA object reference
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
+      ACE_OS::strcpy (str,"PortableServer::POA::_narrow");
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
                                                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager");
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -109,32 +111,38 @@ main (int argc, char **argv)
       CORBA::PolicyList policies (5);
       policies.length (5);
 
+      ACE_OS::strcpy (str, "PortableServer::POA::create_id_assignment_policy");
       // ID Assignment Policy
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
       // Lifespan Policy
       policies[1] =
         root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
                                           ACE_TRY_ENV);
 
+      ACE_OS::strcpy (str,"PortableServer::POA::create_request_processing_policy");
       // Request Processing Policy
       policies[2] =
         root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT,
                                                     ACE_TRY_ENV);
 
+      ACE_OS::strcpy (str,"PortableServer::POA::create_servant_retention_policy");
       // Servant Retention Policy
       policies[3] =
         root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_OS::strcpy (str,"PortableServer::POA::create_id_uniqueness_policy");
       // Id Uniqueness Policy
       policies[4] =
         root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
 
       ACE_TRY_CHECK;
 
+      ACE_OS::strcpy (str,"PortableServer::POA::create_POA");
       ACE_CString name = "firstPOA";
       PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                                 poa_manager.in (),
@@ -142,6 +150,7 @@ main (int argc, char **argv)
                                                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
       for (CORBA::ULong i = 0;
            i < policies.length ();
            ++i)
@@ -160,15 +169,19 @@ main (int argc, char **argv)
       PortableServer::ObjectId_var database_agent_oid =
         PortableServer::string_to_ObjectId ("DatabaseAgent");
 
+      ACE_OS::strcpy (str, "PortableServer::POA::activate_object_with_id");
       first_poa->activate_object_with_id (database_agent_oid.in (),
                                           &database_agent_impl,
                                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_OS::strcpy (str, "PortableServer::POA::id_to_reference");
       CORBA::Object_var database_agent =
         first_poa->id_to_reference (database_agent_oid.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
+      ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
+
       // Get the IOR for the "DatabaseAgent" object
       CORBA::String_var database_agent_ior =
         orb->object_to_string (database_agent.in (), ACE_TRY_ENV);
@@ -181,21 +194,22 @@ main (int argc, char **argv)
       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
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
       return -1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+ ACE_CHECK_RETURN (-1);
 
-  return 0;
+ return 0;
 }
diff --git a/TAO/examples/POA/DSI/server.dsp b/TAO/examples/POA/DSI/server.dsp
index f42c6e5489f..86910bcb960 100644
--- a/TAO/examples/POA/DSI/server.dsp
+++ b/TAO/examples/POA/DSI/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 29fd3c344cf..cbcc30de1aa 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -20,9 +20,9 @@ ACE_RCSID(Default_Servant, File_i, "$Id$")
 
 // IDL File::System constructor
 FileImpl::System::System (PortableServer::POA_ptr poa)
-  : poa_ (PortableServer::POA::_duplicate (poa)),
-    // Create the Default Descriptor Servant
-    fd_servant_ (poa)
+ : poa_ (PortableServer::POA::_duplicate (poa)),
+   // Create the Default Descriptor Servant
+   fd_servant_ (poa)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   // set the default servant of the POA
@@ -50,7 +50,7 @@ FileImpl::System::open (const char *file_name,
   // Do an ACE_OS::open
   ACE_HANDLE file_descriptor = ACE_OS::open (file_name,
                                              flags,
-                                             ACE_DEFAULT_FILE_PERMS);
+                                             0644);
 
   if (file_descriptor == ACE_INVALID_HANDLE)
     {
diff --git a/TAO/examples/POA/Default_Servant/client.dsp b/TAO/examples/POA/Default_Servant/client.dsp
index d97916bdc84..148b016b1d1 100644
--- a/TAO/examples/POA/Default_Servant/client.dsp
+++ b/TAO/examples/POA/Default_Servant/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl
index c232bbd92b8..c303370d131 100755
--- a/TAO/examples/POA/Default_Servant/run_test.pl
+++ b/TAO/examples/POA/Default_Servant/run_test.pl
@@ -5,39 +5,38 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../../../bin";
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
-$status = 0;
+$iorfile = "server.ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k $iorfile");
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile");
 
-$SV->Spawn ();
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
+
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			" -k $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->TerminateWaitKill (10);
+$SV->Kill (); $SV->TimedWait (1);
 
 unlink $iorfile;
 unlink "test"; # created by the program
 
 if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 534d4e4c43b..6d786bcc182 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -70,11 +70,8 @@ main (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // Get the Root POA object reference
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
       // Narrow the object reference to a POA reference
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
@@ -86,7 +83,7 @@ main (int argc, char **argv)
       CORBA::PolicyList policies (5);
       policies.length (5);
 
-      // ID Assignment Policy
+  // ID Assignment Policy
       policies[0] =
         root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -164,9 +161,8 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Run the ORB
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/Default_Servant/server.dsp b/TAO/examples/POA/Default_Servant/server.dsp
index 002a2e1635d..3b30549e78a 100644
--- a/TAO/examples/POA/Default_Servant/server.dsp
+++ b/TAO/examples/POA/Default_Servant/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index 29e0df4b70f..4b673eee354 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -5,10 +5,10 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorfile = "ior";
 
 $oneway = "";
 $iterations = 100;
@@ -16,30 +16,39 @@ $iterations = 100;
 $extra_args = "";
 
 # Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++) {
-    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;
+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;
     }
-    elsif ($ARGV[$i] eq "-o") {
-        $oneway = "-o";
+    if ($ARGV[$i] eq "-o")
+    {
+      $oneway = "-o";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-f") {
-        $iorfile = $ARGV[$i + 1];
-        $i++;
-    }
-    else {
-        $extra_args .= " " . $ARGV[$i];
+    if ($ARGV[$i] eq "-f")
+    {
+      $iorfile = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+    $extra_args .= " " . $ARGV[$i];
+  }
 }
 
 $iorfile_1 = $iorfile."_1";
@@ -50,67 +59,70 @@ unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-$status = 0;
-
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
-$CL = new PerlACE::Process ("../Generic_Servant/client");
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-if (PerlACE::waitforfile_timed ($iorfile_1, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_1, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_2, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_3, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_3>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_3, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_3>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_1");
+$CL_1  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_1");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
+$client_1 = $CL_1->TimedWait (60);
+if ($client_1 == -1) {
+  print STDERR "ERROR: client 1 timedout\n";
+  $CL_1->Kill (); $CL_1->TimedWait (1);
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_2");
-
-$client = $CL->SpawnWaitKill (60);
+$CL_2  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_2");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
+$client_2 = $CL_2->TimedWait (60);
+if ($client_2 == -1) {
+  print STDERR "ERROR: client 2 timedout\n";
+  $CL_2->Kill (); $CL_2->TimedWait (1);
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_3 -x");
+$CL_3  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_3 -x");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 3 returned $client\n";
-    $status = 1;
+$client_3 = $CL_3->TimedWait (60);
+if ($client_3 == -1) {
+  print STDERR "ERROR: client 3 timedout\n";
+  $CL_3->Kill (); $CL_3->TimedWait (1);
 }
 
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 unlink $iorfile_3;
 
-exit $status;
+if ($server != 0 ||
+    $client_1 != 0 ||
+    $client_2 != 0 ||
+    $client_3 != 0)
+{
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 45845344730..cfd49439658 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -140,10 +140,8 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
+                                                               ACE_TRY_ENV);
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
@@ -311,8 +309,8 @@ main (int argc, char **argv)
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
 
       ACE_TIMEPROBE_PRINT;
     }
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index c39ef88b454..632ac463cea 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -29,17 +29,19 @@ main (int argc, char **argv)
   ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize the ORB
+  char str[256]; // Exception message
   ACE_TRY
     {
+      ACE_OS::strcpy (str, "CORBA::ORB_init");
+
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Obtain the RootPOA.
+      // Get Object reference to RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
+      ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
       // Narrow Object reference to RootPOA to a POA reference.
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in(), ACE_TRY_ENV);
@@ -59,12 +61,14 @@ main (int argc, char **argv)
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
+      ACE_OS::strcpy (str,"PortableServer::POA::the_activator");
       root_poa->the_activator (activator.in (),
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Try to find a childPOA of RootPOA named firstPOA
       ACE_CString name = "firstPOA";
+      ACE_OS::strcpy (str,"PortableServer::POA::find_POA");
       PortableServer::POA_var first_poa =
         root_poa->find_POA (name.c_str (),
                             1,
@@ -79,6 +83,8 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Get the names of all the POAs
+      ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
+
       CORBA::String_var root_poa_name =
         root_poa->the_name (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -99,7 +105,7 @@ main (int argc, char **argv)
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
       return -1;
     }
   ACE_ENDTRY;
diff --git a/TAO/examples/POA/FindPOA/FindPOA.dsp b/TAO/examples/POA/FindPOA/FindPOA.dsp
index c38739d7e5d..ed91441a4e1 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.dsp
+++ b/TAO/examples/POA/FindPOA/FindPOA.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/FindPOA/run_test.pl b/TAO/examples/POA/FindPOA/run_test.pl
index 87656fc7ba2..431a4597054 100755
--- a/TAO/examples/POA/FindPOA/run_test.pl
+++ b/TAO/examples/POA/FindPOA/run_test.pl
@@ -5,16 +5,15 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$T = new PerlACE::Process ("FindPOA");
+$TEST  = Process::Create ($EXEPREFIX."FindPOA$EXE_EXT","");
 
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+if ($TEST->TimedWait (60) == -1){
+  print STDERR "ERROR: test timedout\n";
+  $TEST->Kill (); $TEST->TimedWait(1);
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/examples/POA/Forwarding/client.dsp b/TAO/examples/POA/Forwarding/client.dsp
index 87f133ca813..6d5579696fb 100644
--- a/TAO/examples/POA/Forwarding/client.dsp
+++ b/TAO/examples/POA/Forwarding/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl
index 6e0a37f8879..691b85f2e21 100755
--- a/TAO/examples/POA/Forwarding/run_test.pl
+++ b/TAO/examples/POA/Forwarding/run_test.pl
@@ -6,77 +6,100 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+
+# Set STDERR to autoflush (weird unbufferd output stuff)
+$| = 1;
 
 # Make pretty look thing
 print STDERR "\n";
 
-$status = 0;
-
-$iorfile1 = PerlACE::LocalFile ("server1.ior");
-$iorfile2 = PerlACE::LocalFile ("server2.ior");
-$iorfile3 = PerlACE::LocalFile ("server3.ior");
-
-unlink $iorfile1, $iorfile2, $iorfile3;
-
-$SV1 = new PerlACE::Process ("server", "-o $iorfile1");
-$SV2 = new PerlACE::Process ("server", "-o $iorfile2 -f file://$iorfile1");
-$SV3 = new PerlACE::Process ("server", "-o $iorfile3 -f file://$iorfile2");
-$CL  = new PerlACE::Process ("client", "-s 3 -k file://$iorfile3");
-
-
-$SV1->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile1, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile1>\n";
-    $SV1->Kill (); 
-    exit 1;
+# IOR files must be cleaned up before next run
+sub cleanup_ior
+{
+    unlink "server1", "server2", "server3";
 }
 
-$SV2->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile2, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV1->Kill (); 
-    $SV2->Kill ();
-    exit 1;
-}
-
-$SV3->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile3, 15) == -1) {
-    print STDERR "ERROR: cannot find file <server3>\n";
-    $SV1->Kill (); 
-    $SV2->Kill ();
-    $SV3->Kill ();
-    exit 1;
-}
+# Run the test in it's three forms
+sub run_test
+{
+    # Run the servers
+    $args = "-o server1";
+    $SRV1 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                             $args);
+    print STDERR ("server $args\n");
+
+    if (ACE::waitforfile_timed ("server1", 15) == -1) 
+    {
+        print STDERR "ERROR: cannot find file <server1> or <server2>\n";
+        $SRV1->Kill (); $SRV1->TimedWait (1);
+        exit 1;
+    }
     
-$client  = $CL->SpawnWaitKill (60);
-$server1 = $SV1->WaitKill (10);
-$server2 = $SV2->WaitKill (10);
-$server3 = $SV3->WaitKill (10);
-
-unlink $iorfile1, $iorfile2, $iorfile3;
+    $args = "-o server2 -f file://server1";
+    $SRV2 = Process::Create  ($EXEPREFIX."server".$EXE_EXT,
+                              $args);
+    print STDERR ("server $args\n");
     
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-} 
-
-if ($server1 != 0) {
-    print STDERR "ERROR: server 1 returned $server\n";
-    $status = 1;
-} 
-
-if ($server2 != 0) {
-    print STDERR "ERROR: server 2 returned $server\n";
-    $status = 1;
-} 
+    if (ACE::waitforfile_timed ("server2", 15) == -1) 
+    {
+        print STDERR "ERROR: cannot find file <server1> or <server2>\n";
+        $SRV1->Kill (); $SRV1->TimedWait (1);
+        $SRV2->Kill (); $SRV2->TimedWait (1);
+        exit 1;
+    }
+
+    $args = "-o server3 -f file://server2";
+    $SRV3 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                             $args);
+    print STDERR ("server $args\n");
+    
+    if (ACE::waitforfile_timed ("server3", 15) == -1) 
+    {
+	print STDERR "ERROR: cannot find file <server3>\n";
+	$SRV1->Kill (); $SRV1->TimedWait (1);
+	$SRV2->Kill (); $SRV2->TimedWait (1);
+	$SRV3->Kill (); $SRV3->TimedWait (1);
+	exit 1;
+    }
+    
+    # Run the client and block until completion
+    $args = "-s 3 -k file://server3";
+    $CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+			   $args);
+    print STDERR ("client $args\n");
+    
+    $client = $CL->TimedWait (60);
+    if ($client == -1) {
+        print STDERR "ERROR: client timedout\n";
+        $CL->Kill (); $CL->TimedWait (1);
+    }
+    
+    # Now that the client has finished, kill off the servers
+    if ($SRV1->TimedWait (10) == -1 ||
+        $SRV2->TimedWait (10) == -1 ||
+        $SRV3->TimedWait (10)) 
+    {
+        print STDERR "ERROR: couldn't terminate the servers nicely\n";
+        $SRV1->Kill (); $SRV1->TimedWait (1);
+        $SRV2->Kill (); $SRV2->TimedWait (1);
+        $SRV3->Kill (); $SRV3->TimedWait (1);
+        $status = 1;
+    }
+    
+    if ($client != 0) 
+    {
+        print STDERR ("\nTest FAILED\n");
+        $status = -1;
+    } 
+    else 
+    {
+        print STDERR ("\nTest SUCCEEDED\n");
+    }
+    return $status;
+}
 
-if ($server3 != 0) {
-    print STDERR "ERROR: server 3 returned $server\n";
-    $status = 1;
-} 
+cleanup_ior ();
+run_test ();
+cleanup_ior ();
 
-exit $status;
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index 43be0d9f24d..64879ed88ef 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -186,9 +186,7 @@ main (int argc,
 
       // Obtain the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (obj.in (),
@@ -214,11 +212,14 @@ main (int argc,
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run (ACE_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "CORBA::ORB::run"),
+                          -1);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->destroy ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/Forwarding/server.dsp b/TAO/examples/POA/Forwarding/server.dsp
index 7003c73b780..418cf589518 100644
--- a/TAO/examples/POA/Forwarding/server.dsp
+++ b/TAO/examples/POA/Forwarding/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/Generic_Servant/client.dsp b/TAO/examples/POA/Generic_Servant/client.dsp
index c9b9ff6ecff..da6a41ff98c 100644
--- a/TAO/examples/POA/Generic_Servant/client.dsp
+++ b/TAO/examples/POA/Generic_Servant/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index fe07a02a6b8..68d3199b557 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -6,8 +6,8 @@
 ACE_RCSID(Loader, Server_Manager, "$Id$")
 
 Server_i::Server_i(void)
-  : ior_output_file_ (0),
-    policies_ (4)
+    : ior_output_file_ (0),
+      policies_ (4)
 {
 }
 
@@ -123,11 +123,9 @@ Server_i::init (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Obtain the RootPOA.
+      // Get an Object reference to RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA",
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("RootPOA");
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
@@ -189,16 +187,16 @@ Server_i::create_poa (const char *name,
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
-        policies_[3] =
-          root_poa_->create_servant_retention_policy
-          (PortableServer::RETAIN,
-           ACE_TRY_ENV);
+      policies_[3] =
+        root_poa_->create_servant_retention_policy
+        (PortableServer::RETAIN,
+         ACE_TRY_ENV);
 
       if (servant_retention_policy == 0)
-        policies_[3] =
-          root_poa_->create_servant_retention_policy
-          (PortableServer::NON_RETAIN,
-           ACE_TRY_ENV);
+      policies_[3] =
+        root_poa_->create_servant_retention_policy
+        (PortableServer::NON_RETAIN,
+         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -342,12 +340,12 @@ Server_i::run (void)
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in (),
-                                ACE_TRY_ENV);
+                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
-                                ACE_TRY_ENV);
+                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -369,8 +367,11 @@ Server_i::run (void)
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb_->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "CORBA::ORB::run"),
+                          -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index 9a8ff679ab4..a849b92bac7 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -5,20 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorfile = "ior";
 
-$status = 0;
 $oneway = "";
 $iterations = 100;
 
 $extra_args = "";
 
 # Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
+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";
@@ -27,20 +30,25 @@ for ($i = 0; $i <= $#ARGV; $i++) {
       print "-o                  -- call issued are oneways\n";
       exit;
     }
-    elsif ($ARGV[$i] eq "-o") {
-        $oneway = "-o";
+    if ($ARGV[$i] eq "-o")
+    {
+      $oneway = "-o";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-f") {
-        $iorfile = $ARGV[$i + 1];
-        $i++;
-    }
-    else {
-        $extra_args .= " " . $ARGV[$i];
+    if ($ARGV[$i] eq "-f")
+    {
+      $iorfile = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+    $extra_args .= " " . $ARGV[$i];
+  }
 }
 
 $iorfile_1 = $iorfile."_1";
@@ -49,49 +57,50 @@ $iorfile_2 = $iorfile."_2";
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
-$CL = new PerlACE::Process ("../Generic_Servant/client");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_2, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_1");
 
-$client = $CL->SpawnWaitKill (60);
+$CL_1  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			 " $extra_args $oneway -i $iterations -f $iorfile_1");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
+$client_1 = $CL_1->TimedWait (60);
+if ($client_1 == -1) {
+  print STDERR "ERROR: client 1 timedout\n";
+  $CL_1->Kill (); $CL_1->TimedWait (1);
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_2 -x");
-
-$client = $CL->SpawnWaitKill (60);
+$CL_2  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
+$client_2 = $CL_2->TimedWait (60);
+if ($client_2 == -1){
+  print STDERR "ERROR: client 2 timedout\n";
+  $CL_2->Kill (); $CL_2->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-exit $status;
+if ($server !=0 || $client_1 != 0 || $client_2 != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 5d1499f6118..596e6e32095 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -67,11 +67,9 @@ main (int argc, char **argv)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Obtain the RootPOA.
+      // Obtain the object reference to the RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // _narrow() the Object to get the POA object, i.e., the root_poa.
       PortableServer::POA_var root_poa =
diff --git a/TAO/examples/POA/NewPOA/NewPOA.dsp b/TAO/examples/POA/NewPOA/NewPOA.dsp
index cb39e6c5867..957ed993c42 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.dsp
+++ b/TAO/examples/POA/NewPOA/NewPOA.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/NewPOA/run_test.pl b/TAO/examples/POA/NewPOA/run_test.pl
index 15c52166829..ab550847c8d 100755
--- a/TAO/examples/POA/NewPOA/run_test.pl
+++ b/TAO/examples/POA/NewPOA/run_test.pl
@@ -5,16 +5,13 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$T = new PerlACE::Process ("NewPOA");
-
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$TEST  = Process::Create ($EXEPREFIX."NewPOA$EXE_EXT", "");
+if ($TEST->TimedWait (60) == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $TEST->Kill (); $TEST->TimedWait (1);
+  exit 1;
 }
-
 exit 0;
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index 7daf906a9ef..4ecc0919225 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -5,10 +5,10 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorfile = "ior";
 
 $oneway = "";
 $iterations = 100;
@@ -16,30 +16,39 @@ $iterations = 100;
 $extra_args = "";
 
 # Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++) {
-    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;
+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;
     }
-    elsif ($ARGV[$i] eq "-o") {
-        $oneway = "-o";
+    if ($ARGV[$i] eq "-o")
+    {
+      $oneway = "-o";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-f") {
-        $iorfile = $ARGV[$i + 1];
-        $i++;
-    }
-    else {
-        $extra_args .= " " . $ARGV[$i];
+    if ($ARGV[$i] eq "-f")
+    {
+      $iorfile = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+    $extra_args .= " " . $ARGV[$i];
+  }
 }
 
 $iorfile_1 = $iorfile."_1";
@@ -48,51 +57,49 @@ $iorfile_2 = $iorfile."_2";
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
-$CL = new PerlACE::Process ("../Generic_Servant/client");
-
-$status = 0;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile_1, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_1>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_1, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile_2, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile_2>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_2, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_1");
-
-$client = $CL->SpawnWaitKill (60);
+$CL_1  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  "$extra_args $oneway -i $iterations -f $iorfile_1");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
+$client_1 = $CL_1->TimedWait (60);
+if ($client_1 == -1) {
+  print STDERR "ERROR: client 1 timedout\n";
+  $CL_1->Kill (); $CL_1->TimedWait (1);
 }
 
-$CL->Arguments ("$extra_args $oneway -i $iterations -f $iorfile_2 -x");
+$CL_2  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  "$extra_args $oneway -i $iterations -f $iorfile_2 -x");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
+$client_2 = $CL_2->TimedWait (60);
+if ($client_2 == -1) {
+  print STDERR "ERROR: client 2 timedout\n";
+  $CL_2->Kill (); $CL_2->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-exit $status;
+if ($server != 0 || $client_1 != 0 || $client_2 != 0){
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 5dd24227734..31488ddea2f 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -112,11 +112,9 @@ main (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Obtain the RootPOA.
+      // Get an Object reference to RootPOA.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       // Narrow the Object reference to a POA reference
       PortableServer::POA_var root_poa =
@@ -266,8 +264,8 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/On_Demand_Activation/server.dsp b/TAO/examples/POA/On_Demand_Activation/server.dsp
index 343f1aac054..72f35174b38 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.dsp
+++ b/TAO/examples/POA/On_Demand_Activation/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 966751c4dd4..f6af48b38e1 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -5,8 +5,8 @@
 ACE_RCSID(On_Demand_Loading, Server_Manager, "$Id$")
 
 Server_i::Server_i(void)
-  : ior_output_file_ (0),
-    policies_ (4)
+    : ior_output_file_ (0),
+      policies_ (4)
 {
 }
 
@@ -122,11 +122,9 @@ Server_i::init (int argc, char **argv)
       if (result != 0)
         return result;
 
-      // Obtain the RootPOA.
+      // Get an Object reference to RootPOA.
       CORBA::Object_var obj =
-        orb_->resolve_initial_references ("RootPOA",
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("RootPOA");
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
@@ -186,17 +184,17 @@ Server_i::create_poa (const char *name,
 
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
-        policies_[3] =
-          root_poa_->create_servant_retention_policy
-          (PortableServer::RETAIN,
-           ACE_TRY_ENV);
+      policies_[3] =
+        root_poa_->create_servant_retention_policy
+        (PortableServer::RETAIN,
+         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       if (servant_retention_policy == 0)
-        policies_[3] =
-          root_poa_->create_servant_retention_policy
-          (PortableServer::NON_RETAIN,
-           ACE_TRY_ENV);
+      policies_[3] =
+        root_poa_->create_servant_retention_policy
+        (PortableServer::NON_RETAIN,
+         ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Create myPOA as the child of RootPOA with the above
@@ -332,12 +330,12 @@ Server_i::run (void)
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in (),
-                                ACE_TRY_ENV);
+                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
-                                ACE_TRY_ENV);
+                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Print the ior's of first_foo and second_foo.
@@ -359,8 +357,11 @@ Server_i::run (void)
       ACE_TRY_CHECK;
 
       // Run the ORB.
-      orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb_->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "CORBA::ORB::run"),
+                          -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index e6c8c8f2195..b21ee5ad8af 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -5,8 +5,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
 $iorfile = "ior";
 
@@ -15,82 +15,93 @@ $iterations = 100;
 
 $extra_args = "";
 
-$status = 0;
-
 # Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++) {
-    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;
+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;
     }
-    elsif ($ARGV[$i] eq "-o") {
+    if ($ARGV[$i] eq "-o")
+    {
       $oneway = "-o";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
+    if ($ARGV[$i] eq "-i")
+    {
       $iterations = $ARGV[$i + 1];
       $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-f") {
+    if ($ARGV[$i] eq "-f")
+    {
       $iorfile = $ARGV[$i + 1];
       $i++;
+      last SWITCH;
     }
-    else {
-        $extra_args .= " " . $ARGV[$i];
-    }
+    $extra_args .= " " . $ARGV[$i];
+  }
 }
 
-$iorfile1 = $iorfile."_1";
-$iorfile2 = $iorfile."_2";
+$iorfile_1 = $iorfile."_1";
+$iorfile_2 = $iorfile."_2";
 
-unlink $iorfile1, $iorfile2;
+unlink $iorfile_1;
+unlink $iorfile_2;
 
-$SV  = new PerlACE::Process ("server", "-f $iorfile $extra_args");
-$CL1 = new PerlACE::Process ("../Generic_Servant/client", 
-                             "$extra_args $oneway -i $iterations -f $iorfile1");
-$CL2 = new PerlACE::Process ("../Generic_Servant/client",
-                             "$extra_args $oneway -i $iterations -f $iorfile2 -x"); 
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile1, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile1>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_1, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_1>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($iorfile2, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_2, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile_2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL1->SpawnWaitKill (60);
 
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
-}
 
-$client = $CL2->SpawnWaitKill (60);
+$CL_1  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_1");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
+$client_1 = $CL_1->TimedWait (60);
+if ($client_1 == -1) {
+  print STDERR "ERROR: client 1 timedout\n";
+  $CL_1->Kill (); $CL_1->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$CL_2  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			  " $extra_args $oneway -i $iterations -f $iorfile_2 -x");
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $SV->Kill (); 
-    $status = 1;
+$client_2 = $CL_2->TimedWait (60);
+if ($client_2 == -1) {
+  print STDERR "ERROR: client 2 timedout\n";
+  $CL_2->Kill (); $CL_2->TimedWait (1);
 }
 
-unlink $iorfile1, $iorfile2;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
+
+unlink $iorfile_1;
+unlink $iorfile_2;
+
+if ($server != 0 || $client_1 != 0 || $client_2 != 0) {
+  exit 1;
+}
 
-exit $status;
+exit 0;
diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
index 99631aec9c6..dcdcbfa92ac 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -5,10 +5,10 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("poa.ior");
+$iorfile = "ior";
 
 $oneway = "";
 $iterations = 100;
@@ -16,61 +16,70 @@ $iterations = 100;
 $extra_args = "";
 
 # Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++) {
-    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;
+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;
     }
-    elsif ($ARGV[$i] eq "-o") {
-        $oneway = "-o";
+    if ($ARGV[$i] eq "-o")
+    {
+      $oneway = "-o";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-f") {
-        $iorfile = $ARGV[$i + 1];
-        $i++;
-    }
-    else {
-        $extra_args .= " " . $ARGV[$i];
+    if ($ARGV[$i] eq "-f")
+    {
+      $iorfile = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+    $extra_args .= " " . $ARGV[$i];
+  }
 }
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
-$CL = new PerlACE::Process ("../Generic_Servant/client", "$extra_args $oneway -i $iterations -f $iorfile -x");
-
-$status = 0;
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-f $iorfile $extra_args");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ("../Generic_Servant/client$EXE_EXT ",
+			" $extra_args $oneway -i $iterations -f $iorfile -x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0){
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
index 7549c897e63..012a98199da 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
@@ -124,10 +124,7 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
@@ -172,8 +169,8 @@ main (int argc, char **argv)
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.dsp b/TAO/examples/POA/Reference_Counted_Servant/server.dsp
index a53303ee6c0..efa67573d53 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.dsp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index b6ab90b0029..f8ea52c8152 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -37,8 +37,7 @@ main (int argc, char **argv)
       // Resolve the initial references for the name RootPOA thus getting
       // an object of type CORBA::Object.
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // apply _narrow on the object of type CORBA::Object, to make it
diff --git a/TAO/examples/POA/RootPOA/RootPOA.dsp b/TAO/examples/POA/RootPOA/RootPOA.dsp
index 514e9da5336..cfd3aa19f65 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.dsp
+++ b/TAO/examples/POA/RootPOA/RootPOA.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/RootPOA/run_test.pl b/TAO/examples/POA/RootPOA/run_test.pl
index c0f3a87b057..e54f8e731a5 100755
--- a/TAO/examples/POA/RootPOA/run_test.pl
+++ b/TAO/examples/POA/RootPOA/run_test.pl
@@ -5,16 +5,20 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
 
-$T = new PerlACE::Process ("RootPOA");
+$T = Process::Create ($EXEPREFIX."RootPOA".$EXE_EXT);
 
-$test = $T->SpawnWaitKill (60);
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/examples/POA/TIE/client.dsp b/TAO/examples/POA/TIE/client.dsp
index 6e057006e8c..d4d8a86d924 100644
--- a/TAO/examples/POA/TIE/client.dsp
+++ b/TAO/examples/POA/TIE/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/POA/TIE/run_test.pl b/TAO/examples/POA/TIE/run_test.pl
index 6b31ad1ad2b..a29847cd8a2 100755
--- a/TAO/examples/POA/TIE/run_test.pl
+++ b/TAO/examples/POA/TIE/run_test.pl
@@ -5,12 +5,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
 
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("ior");
+$iorfile = "ior";
 
 $iorfile_1 = $iorfile."_1";
 $iorfile_2 = $iorfile."_2";
@@ -26,41 +26,34 @@ unlink $iorfile_4;
 unlink $iorfile_5;
 unlink $iorfile_6;
 
-$SV = new PerlACE::Process ("server");
-$CL1 = new PerlACE::Process ("client",
-                             "-a file://$iorfile_1 -b file://$iorfile_2 -c file://$iorfile_3 -d file://$iorfile_4");
-$CL2 = new PerlACE::Process ("client", "-e file://$iorfile_5 -f file://$iorfile_6");
-
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT");
 
 # In this example all the files are written out at the same time. So  make a
 # check only for the first file
-if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) {
-    print STDERR "ERROR: cannot find ior files\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile_1, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL1->SpawnWaitKill (60);
+$client  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                            "-a file://$iorfile_1 -b file://$iorfile_2 -c file://$iorfile_3 -d file://$iorfile_4");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimedWait (1);
 }
 
-$client = $CL2->SpawnWaitKill (60);
+if (ACE::waitforfile_timed ($iorfile_5,1) == 0) {
+  $client  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                              " -e file://$iorfile_5 -f file://$iorfile_6");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
+  if ($client->TimedWait (60) == -1) {
+    print STDERR "ERROR: client timedout\n";
     $status = 1;
+    $client->Kill (); $client->TimedWait (1);
+  }
 }
 
 unlink $iorfile_1;
@@ -70,4 +63,10 @@ unlink $iorfile_4;
 unlink $iorfile_5;
 unlink $iorfile_6;
 
+$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: couldn't terminate server nicely\n";
+  $status = 1;
+  $SV->Kill (); $SV->TimedWait (1);
+}
+
 exit $status;
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index 66dd5bef4b5..c4d8558e5fb 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -35,10 +35,7 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
       ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
 
@@ -251,8 +248,8 @@ main (int argc, char **argv)
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/POA/TIE/server.dsp b/TAO/examples/POA/TIE/server.dsp
index a8c7e7d4fbd..1d3ea15a9ae 100644
--- a/TAO/examples/POA/TIE/server.dsp
+++ b/TAO/examples/POA/TIE/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp
index 20e3264b259..1e90bc2fe9a 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Client_Files.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

 

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

 

diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp
index 042bdf7739f..b29309fe2fe 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Second_Client_Files.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /out:"Release/persistent_client.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /out:"persistent_client.exe" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

 

 !ENDIF 

 

diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp b/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp
index b88be173bf5..1bfc034eb96 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid_Server_Files.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO.lib TAO_CosNaming.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Release/server.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAO.lib TAO_CosNaming.lib ace.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib TAO_CosNamingd.lib aced.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAOd.lib TAO_CosNamingd.lib aced.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

 

 !ENDIF 

 

diff --git a/TAO/examples/Persistent_Grid/run_test.pl b/TAO/examples/Persistent_Grid/run_test.pl
index eda66975a42..91ac2ec3544 100755
--- a/TAO/examples/Persistent_Grid/run_test.pl
+++ b/TAO/examples/Persistent_Grid/run_test.pl
@@ -6,63 +6,49 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+require Process;
 
-$iorfile = PerlACE::LocalFile ("grid.ior");
-$mem     = PerlACE::LocalFile ("foo");
-$status  = 0;
+$iorfile = "grid.ior";
+$mem     = "foo";
 
-$SV  = new PerlACE::Process ("server", "-o $iorfile -m $mem");
-$CL  = new PerlACE::Process ("client", "-k file://$iorfile");
-$PCL = new PerlACE::Process ("persistent_client", "-k file://$iorfile -w 10 -h 10");
+$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile -m $mem");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: Could not find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client  = Process::Create ($EXEPREFIX."client$Process::EXE_EXT -k file://$iorfile ");
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimeWait (1);
 }
 
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+$SV->Kill (); $SV->TimedWait (1);
 
 unlink $iorfile;
 
-$SV->Spawn ();
+$server = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile -m $mem");
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: Could not find file <$iorfile>\n";
-    $server->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $server->Kill (); $server->TimedWait (1);
+  exit 1;
 }
 
-$pclient = $PCL->SpawnWaitKill (60);
+$per_client  = Process::Create ($EXEPREFIX."persistent_client$Process::EXE_EXT -k file://$iorfile -w 10 -h 10");
 
-if ($pclient != 0) {
-    print STDERR "ERROR: persistent client returned $pclient\n";
-    $status = 1;
+if ($per_client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $perclient->Kill (); $per_client->TimeWait (1);
 }
 
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+$server->Kill (); $server->TimedWait (1);
 
 unlink $iorfile;
 unlink $mem;
-
 exit $status;
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp
deleted file mode 100644
index af5aad208c2..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.cpp
+++ /dev/null
@@ -1,874 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-#include "DIOP_Acceptor.h"
-#include "DIOP_Profile.h"
-#include "tao/MProfile.h"
-#include "tao/ORB_Core.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/debug.h"
-#include "tao/Protocols_Hooks.h"
-
-#include "ace/Auto_Ptr.h"
-
-#if !defined(__ACE_INLINE__)
-#include "DIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, DIOP_Acceptor, "$Id$")
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Acceptor<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Strategy_Acceptor<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Accept_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>;
-template class ACE_Scheduling_Strategy<TAO_DIOP_Connection_Handler>;
-template class TAO_Creation_Strategy<TAO_DIOP_Connection_Handler>;
-template class TAO_Concurrency_Strategy<TAO_DIOP_Connection_Handler>;
-template class TAO_Accept_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Acceptor<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-TAO_DIOP_Acceptor::TAO_DIOP_Acceptor (CORBA::Boolean flag)
-  : TAO_Acceptor (TAO_TAG_UDP_PROFILE),
-    addrs_ (0),
-    hosts_ (0),
-    endpoint_count_ (0),
-    version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
-    orb_core_ (0),
-    lite_flag_ (flag),
-    base_acceptor_ (),
-    creation_strategy_ (0),
-    concurrency_strategy_ (0),
-    accept_strategy_ (0)
-{
-}
-
-TAO_DIOP_Acceptor::~TAO_DIOP_Acceptor (void)
-{
-  // Make sure we are closed before we start destroying the
-  // strategies.
-  this->close ();
-
-  delete this->creation_strategy_;
-  delete this->concurrency_strategy_;
-  delete this->accept_strategy_;
-
-  delete [] this->addrs_;
-
-  for (size_t i = 0; i < this->endpoint_count_; ++i)
-    CORBA::string_free (this->hosts_[i]);
-
-  delete [] this->hosts_;
-}
-
-// TODO =
-//    2) For V1.[1,2] there are tagged components
-
-int
-TAO_DIOP_Acceptor::create_mprofile (const TAO_ObjectKey &object_key,
-                                    TAO_MProfile &mprofile)
-{
-  // Sanity check.
-  if (this->endpoint_count_ == 0)
-    return -1;
-
-  // If RT_CORBA is enabled, only one DIOP profile is created per
-  // <mprofile>, and all DIOP endpoints are added into that profile.
-  // If RT_CORBA is not enabled, we create a separate profile for each
-  // acceptor endpoint.
-
-#if (TAO_HAS_RT_CORBA == 1)
-
-  return create_rt_mprofile (object_key, mprofile);
-
-#else  /* TAO_HAS_RT_CORBA == 1 */
-
-  // Adding this->endpoint_count_ to the TAO_MProfile.
-  int count = mprofile.profile_count ();
-  if ((mprofile.size () - count) < this->endpoint_count_
-      && mprofile.grow (count + this->endpoint_count_) == -1)
-    return -1;
-
-  // Create a profile for each acceptor endpoint.
-  for (size_t i = 0; i < this->endpoint_count_; ++i)
-    {
-      TAO_DIOP_Profile *pfile = 0;
-      ACE_NEW_RETURN (pfile,
-                      TAO_DIOP_Profile (this->hosts_[i],
-                                        this->addrs_[i].get_port_number (),
-                                        object_key,
-                                        this->addrs_[i],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-
-      if (mprofile.give_profile (pfile) == -1)
-        {
-          pfile->_decr_refcnt ();
-          pfile = 0;
-          return -1;
-        }
-
-      if (this->orb_core_->orb_params ()->std_profile_components () == 0)
-        continue;
-
-      pfile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-      CONV_FRAME::CodeSetComponentInfo code_set_info;
-      code_set_info.ForCharData.native_code_set  =
-        TAO_DEFAULT_CHAR_CODESET_ID;
-      code_set_info.ForWcharData.native_code_set =
-        TAO_DEFAULT_WCHAR_CODESET_ID;
-      pfile->tagged_components ().set_code_sets (code_set_info);
-    }
-
-  return 0;
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
-}
-
-int
-TAO_DIOP_Acceptor::create_rt_mprofile (const TAO_ObjectKey &object_key,
-                                       TAO_MProfile &mprofile)
-{
-  size_t index = 0;
-  TAO_Profile *pfile = 0;
-  TAO_DIOP_Profile *iiop_profile = 0;
-
-  // First see if <mprofile> already contains a DIOP profile.
-  for (TAO_PHandle i = 0; i != mprofile.profile_count (); ++i)
-    {
-      pfile = mprofile.get_profile (i);
-      if (pfile->tag () == TAO_TAG_UDP_PROFILE)
-      {
-        iiop_profile = ACE_dynamic_cast (TAO_DIOP_Profile *,
-                                         pfile);
-        break;
-      }
-    }
-
-  // If <mprofile> doesn't contain a DIOP_Profile, we need to create
-  // one.
-  if (iiop_profile == 0)
-    {
-      ACE_NEW_RETURN (iiop_profile,
-                      TAO_DIOP_Profile (this->hosts_[0],
-                                        this->addrs_[0].get_port_number (),
-                                        object_key,
-                                        this->addrs_[0],
-                                        this->version_,
-                                        this->orb_core_),
-                      -1);
-      iiop_profile->endpoint ()->priority (this->priority ());
-
-      if (mprofile.give_profile (iiop_profile) == -1)
-        {
-          iiop_profile->_decr_refcnt ();
-          iiop_profile = 0;
-          return -1;
-        }
-
-      if (this->orb_core_->orb_params ()->std_profile_components () != 0)
-        {
-          iiop_profile->tagged_components ().set_orb_type (TAO_ORB_TYPE);
-
-          CONV_FRAME::CodeSetComponentInfo code_set_info;
-          code_set_info.ForCharData.native_code_set  =
-            TAO_DEFAULT_CHAR_CODESET_ID;
-          code_set_info.ForWcharData.native_code_set =
-            TAO_DEFAULT_WCHAR_CODESET_ID;
-          iiop_profile->tagged_components ().set_code_sets (code_set_info);
-        }
-
-      index = 1;
-    }
-
-  // Add any remaining acceptor endpoints to the DIOP_Profile.
-  for (;
-       index < this->endpoint_count_;
-       ++index)
-    {
-      TAO_DIOP_Endpoint *endpoint = 0;
-      ACE_NEW_RETURN (endpoint,
-                      TAO_DIOP_Endpoint (this->hosts_[index],
-                                         this->addrs_[index].get_port_number (),
-                                         this->addrs_[index]),
-                      -1);
-      endpoint->priority (this->priority_);
-      iiop_profile->add_endpoint (endpoint);
-    }
-
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::is_collocated (const TAO_Endpoint *endpoint)
-{
-  const TAO_DIOP_Endpoint *endp =
-    ACE_dynamic_cast (const TAO_DIOP_Endpoint *, endpoint);
-
-  // Make sure the dynamically cast pointer is valid.
-  if (endp == 0)
-    return 0;
-
-  for (size_t i = 0; i < this->endpoint_count_; ++i)
-    {
-      // compare the port and sin_addr (numeric host address)
-      if (endp->object_addr () == this->addrs_[i])
-        return 1;  // Collocated
-    }
-
-  return 0;  // Not collocated
-}
-
-int
-TAO_DIOP_Acceptor::close (void)
-{
-  return this->base_acceptor_.close ();
-}
-
-int
-TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core,
-                         int major,
-                         int minor,
-                         const char *address,
-                         const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("DIOP_Acceptor::open - "),
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-  if (address == 0)
-    return -1;
-
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet,
-                                                 major),
-                                ACE_static_cast (CORBA::Octet,
-                                                 minor));
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  ACE_INET_Addr addr;
-
-  const char *port_separator_loc = ACE_OS::strchr (address, ':');
-  const char *specified_hostname = 0;
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (port_separator_loc == address)
-    {
-      // The address is a port number or port name.  No hostname was
-      // specified.  The hostname for each network interface and the
-      // fully qualified domain name must be obtained.
-
-      // Check for multiple network interfaces.
-      if (this->probe_interfaces (orb_core) == -1)
-        return -1;
-
-      // First convert the port into a usable form.
-      if (addr.set (address + sizeof (':')) != 0)
-        return -1;
-
-      // Now reset the port and set the host.
-      if (addr.set (addr.get_port_number (),
-                    ACE_static_cast (ACE_UINT32, INADDR_ANY),
-                    1) != 0)
-        return -1;
-      else
-        return this->open_i (addr);
-    }
-  else if (port_separator_loc == 0)
-    {
-      // The address is a hostname.  No port was specified, so assume
-      // port zero (port will be chosen for us).
-      if (addr.set ((unsigned short) 0, address) != 0)
-        return -1;
-
-      specified_hostname = address;
-    }
-  else
-    {
-      // Host and port were specified.
-      if (addr.set (address) != 0)
-        return -1;
-
-      // Extract out just the host part of the address.
-      size_t len = port_separator_loc - address;
-      ACE_OS::memcpy (tmp_host, address, len);
-      tmp_host[len] = '\0';
-
-      specified_hostname = tmp_host;
-    }
-
-  this->endpoint_count_ = 1;  // Only one hostname to store
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  if (this->hostname (orb_core,
-                      addr,
-                      this->hosts_[0],
-                      specified_hostname) != 0)
-    return -1;
-
-  // Copy the addr.  The port is (re)set in
-  // TAO_DIOP_Acceptor::open_i().
-  if (this->addrs_[0].set (addr) != 0)
-    return -1;
-
-  return this->open_i (addr);
-}
-
-int
-TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core,
-                                 int major,
-                                 int minor,
-                                 const char *options)
-{
-  this->orb_core_ = orb_core;
-
-  if (this->init_tcp_properties () != 0)
-    return -1;
-
-  if (this->hosts_ != 0)
-    {
-      // The hostname cache has already been set!
-      // This is bad mojo, i.e. an internal TAO error.
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("DIOP_Acceptor::open_default - "),
-                         ACE_TEXT ("hostname already set\n\n")),
-                        -1);
-    }
-
-  if (major >=0 && minor >= 0)
-    this->version_.set_version (ACE_static_cast (CORBA::Octet,
-                                                 major),
-                                ACE_static_cast (CORBA::Octet,
-                                                 minor));
-
-  // Parse options
-  if (this->parse_options (options) == -1)
-    return -1;
-
-  // Check for multiple network interfaces.
-  if (this->probe_interfaces (orb_core) == -1)
-    return -1;
-
-  // Now that each network interface's hostname has been cached, open
-  // an endpoint on each network interface using the INADDR_ANY
-  // address.
-  ACE_INET_Addr addr;
-
-  // @@ Michael: The following needs to be verified.
-  if (addr.set (ACE_DEFAULT_SERVER_PORT, // old: ACE_static_cast(u_short, 0),
-                ACE_static_cast(ACE_UINT32, INADDR_ANY),
-                1) != 0)
-    return -1;
-
-  return this->open_i (addr);
-}
-
-int
-TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
-{
-  ACE_NEW_RETURN (this->creation_strategy_,
-                  TAO_DIOP_CREATION_STRATEGY (this->orb_core_,
-                                              &(this->tcp_properties_),
-                                              this->lite_flag_),
-                  -1);
-
-  ACE_NEW_RETURN (this->concurrency_strategy_,
-                  TAO_DIOP_CONCURRENCY_STRATEGY (this->orb_core_),
-                  -1);
-
-  ACE_NEW_RETURN (this->accept_strategy_,
-                  TAO_DIOP_ACCEPT_STRATEGY (this->orb_core_),
-                  -1);
-
-  // @@ Michael: UDP changes  ---------------
-
-  ACE_NEW_RETURN (this->connection_handler_,
-                  TAO_DIOP_Connection_Handler (this->orb_core_,
-                                               this->lite_flag_,
-                                               0 /* TAO_DIOP_Properties */),
-                  -1);
-
-  this->connection_handler_->addr (addr);
-  this->connection_handler_->open_server ();
-
-  this->orb_core_->reactor ()->register_handler (this->connection_handler_,
-                                          ACE_Event_Handler::READ_MASK);
-
-  // ------------------------------------
-  if (this->base_acceptor_.open (addr,
-                                 this->orb_core_->reactor (this),
-                                 this->creation_strategy_,
-                                 this->accept_strategy_,
-                                 this->concurrency_strategy_) == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) DIOP_Acceptor::open_i ")
-                    ACE_TEXT ("- %p\n\n"),
-                    ACE_TEXT ("cannot open acceptor")));
-      return -1;
-    }
-
-  ACE_INET_Addr address;
-
-  // We do this make sure the port number the endpoint is listening on
-  // gets set in the addr.
-  if (this->base_acceptor_.acceptor ().get_local_addr (address) != 0)
-    {
-      // @@ Should this be a catastrophic error???
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) DIOP_Acceptor::open_i ")
-                    ACE_TEXT ("- %p\n\n"),
-                    ACE_TEXT ("cannot get local addr")));
-      return -1;
-    }
-
-  // Set the port for each addr.  If there is more than one network
-  // interface then the endpoint created on each interface will be on
-  // the same port.  This is how a wildcard socket bind() is supposed
-  // to work.
-  u_short port = address.get_port_number ();
-  for (size_t j = 0; j < this->endpoint_count_; ++j)
-    this->addrs_[j].set_port_number (port, 1);
-
-  if (TAO_debug_level > 5)
-    {
-      for (size_t i = 0; i < this->endpoint_count_; ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ")
-                      ACE_TEXT ("listening on: <%s:%u>\n"),
-                      this->hosts_[i],
-                      this->addrs_[i].get_port_number ()));
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
-                             ACE_INET_Addr &addr,
-                             char *&host,
-                             const char *specified_hostname)
-{
-  if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      // If dotted decimal addresses are enabled,
-      // just return ours.
-      return this->dotted_decimal_address (addr, host);
-    }
-  else
-  if (specified_hostname != 0)
-    {
-      // If the user specified a hostname, pass it back
-      // blindly as it overrides our choice of hostname.
-      host = CORBA::string_dup (specified_hostname);
-    }
-  else
-    {
-      char tmp_host[MAXHOSTNAMELEN + 1];
-
-      // Get the hostname associated with our address
-      if (addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-        {
-          // On failure, just return the decimal address.
-          return this->dotted_decimal_address (addr, host);
-        }
-      else
-        {
-          host = CORBA::string_dup (tmp_host);
-        }
-    }
-
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr,
-                                           char *&host)
-{
-  const char *tmp = addr.get_host_addr ();
-  if (tmp == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) ")
-                    ACE_TEXT ("DIOP_Acceptor::dotted_decimal_address ")
-                    ACE_TEXT ("- %p\n\n"),
-                    ACE_TEXT ("cannot determine hostname")));
-      return -1;
-    }
-
-  host = CORBA::string_dup (tmp);
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core)
-{
-  // Extract the hostname for each network interface, and then cache
-  // it.  The hostnames will then be used when creating a
-  // TAO_DIOP_Profile for each endpoint setup on the probed
-  // network interfaces.
-  ACE_INET_Addr *if_addrs = 0;
-  size_t if_cnt = 0;
-
-  if (ACE::get_ip_interfaces (if_cnt,
-                              if_addrs) != 0
-      && errno != ENOTSUP)
-    {
-      // In the case where errno == ENOTSUP, if_cnt and if_addrs will
-      // not be modified, and will each remain equal to zero.  This
-      // causes the default interface to be used.
-      return -1;
-    }
-
-  if (if_cnt == 0 || if_addrs == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_WARNING,
-                      ACE_TEXT ("TAO (%P|%t) Unable to probe network ")
-                      ACE_TEXT ("interfaces.  Using default.")));
-        }
-
-      if_cnt = 1; // Force the network interface count to be one.
-      delete [] if_addrs;
-      ACE_NEW_RETURN (if_addrs,
-                      ACE_INET_Addr[if_cnt],
-                      -1);
-    }
-
-  // Scan for the loopback interface since it shouldn't be included in
-  // the list of cached hostnames unless it is the only interface.
-  size_t lo_cnt = 0;  // Loopback interface count
-  for (size_t j = 0; j < if_cnt; ++j)
-    if (if_addrs[j].get_ip_address () == INADDR_LOOPBACK)
-      lo_cnt++;
-
-  // The instantiation for this template is in
-  // tao/DIOP_Connector.cpp.
-  ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> safe_if_addrs (if_addrs);
-
-  // If the loopback interface is the only interface then include it
-  // in the list of interfaces to query for a hostname, otherwise
-  // exclude it from the list.
-  if (if_cnt == lo_cnt)
-    this->endpoint_count_ = if_cnt;
-  else
-    this->endpoint_count_ = if_cnt - lo_cnt;
-
-  ACE_NEW_RETURN (this->addrs_,
-                  ACE_INET_Addr[this->endpoint_count_],
-                  -1);
-
-  ACE_NEW_RETURN (this->hosts_,
-                  char *[this->endpoint_count_],
-                  -1);
-
-  // The number of hosts/interfaces we want to cache may not be the
-  // same as the number of detected interfaces so keep a separate
-  // count.
-  size_t host_cnt = 0;
-
-  for (size_t i = 0; i < if_cnt; ++i)
-    {
-      // Ignore any loopback interface if there are other
-      // non-loopback interfaces.
-      if (if_cnt != lo_cnt &&
-          if_addrs[i].get_ip_address() == INADDR_LOOPBACK)
-        continue;
-
-      if (this->hostname (orb_core,
-                          if_addrs[i],
-                          this->hosts_[host_cnt]) != 0)
-        return -1;
-
-      // Copy the addr.  The port is (re)set in
-      // TAO_DIOP_Acceptor::open_i().
-      if (this->addrs_[host_cnt].set (if_addrs[i]) != 0)
-        return -1;
-
-      host_cnt++;
-    }
-
-  return 0;
-}
-
-CORBA::ULong
-TAO_DIOP_Acceptor::endpoint_count (void)
-{
-  return this->endpoint_count_;
-}
-
-int
-TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
-                               TAO_ObjectKey &object_key)
-{
-  // Create the decoding stream from the encapsulation in the buffer,
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-  TAO_InputCDR cdr (profile.profile_data.mb ());
-#else
-  TAO_InputCDR cdr (ACE_reinterpret_cast(char*,profile.profile_data.get_buffer ()),
-                    profile.profile_data.length ());
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-
-  CORBA::Octet major, minor;
-
-  // Read the version. We just read it here. We don't*do any*
-  // processing.
-  if (!(cdr.read_octet (major)
-        && cdr.read_octet (minor)))
-  {
-    if (TAO_debug_level > 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) DIOP_Profile::decode - v%d.%d\n"),
-                    major,
-                    minor));
-      }
-    return -1;
-  }
-
-  CORBA::String_var host;
-  CORBA::UShort port = 0;
-
-  // Get host and port. No processing here too..
-  if (cdr.read_string (host.out ()) == 0
-      || cdr.read_ushort (port) == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) TAO_Tagged_Profile::decode - ")
-                      ACE_TEXT ("error while decoding host/port")));
-        }
-      return -1;
-    }
-
-  // ... and object key.
-  if ((cdr >> object_key) == 0)
-    return -1;
-
-  // We are NOT bothered about the rest.
-
-  return 1;
-}
-
-
-int
-TAO_DIOP_Acceptor::parse_options (const char *str)
-{
-  if (str == 0)
-    return 0;  // No options to parse.  Not a problem.
-
-  // Use an option format similar to the one used for CGI scripts in
-  // HTTP URLs.
-  // e.g.:  option1=foo&option2=bar
-
-  ACE_CString options (str);
-
-  size_t len = options.length ();
-
-  const char option_delimiter = '&';
-
-  // Count the number of options.
-
-  CORBA::ULong option_count = 1;
-  // Number of endpoints in the string  (initialized to 1).
-
-  // Only check for endpoints after the protocol specification and
-  // before the object key.
-  for (size_t i = 0; i < len; ++i)
-    if (options[i] == option_delimiter)
-      option_count++;
-
-  // The idea behind the following loop is to split the options into
-  // (option, name) pairs.
-  // For example,
-  //    `option1=foo&option2=bar'
-  // will be parsed into:
-  //    `option1=foo'
-  //    `option2=bar'
-
-  int begin = 0;
-  int end = -1;
-
-  for (CORBA::ULong j = 0; j < option_count; ++j)
-    {
-      begin += end + 1;
-
-      if (j < option_count - 1)
-        end = options.find (option_delimiter, begin);
-      else
-        end = len - begin;  // Handle last endpoint differently
-
-      if (end == begin)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("TAO (%P|%t) Zero length DIOP option.\n")),
-                          -1);
-      else if (end != ACE_CString::npos)
-        {
-          ACE_CString opt = options.substring (begin, end);
-
-          int slot = opt.find ("=");
-
-          if (slot == ACE_static_cast (int, len - 1)
-              || slot == ACE_CString::npos)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ")
-                               ACE_TEXT ("missing a value.\n"),
-                               opt.c_str ()),
-                              -1);
-
-          ACE_CString name = opt.substring (0, slot);
-          ACE_CString value = opt.substring (slot + 1);
-
-          if (name.length () == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Zero length DIOP ")
-                               ACE_TEXT ("option name.\n")),
-                              -1);
-
-          if (name == "priority")
-            {
-              CORBA::Short corba_priority =
-                ACE_static_cast (CORBA::Short,
-                                 ACE_OS::atoi (value.c_str ()));
-
-              if (corba_priority >= 0
-                  /* && corba_priority < 32768 */)
-                // priority_ and corba_priority will always be less
-                // than 32768 since CORBA::Short is a signed 16 bit
-                // integer.
-                this->priority_ = corba_priority;
-              else
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   ACE_TEXT ("TAO (%P|%t) Invalid DIOP endpoint ")
-                                   ACE_TEXT ("priority: <%s>\n"),
-                                   value.c_str ()),
-                                  -1);
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"),
-                               name.c_str ()),
-                              -1);
-        }
-    }
-  return 0;
-}
-
-int
-TAO_DIOP_Acceptor::init_tcp_properties (void)
-{
-#if (TAO_HAS_RT_CORBA == 1)
-
-  // @@ Currently (in the code below), we obtain protocol properties from
-  // ORB-level ServerProtocol, even though the policy may
-  // have been overridden on POA level.  That's because currently all
-  // endpoints (acceptors) are global.  Once endpoints become per POA,
-  // the code below will have to be changed to look at the POA-level
-  // ServerProtocol policy first.
-
-  // @@ Later we may want to factor some of the code below
-  // among different protocols and place it into TAO_Acceptor, for
-  // example.
-
-  // ServerProtocolProperties policy controls protocols configuration.
-  // Look for protocol properties in the effective ServerProtocolPolicy.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  int send_buffer_size = 0;
-  int recv_buffer_size = 0;
-  int no_delay = 0;
-
-  TAO_Protocols_Hooks *tph = this->orb_core_->get_protocols_hooks ();
-
-  if (tph != 0)
-    {
-      const char protocol [] = "diop";
-      const char *protocol_type = protocol;
-
-      int hook_return =
-        tph->call_server_protocols_hook (this->orb_core_,
-                                         send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         protocol_type);
-
-      if (hook_return == -1)
-        return -1;
-    }
-
-  this->tcp_properties_.send_buffer_size =
-    send_buffer_size;
-  this->tcp_properties_.recv_buffer_size =
-    recv_buffer_size;
-  this->tcp_properties_.no_delay =
-    no_delay;
-
-  // @@ NOTE.  RTCORBA treats a combination of transport+messaging
-  // as a single protocol.  Keep this in mind for when we adopt
-  // RTCORBA approach to protocols configuration for nonRT use.  In
-  // particular, what are the semantics of independent variation of
-  // messaging and transport layers, when one transport appears in
-  // combination with several messaging protocols, for example.
-
-#else /* TAO_HAS_RT_CORBA == 1 */
-
-  this->tcp_properties_.send_buffer_size =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  this->tcp_properties_.recv_buffer_size =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-  this->tcp_properties_.no_delay =
-    this->orb_core_->orb_params ()->nodelay ();
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
-
-  return 0;
-}
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.h
deleted file mode 100644
index 543fd07d925..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DIOP_Acceptor.h
- *
- *  $Id$
- *
- *  DIOP specific acceptor processing
- *
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_ACCEPTOR_H
-#define TAO_DIOP_ACCEPTOR_H
-#include "ace/pre.h"
-
-#include "tao/Pluggable.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "DIOP_Connection_Handler.h"
-#include "tao/Acceptor_Impl.h"
-
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "tao/GIOP_Message_State.h"
-#include "diop_export.h"
-
-// TAO DIOP_Acceptor concrete call defination
-
-/**
- * @class TAO_DIOP_Acceptor
- *
- * @brief TAO_DIOP_Acceptor
- *
- * The DIOP-specific bridge class for the concrete acceptor.
- */
-class TAO_DIOP_Export TAO_DIOP_Acceptor : public TAO_Acceptor
-{
-public:
-  /// Constructor.
-  TAO_DIOP_Acceptor (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_DIOP_Acceptor (void);
-
-  /// @@ Helper method for the implementation repository, should go
-  ///    away
-  const ACE_INET_Addr& address (void) const;
-
-  /// Returns the array of endpoints in this acceptor
-  const ACE_INET_Addr *endpoints (void);
-
-  typedef ACE_Strategy_Acceptor<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_DIOP_BASE_ACCEPTOR;
-  typedef TAO_Creation_Strategy<TAO_DIOP_Connection_Handler> TAO_DIOP_CREATION_STRATEGY;
-  typedef TAO_Concurrency_Strategy<TAO_DIOP_Connection_Handler> TAO_DIOP_CONCURRENCY_STRATEGY;
-  typedef TAO_Accept_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_DIOP_ACCEPT_STRATEGY;
-
-  /**
-   * The TAO_Acceptor methods, check the documentation in
-   * Pluggable.h for details.
-   */
-  virtual int open (TAO_ORB_Core *orb_core,
-                    int version_major,
-                    int version_minor,
-                    const char *address,
-                    const char *options = 0);
-  virtual int open_default (TAO_ORB_Core *orb_core,
-                            int version_major,
-                            int version_minor,
-                            const char *options = 0);
-  virtual int close (void);
-  virtual int create_mprofile (const TAO_ObjectKey &object_key,
-                               TAO_MProfile &mprofile);
-  virtual int is_collocated (const TAO_Endpoint *endpoint);
-  virtual CORBA::ULong endpoint_count (void);
-
-  virtual int object_key (IOP::TaggedProfile &profile,
-                          TAO_ObjectKey &key);
-
-  /**
-   * Set the host name for the given addr.
-   * A hostname may be forced by using specified_hostname.  This
-   * is useful if the given address corresponds to more than one
-   * hostname and the desired one cannot be determined in any
-   * other way.
-   */
-  int hostname (TAO_ORB_Core *orb_core,
-                ACE_INET_Addr &addr,
-                char *&host,
-                const char *specified_hostname = 0);
-
-  /**
-   * Set the host name for the given address using the dotted decimal
-   * format.
-   */
-  int dotted_decimal_address (ACE_INET_Addr &addr,
-                              char *&host);
-
-protected:
-
-  /**
-   * Implement the common part of the open*() methods.  This method is
-   * virtual to allow a derived class implementation to be invoked
-   * instead.
-   */
-  virtual int open_i (const ACE_INET_Addr &addr);
-
-  /**
-   * Probe the system for available network interfaces, and initialize
-   * the <addrs_> array with an ACE_INET_Addr for each network
-   * interface.  The port for each initialized ACE_INET_Addr will be
-   * set in the open_i() method.  This method only gets invoked when
-   * no explicit hostname is provided in the specified endpoint.
-   */
-  int probe_interfaces (TAO_ORB_Core *orb_core);
-
-  /// Parse protocol specific options.
-  virtual int parse_options (const char *options);
-
-  /// Obtain tcp properties that must be used by this acceptor, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
-  /**
-   * Rather than creating a separate profile for each endpoint, this
-   * version of <create_mprofile> method adds all endpoints to a
-   * single DIOP profile, i.e., <mprofile> will not contain more than
-   * one DIOP_Profile, no matter how many acceptors there are.
-   */
-  int create_rt_mprofile (const TAO_ObjectKey &object_key,
-                          TAO_MProfile &mprofile);
-
-protected:
-
-  /// Array of ACE_INET_Addr instances, each one corresponding to a
-  /// given network interface.
-  ACE_INET_Addr *addrs_;
-
-  /**
-   * Cache the information about the endpoints serviced by this
-   * acceptor.
-   * There may in fact be multiple hostnames for this endpoint. For
-   * example, if the IP address is INADDR_ANY (0.0.0.0) then there
-   * will be possibly a different hostname for each interface.
-   */
-  char **hosts_;
-
-  /// The number of host names cached in the hosts_ array (equivalent
-  /// to the number of endpoints opened by this Acceptor).
-  size_t endpoint_count_;
-
-  /**
-   * The GIOP version for this endpoint
-   * @@ Theoretically they shouldn't be here!! We need to look at a
-   * way to move this out
-   */
-  TAO_GIOP_Version version_;
-
-  /// ORB Core.
-  TAO_ORB_Core *orb_core_;
-
-  /// TCP configuration properties to be used for all
-  /// connections opened by this acceptor.
-  TAO_DIOP_Properties tcp_properties_;
-
-  /// Should we use GIOP lite??
-  CORBA::Boolean lite_flag_;
-
-private:
-
-  /// the concrete acceptor, as a pointer to it's base class.
-  TAO_DIOP_BASE_ACCEPTOR base_acceptor_;
-
-  /// Acceptor strategies.
-  TAO_DIOP_CREATION_STRATEGY *creation_strategy_;
-  TAO_DIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
-  TAO_DIOP_ACCEPT_STRATEGY *accept_strategy_;
-
-  // @@ Frank: From DIOP_Acceptor.h
-  TAO_DIOP_Connection_Handler *connection_handler_;
-
-};
-
-#if defined(__ACE_INLINE__)
-#include "DIOP_Acceptor.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif  /* TAO_DIOP_ACCEPTOR_H */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.i b/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.i
deleted file mode 100644
index 9aaf71a3d41..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Acceptor.i
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const ACE_INET_Addr&
-TAO_DIOP_Acceptor::address (void) const
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  // @@ This is busted.
-  //    The Implementation Repository will have to start supporting
-  //    IORs with multiple profiles.  For now, we just return the
-  //    first addr.
-  //                    -Ossama
-  return this->addrs_[0];
-}
-
-ACE_INLINE const ACE_INET_Addr *
-TAO_DIOP_Acceptor::endpoints (void)
-{
-  ACE_ASSERT (this->addrs_ != 0);
-
-  return this->addrs_;
-}
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
deleted file mode 100644
index 1b8b16447a8..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.cpp
+++ /dev/null
@@ -1,451 +0,0 @@
-// $Id$
-
-
-#include "DIOP_Connection_Handler.h"
-#include "tao/Timeprobe.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/CDR.h"
-#include "tao/Messaging_Policy_i.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "DIOP_Transport.h"
-#include "DIOP_Endpoint.h"
-#include "tao/Connection_Cache_Manager.h"
-#include "tao/Base_Connection_Property.h"
-
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Connection_Handler.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, DIOP_Connect, "$Id$")
-
-
-
-TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_DIOP_SVC_HANDLER (t, 0 , 0),
-    TAO_Connection_Handler (0),
-    transport_ (this, 0, 0),
-    refcount_ (1),
-    tcp_properties_ (0)
-{
-  // This constructor should *never* get called, it is just here to
-  // make the compiler happy: the default implementation of the
-  // Creation_Strategy requires a constructor with that signature, we
-  // don't use that implementation, but some (most?) compilers
-  // instantiate it anyway.
-  ACE_ASSERT (this->orb_core () != 0);
-}
-
-
-TAO_DIOP_Connection_Handler::TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                                                          CORBA::Boolean flag,
-                                                          void *arg)
-  : TAO_DIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0),
-    TAO_Connection_Handler (orb_core),
-    transport_ (this, orb_core, flag),
-    refcount_ (1),
-    tcp_properties_ (ACE_static_cast
-                     (TAO_DIOP_Properties *, arg))
-{
-}
-
-
-TAO_DIOP_Connection_Handler::~TAO_DIOP_Connection_Handler (void)
-{
-  // If the socket has not already been closed.
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      // Cannot deal with errors, and therefore they are ignored.
-      this->transport_.send_buffered_messages ();
-    }
-  else
-    {
-      // Dequeue messages and delete message blocks.
-      this->transport_.dequeue_all ();
-    }
-
-  // @@ Frank: Added from DIOP_Connect.cpp
-  this->handle_cleanup ();
-
-  udp_socket_.close ();
-}
-
-// @@ Frank: Added from DIOP_Connect.cpp
-ACE_HANDLE
-TAO_DIOP_Connection_Handler::get_handle (void) const
-{
-  return this->udp_socket_.get_handle ();
-}
-
-
-const ACE_INET_Addr &
-TAO_DIOP_Connection_Handler::addr (void)
-{
-  return this->addr_;
-}
-
-
-void
-TAO_DIOP_Connection_Handler::addr (const ACE_INET_Addr &addr)
-{
-  this->addr_ = addr;
-}
-
-
-const ACE_SOCK_Dgram &
-TAO_DIOP_Connection_Handler::dgram (void)
-{
-  return this->udp_socket_;
-}
-// @@ Frank: End DIOP_Connect.cpp
-
-
-int
-TAO_DIOP_Connection_Handler::open (void*)
-{
-   // @@ Frank: Not needed for DIOP
-   /*
-  if (this->set_socket_option (this->peer (),
-                               this->tcp_properties_->send_buffer_size,
-                               this->tcp_properties_->recv_buffer_size) == -1)
-    return -1;
-
-#if !defined (ACE_LACKS_TCP_NODELAY)
-
-  if (this->peer ().set_option (ACE_IPPROTO_TCP,
-                                TCP_NODELAY,
-                                (void *) &tcp_properties_->no_delay,
-                                sizeof (int)) == -1)
-    return -1;
-#endif  ! ACE_LACKS_TCP_NODELAY
-
-  if (this->transport_.wait_strategy ()->non_blocking ())
-    {
-      if (this->peer ().enable (ACE_NONBLOCK) == -1)
-        return -1;
-    }
-
-  // Called by the <Strategy_Acceptor> when the handler is
-  // completely connected.
-  ACE_INET_Addr addr;
-
-  char client[MAXHOSTNAMELEN + 16];
-
-  // Get the peername.
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  // Verify that we can resolve the peer hostname.
-  else if (addr.addr_to_string (client, sizeof (client)) == -1)
-    return -1;
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) DIOP connection from client")
-                  ACE_TEXT ("<%s> on %d\n"),
-                  client, this->peer ().get_handle ()));
-    }
-  */
-
-  // @@ Frank: From DIOP_Connect.cpp
-  this->udp_socket_.open (ACE_sap_any_cast (ACE_INET_Addr &));
-  ACE_DEBUG ((LM_DEBUG,
-              "Opened connector on %s:%d\n",
-              this->addr_.get_host_name (),
-              this->addr_.get_port_number ()));
-
-  return 0;
-}
-
-int
-TAO_DIOP_Connection_Handler::open_server (void)
-{
-  this->udp_socket_.open (this->addr_);
-  ACE_DEBUG ((LM_DEBUG,
-              "Opened acceptor on %s:%d\n",
-              this->addr_.get_host_name (),
-              this->addr_.get_port_number ()));
-  return 0;
-}
-
-int
-TAO_DIOP_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_debug_level)
-    ACE_DEBUG  ((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) DIOP_Connection_Handler::activate %d ")
-                 ACE_TEXT ("threads, flags = %d\n"),
-                 n_threads,
-                 flags,
-                 THR_BOUND));
-  // @@ Michael: I believe we do not need active service handlers right now.
-  // @@ Frank: Not disabled yet...
-
-  return TAO_DIOP_SVC_HANDLER::activate (flags,
-                                         n_threads,
-                                         force_active,
-                                         priority,
-                                         grp_id,
-                                         task,
-                                         thread_handles,
-                                         stack,
-                                         stack_size,
-                                         thread_names);
-}
-
-int
-TAO_DIOP_Connection_Handler::svc (void)
-{
-  // @@ Michael: I believe we do not need active service handlers right now.
-  // @@ Frank: Not yet...
-
-  // 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".
-
-  // Clear the non-blocking mode here
-  ACE_Flag_Manip::clr_flags (this->get_handle (),
-                             ACE_NONBLOCK);
-
-  // Call the implementation here
-  return this->svc_i ();
-}
-
-
-int
-TAO_DIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                           ACE_Reactor_Mask rm)
-{
-  // @@ Alex: we need to figure out if the transport decides to close
-  //    us or something else.  If it is something else (for example
-  //    the cached connector trying to make room for other
-  //    connections) then we should let the transport know, so it can
-  //    in turn take appropiate action (such as sending exceptions to
-  //    all waiting reply handlers).
-  if (TAO_debug_level)
-    ACE_DEBUG  ((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) ")
-                 ACE_TEXT ("DIOP_Connection_Handler::handle_close ")
-                 ACE_TEXT ("(%d, %d)\n"),
-                 handle,
-                 rm));
-
-  --this->refcount_;
-  if (this->refcount_ == 0 &&
-      this->is_registered ())
-    {
-      // @@ Frank: Added reactor check.  not sure if this is right?
-      if (this->reactor ())
-      {
-         // Make sure there are no timers.
-         this->reactor ()->cancel_timer (this);
-      }
-
-      // Set the flag to indicate that it is no longer registered with
-      // the reactor, so that it isn't included in the set that is
-      // passed to the reactor on ORB destruction.
-      this->is_registered (0);
-
-      // Close the handle..
-      if (this->get_handle () != ACE_INVALID_HANDLE)
-        {
-          // Send the buffered messages first
-          this->transport_.send_buffered_messages ();
-
-          this->peer ().close ();
-
-          // Purge the entry too
-          this->mark_invalid ();
-        }
-
-      // Decrement the reference count
-      this->decr_ref_count ();
-
-
-    }
-
-  return 0;
-}
-
-ACE_HANDLE
-TAO_DIOP_Connection_Handler::fetch_handle (void)
-{
-  return this->get_handle ();
-}
-
-
-int
-TAO_DIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
-                                             const void *)
-{
-  // This method is called when buffering timer expires.
-  //
-  ACE_Time_Value *max_wait_time = 0;
-
-  TAO_Stub *stub = 0;
-  int has_timeout;
-  this->orb_core ()->call_timeout_hook (stub,
-                                        has_timeout,
-                                        *max_wait_time);
-
-  // Cannot deal with errors, and therefore they are ignored.
-  this->transport ()->send_buffered_messages (max_wait_time);
-
-  return 0;
-}
-
-
-int
-TAO_DIOP_Connection_Handler::close (u_long)
-{
-  this->decr_ref_count ();
-
-  return 0;
-}
-
-
-int
-TAO_DIOP_Connection_Handler::add_handler_to_cache (void)
-{
-  ACE_INET_Addr addr;
-
-  // Get the peername.
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-  // Construct an  DIOP_Endpoint object
-  TAO_DIOP_Endpoint endpoint (addr,
-                              0);
-
-  // Construct a property object
-  TAO_Base_Connection_Property prop (&endpoint);
-
-  // Add the handler to Cache
-  return this->orb_core ()->connection_cache ().cache_handler (&prop,
-                                                               this);
-}
-
-// @@ Frank: Hopefully this isn't needed
-/*
-int
-TAO_DIOP_Connection_Handler::process_listen_point_list (
-    DIOP::ListenPointList &listen_list)
-{
-  // Get the size of the list
-  CORBA::ULong len = listen_list.length ();
-
-  for (CORBA::ULong i = 0; i < len; ++ i)
-    {
-      DIOP::ListenPoint listen_point = listen_list[i];
-      ACE_INET_Addr addr (listen_point.port,
-                          listen_point.host.in ());
-
-
-      // Construct an  DIOP_Endpoint object
-      TAO_DIOP_Endpoint endpoint (addr,
-                                  0);
-
-      // Construct a property object
-      TAO_Base_Connection_Property prop (&endpoint);
-
-      // Mark the connection as bidirectional
-      prop.set_bidir_flag (1);
-
-      // The property for this handler has changed. Recache the
-      // handler with this property
-      int retval = this->recache_handler (&prop);
-      if (retval == -1)
-        return retval;
-
-      // Make the handler idle and ready for use
-      this->make_idle ();
-    }
-
-  return 0;
-}
-*/
-
-int
-TAO_DIOP_Connection_Handler::handle_input (ACE_HANDLE h)
-{
-  return this->handle_input_i (h);
-}
-
-
-int
-TAO_DIOP_Connection_Handler::handle_input_i (ACE_HANDLE,
-                                             ACE_Time_Value *max_wait_time)
-{
-  this->refcount_++;
-
-  // Call the transport read the message
-  int result = this->transport_.read_process_message (max_wait_time);
-
-  // Now the message has been read
-  if (result == -1 && TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - %p\n"),
-                  ACE_TEXT ("DIOP_Connection_Handler::read_message \n")));
-
-    }
-
-  // The upcall is done. Bump down the reference count
-  --this->refcount_;
-  if (this->refcount_ == 0)
-    this->decr_ref_count ();
-
-  if (result == -1)
-    return result;
-  else if (result == 0)
-    // Requires another call to handle_input ()
-    return 1;
-
-  return 0;
-}
-
-// @@ Frank: From DIOP_Connect.cpp
-int
-TAO_DIOP_Connection_Handler::handle_cleanup (void)
-{
-  // 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);
-    }
-
-  return 0;
-}
-
-
-
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.h
deleted file mode 100644
index 8409c449340..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.h
+++ /dev/null
@@ -1,189 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// ===================================================================
-/**
- *  @file   DIOP_Connection_Handler.h
- *
- *  $Id$
- *
- *  @author Originally by Chris Cleeland as DIOP_Connect.h
- *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_DIOP_CONNECTION_HANDLER_H
-#define TAO_DIOP_CONNECTION_HANDLER_H
-#include "ace/pre.h"
-
-#include "ace/Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Acceptor.h"
-
-#include "tao/corbafwd.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Connection_Handler.h"
-#include "DIOP_Transport.h"
-//#include "tao/DIOPC.h"
-#include "ace/SOCK_Dgram.h"
-#include "diop_export.h"
-
-// Forward Decls
-class TAO_Pluggable_Messaging;
-
-// ****************************************************************
-
-/**
- * @class TAO_DIOP_Properties
- *
- * @brief TCP protocol properties specification for a set of
- *  connections.
- *
- */
-
-class TAO_DIOP_Export TAO_DIOP_Properties
-{
-
-public:
-  int send_buffer_size;
-  int recv_buffer_size;
-  int no_delay;
-};
-
-
-
-// ****************************************************************
-
-/**
- * @class TAO_DIOP_Connection_Handler
- *
- * @brief  Handles requests on a single connection.
- *
- * The Connection handler which is common for the Acceptor and
- * the Connector
- */
-
-
-class TAO_DIOP_Export TAO_DIOP_Connection_Handler : public TAO_DIOP_SVC_HANDLER,
-                                               public TAO_Connection_Handler
-{
-
-public:
-
-  TAO_DIOP_Connection_Handler (ACE_Thread_Manager* t = 0);
-
-  /// Constructor. <arg> parameter is used by the Acceptor to pass the
-  /// protocol configuration properties for this connection.
-  TAO_DIOP_Connection_Handler (TAO_ORB_Core *orb_core,
-                               CORBA::Boolean flag,
-                               void *arg);
-
-
-  /// Destructor.
-  ~TAO_DIOP_Connection_Handler (void);
-
-  /// Called by the <Strategy_Acceptor> when the handler is completely
-  /// connected.  Argument is unused.
-  virtual int open (void *);
-
-  // @@ Frank: Similar to open, but called on server
-  virtual int open_server (void);
-
-  /// = 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);
-
-  /// Only used when the handler is turned into an active object by
-  /// calling <activate>.  This serves as the event loop in such cases.
-  virtual int svc (void);
-
-  /// Perform appropriate closing.
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
-
-  /// Return the underlying transport object
-  TAO_Transport *transport (void);
-
-  /// Return the underlying handle
-  virtual ACE_HANDLE fetch_handle (void);
-
-  /// Called when buffering timer expires.
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *arg = 0);
-
-  /// Object termination hook.
-  virtual int close (u_long flags = 0);
-
-  /// Add ourselves to Cache.
-  int add_handler_to_cache (void);
-
-  // @@ Frank: Not needed
-  /*
-  /// Process the <listen_list>
-  int process_listen_point_list (DIOP::ListenPointList &listen_list);
-  */
-
-  // @@ Frank: From DIOP_Connect.h
-  ACE_HANDLE get_handle (void) const;
-
-  const ACE_INET_Addr &addr (void);
-
-  void addr (const ACE_INET_Addr &addr);
-
-  const ACE_SOCK_Dgram &dgram (void);
-  // @@ Frank: End DIOP_Connect.h
-protected:
-
-  /// = Event Handler overloads
-
-  /// Reads a message from the <peer()>, dispatching and servicing it
-  /// appropriately.
-  /// handle_input() just delegates on handle_input_i() which timeouts
-  /// after <max_wait_time>, this is used in thread-per-connection to
-  /// ensure that server threads eventually exit.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  virtual int handle_input_i (ACE_HANDLE = ACE_INVALID_HANDLE,
-                              ACE_Time_Value *max_wait_time = 0);
-
-  // @@ Frank: From DIOP_Connect.h
-  virtual int handle_cleanup ();
-
-  // @@ Frank: From DIOP_Connect.h
-  ACE_SOCK_Dgram udp_socket_;
-
-  ACE_INET_Addr addr_;
-  // @@ Frank: From DIOP_Connect.h
-
-private:
-
-  /// Transport object reference.
-  TAO_DIOP_Transport transport_;
-
-  /// Reference count.It is used to count nested upcalls on this
-  /// svc_handler i.e., the connection can close during nested upcalls,
-  /// you should not delete the svc_handler until the stack unwinds
-  /// from the nested upcalls.
-  u_long refcount_;
-
-  /// TCP configuration for this connection.
-  TAO_DIOP_Properties *tcp_properties_;
-};
-
-
-#if defined (__ACE_INLINE__)
-#include "DIOP_Connection_Handler.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif /* TAO_DIOP_CONNECTION_HANDLER_H */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.i b/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.i
deleted file mode 100644
index 64a787b1faf..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connection_Handler.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE TAO_Transport *
-TAO_DIOP_Connection_Handler::transport (void)
-{
-  return &(this->transport_);
-}
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
deleted file mode 100644
index b72d093bc6a..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-
-#include "DIOP_Connector.h"
-#include "DIOP_Profile.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/Environment.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/Base_Connection_Property.h"
-#include "tao/Protocols_Hooks.h"
-#include "ace/Strategies_T.h"
-
-ACE_RCSID(tao, DIOP_Connector, "$Id$")
-
-TAO_DIOP_Connector::TAO_DIOP_Connector (CORBA::Boolean flag)
-  : TAO_Connector (TAO_TAG_UDP_PROFILE),
-    lite_flag_ (flag),
-    connect_strategy_ (),
-    base_connector_ ()
-{
-}
-
-TAO_DIOP_Connector::~TAO_DIOP_Connector (void)
-{
-}
-
-int
-TAO_DIOP_Connector::open (TAO_ORB_Core *orb_core)
-{
-  this->orb_core (orb_core);
-
-  // @@ Frank: No TCP properties or even DIOP properties yet.
-/*
-  if (this->init_tcp_properties () != 0)
-    return -1;
-*/
-
-  // @@ Michael: For DIOP we should be able to get rid of the connection
-  //             caching.
-  // @@ Frank: Not disabled yet...
-
-
-  /// Our connect creation strategy
-  TAO_DIOP_CONNECT_CREATION_STRATEGY *connect_creation_strategy = 0;
-
-  ACE_NEW_RETURN (connect_creation_strategy,
-                  TAO_DIOP_CONNECT_CREATION_STRATEGY
-                      (orb_core->thr_mgr (),
-                       orb_core,
-                       &(this->tcp_properties_),
-                       this->lite_flag_),
-                  -1);
-
-  /// Our activation strategy
-  TAO_DIOP_CONNECT_CONCURRENCY_STRATEGY *concurrency_strategy = 0;
-
-  ACE_NEW_RETURN (concurrency_strategy,
-                  TAO_DIOP_CONNECT_CONCURRENCY_STRATEGY (orb_core),
-                  -1);
-
-  return this->base_connector_.open (this->orb_core ()->reactor (),
-                                     connect_creation_strategy,
-                                     &this->connect_strategy_,
-                                     concurrency_strategy);
-}
-
-int
-TAO_DIOP_Connector::close (void)
-{
-  // @@ Michael: UDP Addition ------------------------------------
-
-  SvcHandlerIterator iter (svc_handler_table_);
-
-  while (!iter.done ())
-    {
-      // @@ Frank
-      /*
-      TAO_DIOP_Connection_Handler *svc_handler = (*iter).int_id_;
-      svc_handler->decrement ();
-      */
-
-      // Delete the addr
-      delete (*iter).ext_id_;
-      iter++;
-    }
-
-  // -----------------------------------------------------------------
-
-  // @@ Michael: For DIOP we should be able to get rid of the connection
-  //             caching.
-  // @@ Frank: Not yet...
-  delete this->base_connector_.concurrency_strategy ();
-  delete this->base_connector_.creation_strategy ();
-  return this->base_connector_.close ();
-}
-
-int
-TAO_DIOP_Connector::connect (TAO_Connection_Descriptor_Interface *desc,
-                             TAO_Transport *&transport,
-                             ACE_Time_Value * /*max_wait_time*/,
-                             CORBA::Environment &)
-{
-  TAO_Endpoint *endpoint = desc->endpoint ();
-
-  if (endpoint->tag () != TAO_TAG_UDP_PROFILE)
-    return -1;
-
-  TAO_DIOP_Endpoint *diop_endpoint =
-    ACE_dynamic_cast (TAO_DIOP_Endpoint *,
-                      endpoint );
-  if (diop_endpoint == 0)
-    return -1;
-
-  const ACE_INET_Addr &remote_address =
-    diop_endpoint->object_addr ();
-
-  // Verify that the remote ACE_INET_Addr was initialized properly.
-  // Failure can occur if hostname lookup failed when initializing the
-  // remote ACE_INET_Addr.
-  if (remote_address.get_type () != AF_INET)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) DIOP connection failed.\n")
-                      ACE_TEXT ("TAO (%P|%t) This is most likely ")
-                      ACE_TEXT ("due to a hostname lookup ")
-                      ACE_TEXT ("failure.\n")));
-        }
-
-      return -1;
-    }
-
-  // @@ Frank: int result = 0;
-  TAO_DIOP_Connection_Handler *svc_handler = 0;
-  // @@ Frank:   TAO_Connection_Handler *conn_handler = 0;
-
-  // @@ Michael -- UDP Additions ----------------------------
-
-  ACE_TCHAR addr_str[BUFSIZ];
-  remote_address.addr_to_string (addr_str,
-                                 sizeof addr_str);
-  if (svc_handler_table_.find (addr_str, svc_handler) == -1)
-    {
-      TAO_DIOP_Connection_Handler *svc_handler_i = 0;
-      ACE_NEW_RETURN (svc_handler_i,
-                      TAO_DIOP_Connection_Handler (this->orb_core (),
-                                                   this->lite_flag_,
-                                                   0 /* TAO_DIOP_Properties */),
-                      -1);
-
-      svc_handler_i->addr (remote_address);
-
-      svc_handler_i->open (0);
-
-      ACE_TCHAR *addr_str_i = new ACE_TCHAR[BUFSIZ];
-      ACE_OS::memcpy (addr_str_i, addr_str, BUFSIZ);
-      svc_handler_table_.bind (addr_str_i,
-                               svc_handler_i);
-      // we increment the ref count to keep the handler from disappearing.
-      // <decrement> should be called by the destructor of us.
-
-      svc_handler = svc_handler_i;
-   }
-
-  // @@ Frank  svc_handler->increment ();
-   if (TAO_debug_level > 2)
-     ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT ("(%P|%t) DIOP_Connector::connect - ")
-                 ACE_TEXT ("new connection on HANDLE %d\n"),
-                 svc_handler->peer ().get_handle ()));
-
-  // ---------------------------------------------------------
-
-
-// @@ Michael: We shortcut the actual connector.
-/*
-  // Check the Cache first for connections
-  if (this->orb_core ()->connection_cache ().find_handler (desc,
-                                                           conn_handler) == 0)
-    {
-      // We have found a connection and a handler
-      svc_handler =
-        ACE_dynamic_cast (TAO_DIOP_Connection_Handler *,
-                          conn_handler);
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) DIOP_Connector::connect - ")
-                    ACE_TEXT ("got an existing connection on HANDLE %d\n"),
-                    svc_handler->peer ().get_handle ()));
-    }
-  else
-    {
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) DIOP_Connector::connect - ")
-                    ACE_TEXT ("making a new connection\n")));
-
-      // @@ This needs to change in the next round when we implement a
-      // policy that will not allow new connections when a connection
-      // is busy.
-      if (max_wait_time != 0)
-        {
-          ACE_Synch_Options synch_options (ACE_Synch_Options::USE_TIMEOUT,
-                                           *max_wait_time);
-
-          // We obtain the transport in the <svc_handler> variable. As
-          // we know now that the connection is not available in Cache
-          // we can make a new connection
-          result = this->base_connector_.connect (svc_handler,
-                                                  remote_address,
-                                                  synch_options);
-        }
-      else
-        {
-          // We obtain the transport in the <svc_handler> variable. As
-          // we know now that the connection is not available in Cache
-          // we can make a new connection
-          result = this->base_connector_.connect (svc_handler,
-                                                  remote_address);
-        }
-
-      if (result == -1)
-        {
-          // Give users a clue to the problem.
-          if (TAO_debug_level)
-            {
-              ACE_DEBUG ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t) %s:%u, connection to ")
-                          ACE_TEXT ("%s:%d failed (%p)\n"),
-                          __FILE__,
-                          __LINE__,
-                          diop_endpoint->host (),
-                          diop_endpoint->port (),
-                          ACE_TEXT ("errno")));
-            }
-          return -1;
-        }
-
-      if (TAO_debug_level > 2)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%P|%t) DIOP_Connector::connect - ")
-                    ACE_TEXT ("new connection on HANDLE %d\n"),
-                    svc_handler->peer ().get_handle ()));
-
-      // Add the handler to Cache
-      int retval =
-        this->orb_core ()->connection_cache ().cache_handler (desc,
-                                                              svc_handler);
-
-      if (retval != 0 && TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) DIOP_Connector::connect ")
-                      ACE_TEXT ("could not add the new connection to Cache \n")));
-        }
-    }
-  */
-
-  transport = svc_handler->transport ();
-  return 0;
-}
-
-int
-TAO_DIOP_Connector::preconnect (const char *preconnects)
-{
-  // Check for the proper protocol prefix.
-  if (this->check_prefix (preconnects) != 0)
-    return 0; // Failure: zero successful preconnections
-
-  const char *protocol_removed =
-    ACE_OS::strstr (preconnects,
-                    "://") + 3;
-  // "+ 3" since strlen of "://" is 3.
-
-  char *preconnections =
-    ACE_OS::strdup (protocol_removed);
-
-  int successes = 0;
-  if (preconnections)
-    {
-      ACE_INET_Addr dest;
-      ACE_Unbounded_Stack<ACE_INET_Addr> dests;
-
-      size_t num_connections;
-
-      char *nextptr = 0;
-      char *where = 0;
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          int version_offset = 0;
-          // Additional offset to remove version from preconnect, if it exists.
-
-          if (isdigit (where[0]) &&
-              where[1] == '.' &&
-              isdigit (where[2]) &&
-              where[3] == '@')
-            version_offset = 4;
-
-          // @@ For now, we just drop the version prefix.  However, at
-          //    some point in the future the version may become useful.
-
-          char *tport = 0;
-          char *thost = where + version_offset;
-          char *sep = ACE_OS::strchr (where, ':');
-
-          if (sep)
-            {
-              *sep = '\0';
-              tport = sep + 1;
-
-              dest.set ((u_short) ACE_OS::atoi (tport), thost);
-              dests.push (dest);
-            }
-          else
-            {
-              // No port was specified so assume that the port will be the
-              // IANA assigned port for DIOP.
-              //
-              //    DIOP:           683
-              //    DIOP over SSL:  684
-
-              dest.set (683, thost);
-              dests.push (dest);
-
-              if (TAO_debug_level > 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("TAO (%P|%t) No port specified for <%s>.  ")
-                              ACE_TEXT ("Using <%d> as default port.\n"),
-                              where,
-                              dest.get_port_number ()));
-                }
-            }
-        }
-
-      // Create an array of addresses from the stack, as well as an
-      // array of eventual handlers.
-      num_connections = dests.size ();
-      ACE_INET_Addr *remote_addrs = 0;
-      TAO_DIOP_Connection_Handler **handlers = 0;
-      char *failures = 0;
-
-      ACE_NEW_RETURN (remote_addrs,
-                      ACE_INET_Addr[num_connections],
-                      -1);
-
-      ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr> safe_remote_addrs (remote_addrs);
-
-      ACE_NEW_RETURN (handlers,
-                      TAO_DIOP_Connection_Handler *[num_connections],
-                      -1);
-
-      ACE_Auto_Basic_Array_Ptr<TAO_DIOP_Connection_Handler*>
-        safe_handlers (handlers);
-
-      ACE_NEW_RETURN (failures,
-                      char[num_connections],
-                      -1);
-
-      // No longer need to worry about exception safety at this point.
-      remote_addrs = safe_remote_addrs.release ();
-      handlers = safe_handlers.release ();
-
-      size_t slot = 0;
-
-      // Fill in the remote address array
-      while (dests.pop (remote_addrs[slot]) == 0)
-        handlers[slot++] = 0;
-
-
-      // @@ Michael
-      /*
-      // 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 (slot = 0;
-           slot < num_connections;
-           slot++)
-        {
-          if (!failures[slot])
-            {
-              TAO_DIOP_Endpoint endpoint (remote_addrs[slot],
-                                          0);
-              TAO_Base_Connection_Property prop (&endpoint);
-
-              // Add the handler to Cache
-              int retval =
-                this->orb_core ()->connection_cache ().cache_handler (&prop,
-                                                                      handlers[slot]);
-              successes++;
-
-              if (retval != 0 && TAO_debug_level > 4)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("TAO (%P|%t) Unable to add handles\n"),
-                            ACE_TEXT ("to cache \n")));
-
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("TAO (%P|%t) Preconnection <%s:%d> ")
-                            ACE_TEXT ("succeeded.\n"),
-                            remote_addrs[slot].get_host_name (),
-                            remote_addrs[slot].get_port_number ()));
-            }
-          else if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) Preconnection <%s:%d> failed.\n"),
-                        remote_addrs[slot].get_host_name (),
-                        remote_addrs[slot].get_port_number ()));
-        }
-      */
-
-      ACE_OS::free (preconnections);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) DIOP preconnections: %d successes and ")
-                    ACE_TEXT ("%d failures.\n"),
-                    successes,
-                    num_connections - successes));
-    }
-  return successes;
-}
-
-TAO_Profile *
-TAO_DIOP_Connector::create_profile (TAO_InputCDR& cdr)
-{
-  TAO_Profile *pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_DIOP_Profile (this->orb_core ()),
-                  0);
-
-  int r = pfile->decode (cdr);
-  if (r == -1)
-    {
-      pfile->_decr_refcnt ();
-      pfile = 0;
-    }
-
-  return pfile;
-}
-
-void
-TAO_DIOP_Connector::make_profile (const char *endpoint,
-                                  TAO_Profile *&profile,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // The endpoint should be of the form:
-  //    N.n@host:port/object_key
-  // or:
-  //    host:port/object_key
-
-  ACE_NEW_THROW_EX (profile,
-                    TAO_DIOP_Profile (endpoint,
-                                      this->orb_core (),
-                                      ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-
-  ACE_CHECK;
-}
-
-int
-TAO_DIOP_Connector::check_prefix (const char *endpoint)
-{
-  // Check for a valid string
-  if (!endpoint || !*endpoint)
-    return -1;  // Failure
-
-  const char *protocol[] = { "iiop", "iioploc" };
-
-  size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
-
-  size_t len0 = ACE_OS::strlen (protocol[0]);
-  size_t len1 = ACE_OS::strlen (protocol[1]);
-
-  // Check for the proper prefix in the IOR.  If the proper prefix
-  // isn't in the IOR then it is not an IOR we can use.
-  if (slot == len0
-      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
-    return 0;
-  else if (slot == len1
-           && ACE_OS::strncasecmp (endpoint, protocol[1], len1) == 0)
-    return 0;
-
-  return -1;
-  // Failure: not an DIOP IOR
-  // DO NOT throw an exception here.
-}
-
-char
-TAO_DIOP_Connector::object_key_delimiter (void) const
-{
-  return TAO_DIOP_Profile::object_key_delimiter_;
-}
-
-int
-TAO_DIOP_Connector::init_tcp_properties (void)
-{
-
-#if (TAO_HAS_RT_CORBA == 1)
-
-  // Connector protocol properties are obtained from ORB-level
-  // RTCORBA::ClientProtocolProperties policy override.
-  // If the override doesn't exist or doesn't contain the
-  // properties, we use ORB default.
-  //
-  // Currently, we do not use Object-level and Current-level policy
-  // overrides for protocol configuration because connection
-  // lookup and caching are not done based on protocol
-  // properties.
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  int send_buffer_size = 0;
-  int recv_buffer_size = 0;
-  int no_delay = 0;
-
-  TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
-
-  if (tph != 0)
-    {
-      const char protocol [] = "iiop";
-      const char *protocol_type = protocol;
-
-      int hook_result =
-        tph->call_client_protocols_hook (this->orb_core (),
-                                         send_buffer_size,
-                                         recv_buffer_size,
-                                         no_delay,
-                                         protocol_type);
-
-      if(hook_result == -1)
-        return -1;
-    }
-
-  // Extract and locally store properties of interest.
-  this->tcp_properties_.send_buffer_size =
-    send_buffer_size;
-  this->tcp_properties_.recv_buffer_size =
-    recv_buffer_size;
-  this->tcp_properties_.no_delay =
-    no_delay;
-
-#else /* TAO_HAS_RT_CORBA == 1 */
-
-  // Without RTCORBA, protocol configuration properties come from ORB
-  // options.
-  this->tcp_properties_.send_buffer_size =
-    this->orb_core ()->orb_params ()->sock_sndbuf_size ();
-  this->tcp_properties_.recv_buffer_size =
-    this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
-  this->tcp_properties_.no_delay =
-    this->orb_core ()->orb_params ()->nodelay ();
-
-#endif /* TAO_HAS_RT_CORBA == 1 */
-
-  return 0;
-}
-
-
-#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_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
-template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>;
-template class ACE_Hash<ARHR<ACE_INET_Addr> >;
-template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >;
-
-template class TAO_Connect_Concurrency_Strategy<TAO_DIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_DIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>;
-
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*>;
-template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Auto_Basic_Array_Ptr<TAO_DIOP_Connection_Handler*>;
-
-template class ACE_Hash_Map_Manager_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_TCHAR *, TAO_DIOP_Connection_Handler *>;
-
-#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_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>
-#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_DIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_DIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>
-
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_DIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*>
-#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_DIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_DIOP_Connection_Handler*>
-
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TCHAR *, TAO_DIOP_Connection_Handler *, ACE_Hash < const char * >, ACE_Equal_To < const char * >, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_TCHAR *, TAO_DIOP_Connection_Handler *>;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.h
deleted file mode 100644
index cfa56eada80..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Connector.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    DIOP_Connector.h
- *
- *  $Id$
- *
- *  DIOP specific connector processing
- *
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_CONNECTOR_H
-#define TAO_DIOP_CONNECTOR_H
-#include "ace/pre.h"
-
-#include "ace/Connector.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Connector.h"
-#include "tao/Pluggable.h"
-#include "tao/Connector_Impl.h"
-#include "DIOP_Connection_Handler.h"
-#include "diop_export.h"
-
-// ****************************************************************
-
-/**
- * @class TAO_DIOP_Connector
- *
- * @brief DIOP-specific Connector bridge for pluggable protocols.
- *
- * Concrete instance of the TAO_Connector class.  Responsible
- * for establishing a connection with a server and is called from the
- * Connector_Registory.
- */
-class TAO_DIOP_Export TAO_DIOP_Connector : public TAO_Connector
-{
-public:
-  // = Initialization and termination methods.
-  /// Constructor.
-  TAO_DIOP_Connector (CORBA::Boolean flag = 0);
-
-  /// Destructor.
-  ~TAO_DIOP_Connector (void);
-
-  // = The TAO_Connector methods, please check the documentation on
-  // Pluggable.h
-  int open (TAO_ORB_Core *orb_core);
-  int close (void);
-  int connect (TAO_Connection_Descriptor_Interface *desc,
-               TAO_Transport *&transport,
-               ACE_Time_Value *max_wait_time,
-               CORBA::Environment &ACE_TRY_ENV);
-  int preconnect (const char *preconnections);
-  TAO_Profile *create_profile (TAO_InputCDR& cdr);
-
-  virtual int check_prefix (const char *endpoint);
-
-  virtual char object_key_delimiter (void) const;
-
-protected:
-
-  /// = More TAO_Connector methods, please check the documentation on
-  ///   Pluggable.h
-  virtual void make_profile (const char *endpoint,
-                             TAO_Profile *&,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
-
-  /// Obtain tcp properties that must be used by this connector, i.e.,
-  /// initialize <tcp_properties_>.
-  int init_tcp_properties (void);
-
-public:
-
-  typedef TAO_Connect_Concurrency_Strategy<TAO_DIOP_Connection_Handler>
-          TAO_DIOP_CONNECT_CONCURRENCY_STRATEGY;
-
-  typedef TAO_Connect_Creation_Strategy<TAO_DIOP_Connection_Handler>
-          TAO_DIOP_CONNECT_CREATION_STRATEGY;
-
-  typedef ACE_Connect_Strategy<TAO_DIOP_Connection_Handler,
-                               ACE_SOCK_CONNECTOR>
-          TAO_DIOP_CONNECT_STRATEGY ;
-
-  typedef ACE_Strategy_Connector<TAO_DIOP_Connection_Handler,
-                                 ACE_SOCK_CONNECTOR>
-          TAO_DIOP_BASE_CONNECTOR;
-
-protected:
-
-  /// TCP configuration properties to be used for all
-  /// connections established by this connector.
-  TAO_DIOP_Properties tcp_properties_;
-
-  /// Do we need to use a GIOP_Lite for sending messages?
-  CORBA::Boolean lite_flag_;
-
-private:
-
-  /// Our connect strategy
-  TAO_DIOP_CONNECT_STRATEGY connect_strategy_;
-
-  /// The connector initiating connection requests for DIOP.
-  TAO_DIOP_BASE_CONNECTOR base_connector_;
-
-  // @@ Michael: UDP Addition
-  ACE_Hash_Map_Manager_Ex < ACE_TCHAR *,
-                            TAO_DIOP_Connection_Handler *,
-                            ACE_Hash < const char * >,
-                            ACE_Equal_To < const char * >,
-                            ACE_Null_Mutex > svc_handler_table_;
-
-  typedef ACE_Hash_Map_Iterator_Ex < ACE_TCHAR *,
-                                     TAO_DIOP_Connection_Handler *,
-                                     ACE_Hash < const char * >,
-                                     ACE_Equal_To < const char *>,
-                                     ACE_Null_Mutex > SvcHandlerIterator;
-};
-
-#include "ace/post.h"
-#endif  /* TAO_DIOP_CONNECTOR_H */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.cpp
deleted file mode 100644
index 881f9b45ca8..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-#include "DIOP_Endpoint.h"
-#include "DIOP_Connection_Handler.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, DIOP_Endpoint, "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
-                                      int use_dotted_decimal_addresses)
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE),
-    host_ (),
-    port_ (0),
-    object_addr_ (addr),
-    /*    hint_ (0), */
-    next_ (0)
-{
-  this->set (addr, use_dotted_decimal_addresses);
-}
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
-                                      CORBA::UShort port,
-                                      const ACE_INET_Addr &addr)
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE),
-    host_ (),
-    port_ (port),
-    object_addr_ (addr),
-    /*    hint_ (0), */
-    next_ (0)
-{
-  if (host != 0)
-    this->host_ = host;
-}
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (void)
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE),
-    host_ (),
-    port_ (0),
-    object_addr_ (),
-    /*    hint_ (0), */
-    next_ (0)
-{
-}
-
-TAO_DIOP_Endpoint::TAO_DIOP_Endpoint (const char *host,
-                                      CORBA::UShort port,
-                                      CORBA::Short priority)
-  : TAO_Endpoint (TAO_TAG_UDP_PROFILE),
-    host_ (),
-    port_ (port),
-    object_addr_ (),
-    /*    hint_ (0),*/
-    next_ (0)
-{
-  if (host != 0)
-    this->host_ = host;
-
-  this->object_addr_.set_type (-1);
-  this->priority (priority);
-}
-
-TAO_DIOP_Endpoint::~TAO_DIOP_Endpoint (void)
-{
-
-}
-
-int
-TAO_DIOP_Endpoint::set (const ACE_INET_Addr &addr,
-                        int use_dotted_decimal_addresses)
-{
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (use_dotted_decimal_addresses
-      || addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-    {
-      const char *tmp = addr.get_host_addr ();
-      if (tmp == 0)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("\n\nTAO (%P|%t) ")
-                        ACE_TEXT ("DIOP_Endpoint::set ")
-                        ACE_TEXT ("- %p\n\n"),
-                        ACE_TEXT ("cannot determine hostname")));
-          return -1;
-        }
-      else
-        this->host_ = tmp;
-    }
-  else
-    this->host_ = CORBA::string_dup (tmp_host);
-
-  this->port_ = addr.get_port_number();
-
-  return 0;
-}
-
-int
-TAO_DIOP_Endpoint::addr_to_string (char *buffer, size_t length)
-{
-  size_t actual_len =
-    ACE_OS::strlen (this->host_.in ()) // chars in host name
-    + sizeof (':')                     // delimiter
-    + ACE_OS::strlen ("65536")         // max port
-    + sizeof ('\0');
-
-  if (length < actual_len)
-    return -1;
-
-  ACE_OS::sprintf (buffer, "%s:%d",
-                   this->host_.in (), this->port_);
-
-  return 0;
-}
-
-const char *
-TAO_DIOP_Endpoint::host (const char *h)
-{
-  this->host_ = h;
-
-  return this->host_.in ();
-}
-
-void
-TAO_DIOP_Endpoint::reset_hint (void)
-{
-  // Commented out for the time being....
-  /*  if (this->hint_)
-      this->hint_->cleanup_hint ((void **) &this->hint_); */
-}
-
-TAO_Endpoint *
-TAO_DIOP_Endpoint::next (void)
-{
-  return this->next_;
-}
-
-TAO_Endpoint *
-TAO_DIOP_Endpoint::duplicate (void)
-{
-  // @@ Bala, we probably need to make sure that the duplicate has the
-  // same priority as the original.  Although it does not matter in
-  // the context this method is currently used, if somebody ends up
-  // using this method for some other purpose later, this will be a
-  // seed for bugs.
-
-  TAO_DIOP_Endpoint *endpoint = 0;
-
-  ACE_NEW_RETURN (endpoint,
-                  TAO_DIOP_Endpoint (this->host_.in (),
-                                     this->port_,
-                                     this->object_addr_),
-                  0);
-
-  return endpoint;
-}
-
-CORBA::Boolean
-TAO_DIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
-{
-  TAO_Endpoint *endpt = ACE_const_cast (TAO_Endpoint *,
-                                        other_endpoint);
-
-  TAO_DIOP_Endpoint *endpoint = ACE_dynamic_cast (TAO_DIOP_Endpoint *,
-                                                  endpt);
-  if (endpoint == 0)
-    return 0;
-
-  return
-    this->port_ == endpoint->port_
-    && ACE_OS::strcmp (this->host_.in (), endpoint->host_.in ()) == 0;
-}
-
-CORBA::ULong
-TAO_DIOP_Endpoint::hash (void)
-{
-  return
-    ACE::hash_pjw (this->host_.in ())
-    + this->port_;
-}
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.h
deleted file mode 100644
index ddaa7daeb71..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-
-//=============================================================================
-/**
- *  @file     DIOP_Endpoint.h
- *
- *  $Id$
- *
- *   DIOP implementation of PP Framework Endpoint interface.
- *
- *
- *  @author  Marina Spivak <marina@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_ENDPOINT_H
-#define TAO_DIOP_ENDPOINT_H
-#include "ace/pre.h"
-
-#include "tao/Endpoint.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-
-#include "ace/INET_Addr.h"
-#include "diop_export.h"
-
-
-class TAO_DIOP_Connection_Handler;
-
-/**
- * @class TAO_DIOP_Endpoint
- *
- * @brief TAO_DIOP_Endpoint
- *
- * DIOP-specific implementation of PP Framework Endpoint interface.
- */
-class TAO_DIOP_Export TAO_DIOP_Endpoint : public TAO_Endpoint
-{
-public:
-
-  friend class TAO_DIOP_Profile;
-  friend class TAO_SSLIOP_Profile;
-
-  // = Initialization and termination methods.
-
-  /// Default constructor.
-  TAO_DIOP_Endpoint (void);
-
-  /// Constructor.  This is the most efficient constructor since it
-  /// does not require any address resolution processing.
-  TAO_DIOP_Endpoint (const char *host,
-                     CORBA::UShort port,
-                     const ACE_INET_Addr &addr);
-
-  /// Constructor.
-  TAO_DIOP_Endpoint (const ACE_INET_Addr &addr,
-                     int use_dotted_decimal_addresses);
-
-  /// Constructor.  This constructor is used when decoding endpoints.
-  TAO_DIOP_Endpoint (const char *host,
-                     CORBA::UShort port,
-                     CORBA::Short priority);
-
-  /// Destructor.
-  ~TAO_DIOP_Endpoint (void);
-
-  // = Implementation of abstract TAO_Endpoint methods.  See
-  // Endpoint.h for their documentation.
-
-  virtual TAO_Endpoint *next (void);
-  virtual int addr_to_string (char *buffer, size_t length);
-  virtual void reset_hint (void);
-
-  /// Makes a copy of <this>
-  virtual TAO_Endpoint *duplicate (void);
-
-  /// Return true if this endpoint is equivalent to <other_endpoint>.  Two
-  /// endpoints are equivalent iff their port and host are the same.
-  CORBA::Boolean is_equivalent (const TAO_Endpoint *other_endpoint);
-
-  /// Return a hash value for this object.
-  CORBA::ULong hash (void);
-
-  // Allocates memory and returns a copy of <this>
-
-  // = DIOP_Endpoint-specific methods.
-
-  /// Return a reference to the <object_addr>.
-  const ACE_INET_Addr &object_addr (void) const;
-
-  /// Return a pointer to the host string.  This object maintains
-  /// ownership of this string.
-  const char *host (void) const;
-
-  /// Copy the string <h> into <host_> and return the resulting pointer.
-  /// This object maintains ownership of this string.
-  const char *host (const char *h);
-
-  /// Return the port number.
-  CORBA::UShort port (void) const;
-
-  /// Set the port number.
-  CORBA::UShort port (CORBA::UShort p);
-
-  //TAO_DIOP_Connection_Handler *&hint (void);
-  // Access to our <hint_>.
-
-private:
-
-  /// Helper method for setting INET_Addr.
-  int set (const ACE_INET_Addr &addr,
-           int use_dotted_decimal_addresses);
-
-  /// String representing the host name.
-  CORBA::String_var host_;
-
-  /// TCP port number.
-  CORBA::UShort port_;
-
-  /// Cached instance of <ACE_INET_Addr> for use in making
-  /// invocations, etc.
-  ACE_INET_Addr object_addr_;
-
-  /// DIOP Endpoints can be stringed into a list.  Return the next
-  /// endpoint in the list, if any.
-  TAO_DIOP_Endpoint *next_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "DIOP_Endpoint.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif  /* TAO_DIOP_PROFILE_H */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.i b/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.i
deleted file mode 100644
index ad9b9d97a30..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Endpoint.i
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const ACE_INET_Addr &
-TAO_DIOP_Endpoint::object_addr (void) const
-{
-  // The object_addr_ is initialized here, rather than at IOR decode
-  // time for several reasons:
-  //   1. A request on the object may never be invoked.
-  //   2. The DNS setup may have changed dynamically.
-  //   ...etc..
-
-  // We need to modify the object_addr_ in this method.  Do so using a
-  // non-const copy of the <this> pointer.
-  TAO_DIOP_Endpoint *endpoint =
-    ACE_const_cast (TAO_DIOP_Endpoint *,
-                    this);
-
-  if (this->object_addr_.get_type () != AF_INET
-      && endpoint->object_addr_.set (this->port_,
-                                    this->host_.in ()) == -1)
-    {
-      // If this call fails, it most likely due a hostname lookup
-      // failure caused by a DNS misconfiguration.  If a request is
-      // made to the object at the given host and port, then a
-      // CORBA::TRANSIENT() exception should be thrown.
-
-      // Invalidate the ACE_INET_Addr.  This is used as a flag to
-      // denote that ACE_INET_Addr initialization failed.
-      endpoint->object_addr_.set_type (-1);
-    }
-
-  return this->object_addr_;
-}
-
-ACE_INLINE const char *
-TAO_DIOP_Endpoint::host (void) const
-{
-  return this->host_.in ();
-}
-
-ACE_INLINE CORBA::UShort
-TAO_DIOP_Endpoint::port (void) const
-{
-  return this->port_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_DIOP_Endpoint::port (CORBA::UShort p)
-{
-  return this->port_ = p;
-}
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Factory.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Factory.cpp
deleted file mode 100644
index 4ef5f57aa2e..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Factory.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-
-#include "DIOP_Factory.h"
-#include "DIOP_Acceptor.h"
-#include "DIOP_Connector.h"
-
-ACE_RCSID(TAO_DIOP, DIOP_Factory, "$Id$")
-
-static const char prefix_[] = "diop";
-
-TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
-  :  TAO_Protocol_Factory (TAO_TAG_UDP_PROFILE),
-     major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
-{
-}
-
-TAO_DIOP_Protocol_Factory::~TAO_DIOP_Protocol_Factory (void)
-{
-}
-
-int
-TAO_DIOP_Protocol_Factory::match_prefix (const ACE_CString &prefix)
-{
-  // Check for the proper prefix for this protocol.
-  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
-}
-
-const char *
-TAO_DIOP_Protocol_Factory::prefix (void) const
-{
-  return ::prefix_;
-}
-
-char
-TAO_DIOP_Protocol_Factory::options_delimiter (void) const
-{
-  return '/';
-}
-
-TAO_Acceptor *
-TAO_DIOP_Protocol_Factory::make_acceptor (void)
-{
-  TAO_Acceptor *acceptor = 0;
-
-  ACE_NEW_RETURN (acceptor,
-                  TAO_DIOP_Acceptor,
-                  0);
-
-  return acceptor;
-}
-
-int
-TAO_DIOP_Protocol_Factory::init (int /* argc */,
-                                 char* /* argv */ [])
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_DIOP_Protocol_Factory::make_connector (void)
-{
-  TAO_Connector *connector = 0;
-
-  ACE_NEW_RETURN (connector,
-                  TAO_DIOP_Connector,
-                  0);
-  return connector;
-}
-
-int
-TAO_DIOP_Protocol_Factory::requires_explicit_endpoint (void) const
-{
-  return 0;
-}
-
-ACE_STATIC_SVC_DEFINE (TAO_DIOP_Protocol_Factory,
-                       ACE_TEXT ("DIOP_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_DIOP_Protocol_Factory),
-                       ACE_Service_Type::DELETE_THIS |
-                                  ACE_Service_Type::DELETE_OBJ,
-                       0)
-
-ACE_FACTORY_DEFINE (TAO_DIOP, TAO_DIOP_Protocol_Factory)
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Factory.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Factory.h
deleted file mode 100644
index 54ba77d8df9..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Factory.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   DIOP_Factory.h
- *
- *  $Id$
- *
- *  @author Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_FACTORY_H
-#define TAO_DIOP_FACTORY_H
-#include "ace/pre.h"
-
-#include "tao/Protocol_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Service_Config.h"
-#include "diop_export.h"
-
-class TAO_Acceptor;
-class TAO_Connector;
-
-class TAO_DIOP_Export TAO_DIOP_Protocol_Factory : public TAO_Protocol_Factory
-{
-public:
-  TAO_DIOP_Protocol_Factory (void);
-  virtual ~TAO_DIOP_Protocol_Factory (void);
-
-  // = Service Configurator hooks.
-  /// Dynamic linking hook
-  virtual int init (int argc, char* argv[]);
-
-  /// Verify prefix is a match
-  virtual int match_prefix (const ACE_CString &prefix);
-
-  /// Returns the prefix used by the protocol.
-  virtual const char *prefix (void) const;
-
-  /// Return the character used to mark where an endpoint ends and
-  /// where its options begin.
-  virtual char options_delimiter (void) const;
-
-  // = Check Protocol_Factory.h for a description of these methods.
-  virtual TAO_Acceptor  *make_acceptor (void);
-  virtual TAO_Connector *make_connector  (void);
-  virtual int requires_explicit_endpoint (void) const;
-
-private:
-  /// Changing the version number can be used to provide backwards
-  /// compatibility with old clients.
-  int major_;
-  int minor_;
-};
-
-ACE_STATIC_SVC_DECLARE (TAO_DIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO_DIOP, TAO_DIOP_Protocol_Factory)
-
-#include "ace/post.h"
-#endif /* TAO_DIOP_FACTORY_H */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp
deleted file mode 100644
index 6cba83980c1..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.cpp
+++ /dev/null
@@ -1,680 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-
-#include "DIOP_Profile.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/iiop_endpoints.h"
-
-ACE_RCSID(tao, DIOP_Profile, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-static const char prefix_[] = "iiop";
-
-const char TAO_DIOP_Profile::object_key_delimiter_ = '/';
-
-char
-TAO_DIOP_Profile::object_key_delimiter (void) const
-{
-  return TAO_DIOP_Profile::object_key_delimiter_;
-}
-
-
-
-TAO_DIOP_Profile::TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                                    const TAO_ObjectKey &object_key,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UDP_PROFILE, orb_core, version),
-    endpoint_ (addr,
-               orb_core->orb_params ()->use_dotted_decimal_addresses ()),
-    count_ (1),
-    object_key_ (object_key),
-    tagged_profile_ ()
-{
-}
-
-TAO_DIOP_Profile::TAO_DIOP_Profile (const char* host,
-                                    CORBA::UShort port,
-                                    const TAO_ObjectKey &object_key,
-                                    const ACE_INET_Addr &addr,
-                                    const TAO_GIOP_Version &version,
-                                    TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UDP_PROFILE, orb_core, version),
-    endpoint_ (host, port, addr),
-    count_ (1),
-    object_key_ (object_key),
-    tagged_profile_ ()
-{
-}
-
-TAO_DIOP_Profile::TAO_DIOP_Profile (const char *string,
-                                    TAO_ORB_Core *orb_core,
-                                    CORBA::Environment &ACE_TRY_ENV)
-  : TAO_Profile (TAO_TAG_UDP_PROFILE,
-                 orb_core,
-                 TAO_GIOP_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
-    endpoint_ (),
-    count_ (1),
-    object_key_ (),
-    tagged_profile_ ()
-{
-  this->parse_string (string, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-TAO_DIOP_Profile::TAO_DIOP_Profile (TAO_ORB_Core *orb_core)
-  : TAO_Profile (TAO_TAG_UDP_PROFILE,
-                 orb_core,
-                 TAO_GIOP_Version (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR)),
-    endpoint_ (),
-    count_ (1),
-    object_key_ (),
-    tagged_profile_ ()
-{
-}
-
-TAO_DIOP_Profile::~TAO_DIOP_Profile (void)
-{
-  // Clean up the list of endpoints since we own it.
-  // Skip the head, since it is not dynamically allocated.
-  TAO_Endpoint *tmp = 0;
-
-  for (TAO_Endpoint *next = this->endpoint ()->next ();
-       next != 0;
-       next = tmp)
-    {
-      tmp = next->next ();
-      delete next;
-    }
-}
-
-// return codes:
-// -1 -> error
-//  0 -> can't understand this version
-//  1 -> success.
-
-int
-TAO_DIOP_Profile::decode (TAO_InputCDR& cdr)
-{
-  CORBA::ULong encap_len = cdr.length ();
-
-  // Read and verify major, minor versions, ignoring DIOP profiles
-  // whose versions we don't understand.
-  CORBA::Octet major = 0, minor = 0;
-
-  if (!(cdr.read_octet (major)
-        && major == TAO_DEF_GIOP_MAJOR
-        && cdr.read_octet (minor)))
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) DIOP_Profile::decode - v%d.%d\n"),
-                    major,
-                    minor));
-      return -1;
-    }
-
-  this->version_.major = major;
-
-  if (minor <= TAO_DEF_GIOP_MINOR)
-    this->version_.minor = minor;
-
-  // Decode host and port into the <endpoint_>.
-  if (cdr.read_string (this->endpoint_.host_.out ()) == 0
-      || cdr.read_ushort (this->endpoint_.port_) == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) DIOP_Profile::decode - ")
-                    ACE_TEXT ("error while decoding host/port")));
-      return -1;
-    }
-
-  // ... and object key.
-
-  if ((cdr >> this->object_key_) == 0)
-    return -1;
-
-  // Tagged Components *only* exist after version 1.0!
-  // For GIOP 1.2, DIOP and GIOP have same version numbers!
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    if (this->tagged_components_.decode (cdr) == 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,
-                ACE_TEXT ("%d bytes out of %d left after DIOP profile data\n"),
-                cdr.length (),
-                encap_len));
-
-#if (TAO_HAS_RT_CORBA == 1)
-  // This protection is here not for correctness but for efficiency.
-  // Currently there are > 1 endpoint per profile only with RTCORBA.
-
-  // Decode endpoints, if any.
-  if (this->decode_endpoints () == -1)
-    return -1;
-
-#endif  /* TAO_HAS_RT_CORBA == 1 */
-
-  if (cdr.good_bit ())
-    {
-      // Invalidate the object_addr_ until first access.
-      this->endpoint_.object_addr_.set_type (-1);
-
-      return 1;
-    }
-
-  return -1;
-}
-
-int
-TAO_DIOP_Profile::parse_string (const char *string,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!string || !*string)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_DEFAULT_MINOR_CODE,
-          EINVAL),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  // Remove the "N.n@" version prefix, if it exists, and verify the
-  // version is one that we accept.
-
-  // Check for version
-  if (isdigit (string [0]) &&
-      string[1] == '.' &&
-      isdigit (string [2]) &&
-      string[3] == '@')
-    {
-      // @@ 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 += 4;
-      // Skip over the "N.n@"
-    }
-
-  if (this->version_.major != TAO_DEF_GIOP_MAJOR ||
-      this->version_.minor >  TAO_DEF_GIOP_MINOR)
-    {
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-                          CORBA_SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-                            EINVAL),
-                          CORBA::COMPLETED_NO),
-                        -1);
-    }
-
-  // Pull off the "hostname:port/" part of the objref
-  // Copy the string because we are going to modify it...
-  CORBA::String_var copy (string);
-
-  char *start = copy.inout ();
-  char *cp_pos = ACE_OS::strchr (start, ':');  // Look for a port
-
-  char *okd = ACE_OS::strchr (start, this->object_key_delimiter_);
-
-  if (okd == 0)
-    {
-      // No object key delimiter!
-      ACE_THROW_RETURN (CORBA::INV_OBJREF (
-        CORBA_SystemException::_tao_minor_code (
-          TAO_DEFAULT_MINOR_CODE,
-          EINVAL),
-        CORBA::COMPLETED_NO),
-        -1);
-    }
-
-  // The default port number.
-  const char def_port [] = ":683";
-
-  // Length of port.
-  CORBA::ULong length = 0;
-
-  // Length of host string.
-  CORBA::ULong length_host = 0;
-
-  // Length of <cp>
-  CORBA::ULong length_cp =
-    ACE_OS::strlen ((const char *)okd) + sizeof (def_port);
-
-  CORBA::String_var cp = CORBA::string_alloc (length_cp);
-
-  if (cp_pos == 0)
-    {
-      // No host/port delimiter! Dont raise an exception. Use the
-      // default port No. 683
-      ACE_OS::strcpy (cp, def_port);
-      ACE_OS::strcat (cp, okd);
-
-      length =
-        ACE_OS::strlen (cp.in ()) -
-        ACE_OS::strlen ((const char *)okd) -
-        1;
-
-      length_host =
-        ACE_OS::strlen (start) +
-        sizeof (def_port) -
-        ACE_OS::strlen (cp.in ()) -1;
-    }
-  else
-    {
-      // The port is specified:
-      cp = (const char *)cp_pos;
-
-      length =
-        ACE_OS::strlen (cp.in ())
-        - ACE_OS::strlen ((const char *)okd) + 1;
-
-      length_host =
-        ACE_OS::strlen ((const char *)start)
-        - ACE_OS::strlen (cp.in ());
-    }
-
-  CORBA::String_var tmp = CORBA::string_alloc (length);
-
-  ACE_OS::strncpy (tmp.inout (), cp.in () + 1, length);
-  tmp[length] = '\0';
-
-  this->endpoint_.port_ = (CORBA::UShort) ACE_OS::atoi (tmp.in ());
-
-  tmp = CORBA::string_alloc (length_host);
-
-  ACE_OS::strncpy (tmp.inout (), start, length_host);
-  tmp[length_host] = '\0';
-
-  this->endpoint_.host_ = tmp._retn ();
-
-  ACE_INET_Addr host_addr;
-
-  if (ACE_OS::strcmp (this->endpoint_.host_.in (), "") == 0)
-    {
-      char tmp_host [MAXHOSTNAMELEN + 1];
-
-      // If no host is specified: assign the default host : the local host.
-      if (host_addr.get_host_name (tmp_host,
-                                   sizeof (tmp_host)) != 0)
-        {
-          const char *tmp = host_addr.get_host_addr ();
-          if (tmp == 0)
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            ACE_TEXT ("\n\nTAO (%P|%t) ")
-                            ACE_TEXT ("DIOP_Profile::parse_string ")
-                            ACE_TEXT ("- %p\n\n"),
-                            ACE_TEXT ("cannot determine hostname")));
-              return -1;
-            }
-          this->endpoint_.host_ = tmp;
-        }
-      else
-        {
-          this->endpoint_.host_ = (const char *) tmp_host;
-        }
-    }
-
-  if (this->endpoint_.object_addr_.set (this->endpoint_.port_,
-                                        this->endpoint_.host_.in ()) == -1)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("%p\n"),
-                      ACE_TEXT ("Error Occured !")
-                      ACE_TEXT ("TAO (%P|%t) DIOP_Profile::parse_string - \n")
-                      ACE_TEXT ("TAO (%P|%t) ACE_INET_Addr::set () failed")));
-        }
-      return -1;
-    }
-
-  start = ++okd;  // increment past the object key separator
-
-  TAO_ObjectKey::decode_string_to_sequence (this->object_key_, start);
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO_DIOP_Profile::is_equivalent (const TAO_Profile *other_profile)
-{
-
-  if (other_profile->tag () != TAO_TAG_UDP_PROFILE)
-    return 0;
-
-  const TAO_DIOP_Profile *op =
-    ACE_dynamic_cast (const TAO_DIOP_Profile *, other_profile);
-
-
-  if (!(this->object_key_ == op->object_key_
-        && this->version_ == op->version_
-        && this->count_ == op->count_))
-    return 0;
-
-  // Check endpoints equivalence.
-  const TAO_DIOP_Endpoint *other_endp = &op->endpoint_;
-  for (TAO_DIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      if (endp->is_equivalent (other_endp))
-        other_endp = other_endp->next_;
-      else
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::ULong
-TAO_DIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &)
-{
-  // Get the hashvalue for all endpoints.
-  CORBA::ULong hashval = 0;
-  for (TAO_DIOP_Endpoint *endp = &this->endpoint_;
-       endp != 0;
-       endp = endp->next_)
-    {
-      hashval += endp->hash ();
-    }
-
-  hashval += this->version_.minor;
-  hashval += this->tag ();
-
-  if (this->object_key_.length () >= 4)
-    {
-      hashval += this->object_key_ [1];
-      hashval += this->object_key_ [3];
-    }
-
-  return hashval % max;
-}
-
-TAO_Endpoint*
-TAO_DIOP_Profile::endpoint (void)
-{
-  return &this->endpoint_;
-}
-
-size_t
-TAO_DIOP_Profile::endpoint_count (void)
-{
-  return this->count_;
-}
-
-void
-TAO_DIOP_Profile::add_endpoint (TAO_DIOP_Endpoint *endp)
-{
-  endp->next_ = this->endpoint_.next_;
-  this->endpoint_.next_ = endp;
-
-  this->count_++;
-}
-
-char *
-TAO_DIOP_Profile::to_string (CORBA::Environment &)
-{
-  CORBA::String_var key;
-  TAO_ObjectKey::encode_sequence_to_string (key.inout(),
-                                             this->object_key_);
-
-  u_int buflen = (ACE_OS::strlen (::prefix_) +
-                  3 /* "loc" */ +
-                  1 /* colon separator */ +
-                  2 /* double-slash separator */ +
-                  1 /* major version */ +
-                  1 /* decimal point */ +
-                  1 /* minor version */ +
-                  1 /* `@' character */ +
-                  ACE_OS::strlen (this->endpoint_.host ()) +
-                  1 /* colon separator */ +
-                  5 /* port number */ +
-                  1 /* object key separator */ +
-                  ACE_OS::strlen (key.in ()));
-
-  char * buf = CORBA::string_alloc (buflen);
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "%sloc://%c.%c@%s:%d%c%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->endpoint_.host (),
-                   this->endpoint_.port (),
-                   this->object_key_delimiter_,
-                   key.in ());
-  return buf;
-}
-
-const char *
-TAO_DIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-int
-TAO_DIOP_Profile::encode (TAO_OutputCDR &stream) const
-{
-  // UNSIGNED LONG, protocol tag
-  stream.write_ulong (this->tag ());
-
-  // Create the encapsulation....
-  TAO_OutputCDR encap (ACE_CDR::DEFAULT_BUFSIZE,
-                       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 ()->to_iso8859 (),
-                       this->orb_core ()->to_unicode ());
-
-
-  // Create the profile body
-  this->create_profile_body (encap);
-
-  // write the encapsulation as an octet sequence...
-
-  stream << CORBA::ULong (encap.total_length ());
-  stream.write_octet_array_mb (encap.begin ());
-
-  return 1;
-}
-
-
-IOP::TaggedProfile &
-TAO_DIOP_Profile::create_tagged_profile (void)
-{
-  // Check whether we have already created the TaggedProfile
-  if (this->tagged_profile_.profile_data.get_buffer () == 0)
-    {
-      // As we have not created we will now create the TaggedProfile
-      this->tagged_profile_.tag = TAO_TAG_UDP_PROFILE;
-
-      // Create the encapsulation....
-      TAO_OutputCDR encap (ACE_CDR::DEFAULT_BUFSIZE,
-                           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 ()->to_iso8859 (),
-                           this->orb_core ()->to_unicode ());
-
-      // Create the profile body
-      this->create_profile_body (encap);
-
-      CORBA::ULong length =
-        ACE_static_cast(CORBA::ULong,encap.total_length ());
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      // Place the message block in to the Sequence of Octets that we
-      // have
-      this->tagged_profile_.profile_data.replace (length,
-                                                  encap.begin ());
-#else
-      this->tagged_profile_.profile_data.length (length);
-      CORBA::Octet *buffer =
-        this->tagged_profile_.profile_data.get_buffer ();
-      for (const ACE_Message_Block *i = encap.begin ();
-           i != encap.end ();
-           i = i->next ())
-        {
-          ACE_OS::memcpy (buffer, i->rd_ptr (), i->length ());
-          buffer += i->length ();
-        }
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
-    }
-
-  return this->tagged_profile_;
-}
-
-void
-TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const
-{
-  encap.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // The GIOP version
-  encap.write_octet (this->version_.major);
-  encap.write_octet (this->version_.minor);
-
-  // STRING hostname from profile
-  encap.write_string (this->endpoint_.host ());
-
-  // UNSIGNED SHORT port number
-  encap.write_ushort (this->endpoint_.port ());
-
-  // OCTET SEQUENCE for object key
-  encap << this->object_key_;
-
-  if (this->version_.major > 1
-      || this->version_.minor > 0)
-    this->tagged_components ().encode (encap);
-}
-
-int
-TAO_DIOP_Profile::encode_endpoints (void)
-{
-  // Create a data structure and fill it with endpoint info for wire
-  // transfer.
-  // We include information for the head of the list
-  // together with other endpoints because even though its addressing
-  // info is transmitted using standard ProfileBody components, its
-  // priority is not!
-
-  TAO_IIOPEndpointSequence endpoints;
-  endpoints.length (this->count_);
-
-  const TAO_DIOP_Endpoint *endpoint = &this->endpoint_;
-  for (size_t i = 0;
-       i < this->count_;
-       ++i)
-    {
-      endpoints[i].host = endpoint->host ();
-      endpoints[i].port = endpoint->port ();
-      endpoints[i].priority = endpoint->priority ();
-
-      endpoint = endpoint->next_;
-    }
-
-  // Encode the data structure.
-  TAO_OutputCDR out_cdr;
-  if ((out_cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-       == 0)
-      || (out_cdr << endpoints) == 0)
-    return -1;
-  CORBA::ULong length = out_cdr.total_length ();
-
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-  tagged_component.component_data.length (length);
-  CORBA::Octet *buf =
-    tagged_component.component_data.get_buffer ();
-
-  for (const ACE_Message_Block *iterator = out_cdr.begin ();
-       iterator != 0;
-       iterator = iterator->cont ())
-    {
-      CORBA::ULong i_length = iterator->length ();
-      ACE_OS::memcpy (buf, iterator->rd_ptr (), i_length);
-
-      buf += i_length;
-    }
-
-  // Add component with encoded endpoint data to this profile's
-  // TaggedComponents.
-  tagged_components_.set_component (tagged_component);
-
-  return  0;
-}
-
-int
-TAO_DIOP_Profile::decode_endpoints (void)
-{
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = TAO_TAG_ENDPOINTS;
-
-  if (this->tagged_components_.get_component (tagged_component))
-    {
-      const CORBA::Octet *buf =
-        tagged_component.component_data.get_buffer ();
-
-      TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf),
-                           tagged_component.component_data.length ());
-
-      // Extract the Byte Order.
-      CORBA::Boolean byte_order;
-      if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-        return -1;
-      in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
-
-      // Extract endpoints sequence.
-      TAO_IIOPEndpointSequence endpoints;
-
-      if ((in_cdr >> endpoints) == 0)
-        return -1;
-
-      // Get the priority of the first endpoint (head of the list.
-      // It's other data is extracted as part of the standard profile
-      // decoding.
-      this->endpoint_.priority (endpoints[0].priority);
-
-      // Use information extracted from the tagged component to
-      // populate the profile.  Skip the first endpoint, since it is
-      // always extracted through standard profile body.  Also, begin
-      // from the end of the sequence to preserve endpoint order,
-      // since <add_endpoint> method reverses the order of endpoints
-      // in the list.
-      for (CORBA::ULong i = endpoints.length () - 1;
-           i > 0;
-           --i)
-        {
-          TAO_DIOP_Endpoint *endpoint = 0;
-          ACE_NEW_RETURN (endpoint,
-                          TAO_DIOP_Endpoint (endpoints[i].host,
-                                             endpoints[i].port,
-                                             endpoints[i].priority),
-                          -1);
-
-          this->add_endpoint (endpoint);
-        }
-    }
-
-  return 0;
-}
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.h
deleted file mode 100644
index 479411f3ceb..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.h
+++ /dev/null
@@ -1,209 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-
-//=============================================================================
-/**
- *  @file     DIOP_Profile.h
- *
- *  $Id$
- *
- *   DIOP profile specific processing
- *
- *
- *  @author  Fred Kuhns <fredk@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_DIOP_PROFILE_H
-#define TAO_DIOP_PROFILE_H
-#include "ace/pre.h"
-
-#include "tao/Profile.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Object_KeyC.h"
-#include "DIOP_Endpoint.h"
-
-#include "ace/Synch.h"
-#include "diop_export.h"
-
-
-// TAO DIOP_Profile concrete Profile definitions
-/**
- * @class TAO_DIOP_Profile
- *
- * @brief This class defines the protocol specific attributes required
- * for locating ORBs over a TCP/IP network.
- *
- * This class defines the DIOP profile as specified in the CORBA
- * specification.
- */
-class TAO_DIOP_Export TAO_DIOP_Profile : public TAO_Profile
-{
-public:
-  /// The object key delimiter that DIOP uses or expects.
-  static const char object_key_delimiter_;
-  virtual char object_key_delimiter (void) const;
-
-  /// Return the char string prefix.
-  static const char *prefix (void);
-
-  /// Profile constructor, same as above except the object_key has
-  /// already been marshaled.
-  TAO_DIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  ///  Profile constructor, this is the most efficient since it
-  /// doesn't require any address resolution processing.
-  TAO_DIOP_Profile (const char *host,
-                    CORBA::UShort port,
-                    const TAO_ObjectKey &object_key,
-                    const ACE_INET_Addr &addr,
-                    const TAO_GIOP_Version &version,
-                    TAO_ORB_Core *orb_core);
-
-  /// Create object using a string ior.
-  TAO_DIOP_Profile (const char *string,
-                    TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ());
-
-  /// Profile constructor, default.
-  TAO_DIOP_Profile (TAO_ORB_Core *orb_core);
-
-  /// Destructor is to be called only through <_decr_refcnt>.
-  ~TAO_DIOP_Profile (void);
-
-  /// Initialize this object using the given input string.
-  /// Url-style string contain only one endpoint.
-  virtual int parse_string (const char *string,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-  /**
-   * Return a string representation for this profile.
-   * client must deallocate memory.
-   * This is used to create url-style reference.  Only one
-   * endpoint is included into the string.
-   */
-  virtual char * to_string (CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ());
-
-  /// Initialize this object using the given CDR octet string.
-  virtual int decode (TAO_InputCDR& cdr);
-
-  /// Encode this profile in a stream, i.e. marshal it.
-  virtual int encode (TAO_OutputCDR &stream) const;
-
-  /**
-   * Encodes this profile's endpoints into a tagged component.
-   * This is done only if RTCORBA is enabled, since currently this is
-   * the only case when we have more than one endpoint per profile.
-   * Returns 0 on success and -1 on failure.
-   *
-   * Endpoints are transmitted using TAO-proprietory tagged component.
-   * Component tag is TAO_TAG_ENDPOINTS and component data is an
-   * encapsulation of a sequence of structs, each representing a
-   * single endpoint.  Data format is specified in iiop_endpoins.pidl.
-   *
-   * Multiple TAG_ALTERNATE_DIOP_ADDRESS components can be used
-   * instead of a single proprietory component to transmit multiple
-   * endpoints.  This is somewhat slower and less convenient.  Also,
-   * TAG_ALTERNATE_DIOP_ADDRESS does not provide for transmission of
-   * endpoint priorities.
-   *
-   */
-  virtual int encode_endpoints (void);
-
-  /// @@ deprecated. return a reference to the Object Key.
-  virtual const TAO_ObjectKey &object_key (void) const;
-
-  /// Return a pointer to the Object Key.  The caller owns the memory
-  /// allocated for the returned key.
-  virtual TAO_ObjectKey *_key (void) const;
-
-  /// Return pointer to the head of this profile's endpoints list.
-  virtual TAO_Endpoint *endpoint (void);
-
-  /// Return how many endpoints this profile contains.
-  virtual size_t endpoint_count (void);
-
-  /**
-   * Add <endp> to this profile's list of endpoints (it is inserted
-   * next to the head of the list).  This profiles takes ownership of
-   * <endp>.
-   */
-  void add_endpoint (TAO_DIOP_Endpoint *endp);
-
-  /**
-   * Return true if this profile is equivalent to other_profile.  Two
-   * profiles are equivalent iff their tag, object_key, version and
-   * all endpoints are the same.
-   */
-  virtual CORBA::Boolean is_equivalent (const TAO_Profile *other_profile);
-
-  /// Return a hash value for this object.
-  virtual CORBA::ULong hash (CORBA::ULong max,
-                             CORBA::Environment &ACE_TRY_ENV =
-                             TAO_default_environment ());
-
-  /// Please refer to Profile.h for the documentation of this
-  /// function.
-  virtual IOP::TaggedProfile &create_tagged_profile (void);
-
-private:
-
-  /// Creates an encapsulation of the ProfileBody struct in the <cdr>
-  void create_profile_body (TAO_OutputCDR &cdr) const;
-
-  /**
-   * Helper for <decode>.  Decodes endpoints from a tagged component.
-   * Decode only if RTCORBA is enabled.  Furthermore, we may not find
-   * TAO_TAG_ENDPOINTS component, e.g., if we are talking to nonRT
-   * version of TAO or some other ORB.  This is not an error, and we
-   * must proceed.  Return 0 on success and -1 on failure.
-   */
-  int decode_endpoints (void);
-
-protected:
-
-  /**
-   * Head of this profile's list of endpoints.  This endpoint is not
-   * dynamically allocated because a profile always contains at least
-   * one endpoint.
-   *
-   * Currently, a profile contains more than one endpoint, i.e.,
-   * list contains more than just the head, only when RTCORBA is enabled.
-   * However, in the near future, this will be used in nonRT
-   * mode as well, e.g., to support TAG_ALTERNATE_DIOP_ADDRESS
-   * feature.
-   * Addressing info of the default endpoint, i.e., head of the list,
-   * is transmitted using standard DIOP ProfileBody components.  See
-   * <encode_endpoints> method documentation above for how the rest of
-   * the endpoint list is transmitted.
-   */
-  TAO_DIOP_Endpoint endpoint_;
-
-  /// Number of endpoints in the list headed by <endpoint_>.
-  size_t count_;
-
-private:
-
-  /// object_key associated with this profile.
-  TAO_ObjectKey object_key_;
-
-  /// Our tagged profile
-  IOP::TaggedProfile tagged_profile_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "DIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif  /* TAO_DIOP_PROFILE_H */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.i b/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.i
deleted file mode 100644
index 2c18a75ae92..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Profile.i
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_DIOP_Profile::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_DIOP_Profile::_key (void) const
-{
-  TAO_ObjectKey *key = 0;
-
-  ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (this->object_key_),
-                  0);
-
-  return key;
-}
-
-
-
-
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
deleted file mode 100644
index 1a3582d958f..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.cpp
+++ /dev/null
@@ -1,706 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#include "DIOP_Transport.h"
-#include "DIOP_Connection_Handler.h"
-#include "DIOP_Acceptor.h"
-#include "DIOP_Profile.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/operation_details.h"
-#include "tao/Timeprobe.h"
-#include "tao/CDR.h"
-#include "tao/Transport_Mux_Strategy.h"
-#include "tao/Wait_Strategy.h"
-#include "tao/Sync_Strategies.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/GIOP_Message_Base.h"
-#include "tao/GIOP_Message_Lite.h"
-
-#if !defined (__ACE_INLINE__)
-# include "DIOP_Transport.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao, DIOP_Transport, "$Id$")
-
-TAO_DIOP_Transport::TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
-                                        TAO_ORB_Core *orb_core,
-                                        CORBA::Boolean flag)
-  : TAO_Transport (TAO_TAG_UDP_PROFILE,
-                   orb_core)
-  , connection_handler_ (handler)
-  , messaging_object_ (0)
-  , local_buffer_ (4192)
-{
-  // @@ Michael: Here we hardcoded the size of the buffer!
-  if (flag)
-    {
-      // Use the lite version of the protocol
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Lite (orb_core));
-    }
-    else
-    {
-      // Use the normal GIOP object
-      ACE_NEW (this->messaging_object_,
-               TAO_GIOP_Message_Base (orb_core));
-    }
-}
-
-TAO_DIOP_Transport::~TAO_DIOP_Transport (void)
-{
-  delete this->messaging_object_;
-}
-
-TAO_DIOP_SVC_HANDLER *
-TAO_DIOP_Transport::service_handler (void)
-{
-  return this->connection_handler_;
-}
-
-ACE_HANDLE
-TAO_DIOP_Transport::handle (void)
-{
-  return this->connection_handler_->get_handle ();
-}
-
-ACE_Event_Handler *
-TAO_DIOP_Transport::event_handler (void)
-{
-  return this->connection_handler_;
-}
-
-void
-TAO_DIOP_Transport::close_connection (void)
-{
-  // Call handle close
-  this->connection_handler_->handle_close ();
-
-  // Purge the entry
-  this->connection_handler_->purge_entry ();
-}
-
-int
-TAO_DIOP_Transport::idle (void)
-{
-  // @@ Michael: We do not use this information
-  //return this->connection_handler_->make_idle ();
-  return 0;
-}
-
-ssize_t
-TAO_DIOP_Transport::send (const ACE_Message_Block *message_block,
-                          const ACE_Time_Value * /*max_wait_time*/,
-                          size_t *bt)
-{
-  const ACE_INET_Addr &addr = this->connection_handler_->addr ();
-
-  size_t temp;
-  size_t &bytes_transferred = bt == 0 ? temp : *bt;
-  bytes_transferred = 0;
-
-  iovec iov[IOV_MAX];
-  int iovcnt = 0;
-
-  while (message_block != 0)
-    {
-      // Our current message block chain.
-      const ACE_Message_Block *current_message_block = message_block;
-
-      while (current_message_block != 0)
-        {
-          size_t current_message_block_length =
-            current_message_block->length ();
-
-          // Check if this block has any data to be sent.
-          if (current_message_block_length > 0)
-            {
-              // Collect the data in the iovec.
-              iov[iovcnt].iov_base = current_message_block->rd_ptr ();
-              iov[iovcnt].iov_len  = current_message_block_length;
-
-              // Increment iovec counter.
-              iovcnt++;
-
-              // The buffer is full make a OS call.  @@ TODO find a way to
-              // find IOV_MAX for platforms that do not define it rather
-              // than simply setting IOV_MAX to some arbitrary value such
-              // as 16.
-              if (iovcnt == IOV_MAX)
-                {
-                  ssize_t current_transfer =
-                    this->connection_handler_->dgram ().send (iov,
-                                                              iovcnt,
-                                                              addr);
-                  // Errors.
-                  if (current_transfer == -1 || current_transfer == 0)
-                    return current_transfer;
-
-                  // Add to total bytes transferred.
-                  bytes_transferred += current_transfer;
-
-                  // Reset iovec counter.
-                  iovcnt = 0;
-                }
-            }
-
-          // Select the next message block in the chain.
-          current_message_block = current_message_block->cont ();
-        }
-
-      // Selection of the next message block chain.
-      message_block = message_block->next ();
-    }
-
-  // Check for remaining buffers to be sent.  This will happen when
-  // IOV_MAX is not a multiple of the number of message blocks.
-  if (iovcnt != 0)
-    {
-      ssize_t current_transfer =
-        this->connection_handler_->dgram ().send (iov,
-                                       iovcnt,
-                                       addr);
-      // Errors.
-      if (current_transfer == -1 || current_transfer == 0)
-        return current_transfer;
-
-      // Add to total bytes transferred.
-      bytes_transferred += current_transfer;
-    }
-
-  //ACE_DEBUG ((LM_DEBUG,
-  //            "Sent %d bytes to %s:%d\n",
-  //            bytes_transferred,
-  //            addr.get_host_name (),
-  //            addr.get_port_number ()));
-
-  // Return total bytes transferred.
-  return bytes_transferred;
-}
-
-ssize_t
-TAO_DIOP_Transport::recv (char *buf,
-                          size_t len,
-                          const ACE_Time_Value * /*max_wait_time*/)
-{
-  ACE_INET_Addr from_addr;
-
-  // We read always one datagram, the unread rest is buffered
-  // if not immediately read.
-  if (local_buffer_.length () == 0)
-    {
-      local_buffer_.crunch ();
-      ssize_t n = this->connection_handler_->dgram ().recv (local_buffer_.wr_ptr (),
-                                                  local_buffer_.size (),
-                                                  from_addr);
-      if (n == -1)
-        return -1;
-      else
-        local_buffer_.wr_ptr (n);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Received %d bytes from %s:%d\n",
-                  n,
-                  this->connection_handler_->addr ().get_host_name (),
-                  this->connection_handler_->addr ().get_port_number ()));
-    }
-
-  if (local_buffer_.length () > 0)
-    {
-      ssize_t to_read = -1;
-      if (len >= local_buffer_.length ())
-        to_read = local_buffer_.length ();
-      else
-        to_read = len;
-
-      ACE_OS::memcpy (buf, local_buffer_.rd_ptr (), to_read);
-      local_buffer_.rd_ptr (to_read);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Read %d bytes\n",
-                  to_read));
-      return to_read;
-    }
-
-  return -1;
-}
-
-
-int
-TAO_DIOP_Transport::read_process_message (ACE_Time_Value *max_wait_time,
-                                          int block)
-{
-  // Read the message of the socket
-  int result =  this->messaging_object_->read_message (this,
-                                                       block,
-                                                       max_wait_time);
-
-  if (result == -1)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - %p\n"),
-                    ACE_TEXT ("DIOP_Transport::read_message, failure in read_message ()")));
-
-      this->tms_->connection_closed ();
-      return -1;
-    }
-  if (result == 0)
-    return result;
-
-  // Now we know that we have been able to read the complete message
-  // here.. We loop here to see whether we have read more than one
-  // message in our read.
-  do
-    {
-      result = this->process_message ();
-    }
-  while (result > 1);
-
-  return result;
-}
-
-
-int
-TAO_DIOP_Transport::register_handler (void)
-{
-  // @@ It seems like this method should go away, the right reactor is
-  //    picked at object creation time.
-  ACE_Reactor *r = this->orb_core_->reactor ();
-
-  if (r == this->connection_handler_->reactor ())
-    return 0;
-
-  // About to be registered with the reactor, so bump the ref
-  // count
-  this->connection_handler_->incr_ref_count ();
-
-  // Set the flag in the Connection Handler
-  this->connection_handler_->is_registered (1);
-
-
-  // Register the handler with the reactor
-  return  r->register_handler (this->connection_handler_,
-                               ACE_Event_Handler::READ_MASK);
-}
-
-
-int
-TAO_DIOP_Transport::send_request (TAO_Stub *stub,
-                                  TAO_ORB_Core *orb_core,
-                                  TAO_OutputCDR &stream,
-                                  int two_way,
-                                  ACE_Time_Value *max_wait_time)
-{
-  if (this->ws_->sending_request (orb_core,
-                                  two_way) == -1)
-    return -1;
-
-  if (this->send_message (stream,
-                          stub,
-                          two_way,
-                          max_wait_time) == -1)
-
-    return -1;
-
-  return this->idle_after_send ();
-}
-
-int
-TAO_DIOP_Transport::send_message (TAO_OutputCDR &stream,
-                                  TAO_Stub *stub,
-                                  int twoway,
-                                  ACE_Time_Value *max_wait_time)
-{
-  // Format the message in the stream first
-  if (this->messaging_object_->format_message (stream) != 0)
-    return -1;
-
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
-  // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_or_buffer (stub,
-                                    twoway,
-                                    stream.begin (),
-                                    max_wait_time);
-
-  if (n == -1)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) closing conn %d after fault %p\n"),
-                    this->handle (),
-                    ACE_TEXT ("send_message ()\n")));
-
-      return -1;
-    }
-
-  // EOF.
-  if (n == 0)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n")
-                    ACE_TEXT ("EOF, closing conn %d\n"),
-                    this->handle()));
-      return -1;
-    }
-
-  return 1;
-}
-
-
-void
-TAO_DIOP_Transport::start_request (TAO_ORB_Core * /*orb_core*/,
-                                   TAO_Target_Specification & /*spec */,
-                                   TAO_OutputCDR & /*output */,
-                                   CORBA::Environment & /*ACE_TRY_ENV*/)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // @@ This method should NO longer be required..
-
-  /*  if (this->client_mesg_factory_->write_protocol_header
-      (TAO_PLUGGABLE_MESSAGE_REQUEST,
-       output) == 0)
-       ACE_THROW (CORBA::MARSHAL ());*/
-}
-
-
-void
-TAO_DIOP_Transport::start_locate (TAO_ORB_Core * /*orb_core*/,
-                                  TAO_Target_Specification &spec,
-                                  TAO_Operation_Details &opdetails,
-                                  TAO_OutputCDR &output,
-                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->messaging_object_->generate_locate_request_header (opdetails,
-                                                               spec,
-                                                               output) == -1)
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-
-CORBA::Boolean
-TAO_DIOP_Transport::send_request_header (TAO_Operation_Details &opdetails,
-                                         TAO_Target_Specification &spec,
-                                         TAO_OutputCDR &msg)
-{
-// @@ Frank: No Bi Dir DIOP yet..
-/*
-  // Check whether we have a Bi Dir DIOP policy set, whether the
-  // messaging objects are ready to handle bidirectional connections
-  // and also make sure that we have not recd. or sent any information
-  // regarding this before...
-  if (this->orb_core ()->bidir_giop_policy () &&
-      this->messaging_object_->is_ready_for_bidirectional () &&
-      this->bidirectional_flag () < 0)
-    {
-      this->set_bidir_context_info (opdetails);
-
-      // Set the flag to 0
-      this->bidirectional_flag (0);
-    }
-
-  // Modify the request id if we have BiDirectional client/server
-  // setup
-  opdetails.modify_request_id (this->bidirectional_flag ());
-*/
-  // We are going to pass on this request to the underlying messaging
-  // layer. It should take care of this request
-  if (this->messaging_object_->generate_request_header (opdetails,
-                                                        spec,
-                                                        msg) == -1)
-    return 0;
-
-  return 1;
-}
-
-int
-TAO_DIOP_Transport::messaging_init (CORBA::Octet major,
-                                    CORBA::Octet minor)
-{
-  this->messaging_object_->init (major,
-                                 minor);
-  return 1;
-}
-
-// @@ Frank: Hopefully DIOP doesn't need this
-/*
-int
-TAO_DIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr)
-{
-  CORBA::Boolean byte_order;
-  if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    return -1;
-
-  cdr.reset_byte_order (ACE_static_cast(int,byte_order));
-
-  DIOP::ListenPointList listen_list;
-  if ((cdr >> listen_list) == 0)
-    return -1;
-
-  // As we have received a bidirectional information, set the flag to
-  // 1
-  this->bidirectional_flag (1);
-  return this->connection_handler_->process_listen_point_list (listen_list);
-}
-*/
-
-int
-TAO_DIOP_Transport::process_message (void)
-{
-  // Get the <message_type> that we have received
-  TAO_Pluggable_Message_Type t =
-    this->messaging_object_->message_type ();
-
-
-  int result = 0;
-  if (t == TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO (%P|%t) - %p\n"),
-                    ACE_TEXT ("Close Connection Message recd \n")));
-
-      this->tms_->connection_closed ();
-    }
-  else if (t == TAO_PLUGGABLE_MESSAGE_REQUEST)
-    {
-      if (this->messaging_object_->process_request_message (this,
-                                                            this->orb_core ()) == -1)
-        return -1;
-    }
-  else if (t == TAO_PLUGGABLE_MESSAGE_REPLY)
-    {
-      TAO_Pluggable_Reply_Params params (this->orb_core ());
-      if (this->messaging_object_->process_reply_message (params)  == -1)
-        {
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) - %p\n"),
-                        ACE_TEXT ("DIOP_Transport::process_message, process_reply_message ()")));
-
-          this->messaging_object_->reset ();
-          this->tms_->connection_closed ();
-          return -1;
-        }
-
-
-      result =
-        this->tms_->dispatch_reply (params);
-
-      // @@ Somehow it seems dangerous to reset the state *after*
-      //    dispatching the request, what if another threads receives
-      //    another reply in the same connection?
-      //    My guess is that it works as follows:
-      //    - For the exclusive case there can be no such thread.
-      //    - The the muxed case each thread has its own message_state.
-      //    I'm pretty sure this comment is right.  Could somebody else
-      //    please look at it and confirm my guess?
-
-      // @@ The above comment was found in the older versions of the
-      //    code. The code was also written in such a way that, when
-      //    the client thread on a call from handle_input () from the
-      //    reactor a call would be made on the handle_client_input
-      //    (). The implementation of handle_client_input () looked so
-      //    flaky. It used to create a message state upon entry in to
-      //    the function using the TMS and destroy that on exit. All
-      //    this was fine _theoretically_ for multiple threads. But
-      //    the flakiness was originating in the implementation of
-      //    get_message_state () where we were creating message state
-      //    only once and dishing it out for every thread till one of
-      //    them destroy's it. So, it looked broken. That has been
-      //    changed. Why?. To my knowledge, the reactor does not call
-      //    handle_input () on two threads at the same time. So, IMHO
-      //    that defeats the purpose of creating a message state for
-      //    every thread. This is just my guess. If we run in to
-      //    problems this place needs to be revisited. If someone else
-      //    is going to take a look please contact bala@cs.wustl.edu
-      //    for details on this-- Bala
-
-
-
-      if (result == -1)
-        {
-          // Something really critical happened, we will forget about
-          // every reply on this connection.
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("TAO (%P|%t) : DIOP_Client_Transport::")
-                        ACE_TEXT ("handle_client_input - ")
-                        ACE_TEXT ("dispatch reply failed\n")));
-
-          this->messaging_object_->reset ();
-          this->tms_->connection_closed ();
-          return -1;
-        }
-
-      if (result == 0)
-        {
-          this->messaging_object_->reset ();
-
-          // The reply dispatcher was no longer registered.
-          // This can happened when the request/reply
-          // times out.
-          // To throw away all registered reply handlers is
-          // not the right thing, as there might be just one
-          // old reply coming in and several valid new ones
-          // pending. If we would invoke <connection_closed>
-          // we would throw away also the valid ones.
-          //return 0;
-        }
-
-
-      // This is a NOOP for the Exclusive request case, but it actually
-      // destroys the stream in the muxed case.
-      //this->tms_->destroy_message_state (message_state);
-    }
-  else if (t == TAO_PLUGGABLE_MESSAGE_MESSAGERROR)
-    {
-      return -1;
-    }
-
-  return this->messaging_object_->more_messages ();
-}
-
-// @@ Frank: Hopefully DIOP doesn't need this
-/*
-void
-TAO_DIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
-{
-
-  // Get a handle on to the acceptor registry
-  TAO_Acceptor_Registry * ar =
-    this->orb_core ()->acceptor_registry ();
-
-
-  // Get the first acceptor in the registry
-  TAO_AcceptorSetIterator acceptor = ar->begin ();
-
-  DIOP::ListenPointList listen_point_list;
-
-  for (;
-       acceptor != ar->end ();
-       acceptor++)
-    {
-      // Check whether it is a DIOP acceptor
-      if ((*acceptor)->tag () == TAO_TAG_UDP_PROFILE)
-        {
-          this->get_listen_point (listen_point_list,
-                                  *acceptor);
-        }
-    }
-
-  // We have the ListenPointList at this point. Create a output CDR
-  // stream at this point
-  TAO_OutputCDR cdr;
-
-  // Marshall the information into the stream
-  if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)== 0)
-      || (cdr << listen_point_list) == 0)
-    return;
-
-  // Add this info in to the svc_list
-  opdetails.service_context ().set_context (IOP::BI_DIR_DIOP,
-                                            cdr);
-
-  return;
-}
-
-
-int
-TAO_DIOP_Transport::get_listen_point (
-    DIOP::ListenPointList &listen_point_list,
-    TAO_Acceptor *acceptor)
-{
-  TAO_DIOP_Acceptor *iiop_acceptor =
-    ACE_dynamic_cast (TAO_DIOP_Acceptor *,
-                      acceptor );
-
-  // Get the array of endpoints serviced by <iiop_acceptor>
-  const ACE_INET_Addr *endpoint_addr =
-    iiop_acceptor->endpoints ();
-
-  // Get the count
-  size_t count =
-    iiop_acceptor->endpoint_count ();
-
-  // Get the local address of the connection
-  ACE_INET_Addr local_addr;
-
-  if (this->connection_handler_->peer ().get_local_addr (local_addr)
-      == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) Could not resolve local host")
-                         ACE_TEXT (" address in set_bidir_context_info () \n")),
-                        -1);
-    }
-
-
-  // Note: Looks like there is no point in sending the list of
-  // endpoints on interfaces on which this connection has not
-  // been established. If this is wrong, please correct me.
-  char *local_interface = 0;
-
-  // Get the hostname for the local address
-  if (iiop_acceptor->hostname (this->orb_core_,
-                               local_addr,
-                               local_interface) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("(%P|%t) Could not resolve local host")
-                         ACE_TEXT (" name \n")),
-                        -1);
-    }
-
-  ACE_INET_Addr *tmp_addr = ACE_const_cast (ACE_INET_Addr *,
-                                            endpoint_addr);
-
-  for (size_t index = 0;
-       index <= count;
-       index++)
-    {
-      // Get the listen point on that acceptor if it has the same
-      // interface on which this connection is established
-      char *acceptor_interface = 0;
-
-      if (iiop_acceptor->hostname (this->orb_core_,
-                                   tmp_addr[index],
-                                   acceptor_interface) == -1)
-          continue;
-
-      // @@ This is very bad for performance, but it is a one time
-      // affair
-      if (ACE_OS::strcmp (local_interface,
-                          acceptor_interface) == 0)
-        {
-          // We have the connection and the acceptor endpoint on the
-          // same interface
-          DIOP::ListenPoint point;
-          point.host = CORBA::string_dup (local_interface);
-          point.port = endpoint_addr[index].get_port_number ();
-
-          // Get the count of the number of elements
-          CORBA::ULong len = listen_point_list.length ();
-
-          // Increase the length by 1
-          listen_point_list.length (len + 1);
-
-          // Add the new length to the list
-          listen_point_list[len] = point;
-        }
-
-      // @@ This is bad....
-      CORBA::string_free (acceptor_interface);
-    }
-
-  CORBA::string_free (local_interface);
-  return 1;
-}
-*/
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.h b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.h
deleted file mode 100644
index a13932bf409..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// -*- C++ -*-
-// ===================================================================
-/**
- *  @file   DIOP_Transport.h
- *
- *  $Id$
- *
- *  @author Originally by Fred Kuhns <fredk@cs.wustl.edu>
- *  @author Modified by Balachandran Natarajan <bala@cs.wustl.edu>
- */
-// ===================================================================
-
-#ifndef TAO_DIOP_TRANSPORT_H
-#define TAO_DIOP_TRANSPORT_H
-#include "ace/pre.h"
-
-#include "tao/Transport.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Synch.h"
-#include "ace/Svc_Handler.h"
-#include "diop_export.h"
-
-// Forward decls.
-class TAO_DIOP_Connection_Handler;
-class TAO_ORB_Core;
-class TAO_Operation_Details;
-class TAO_Pluggable_Messaging;
-class TAO_Acceptor;
-
-// Service Handler for this transport
-typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-        TAO_DIOP_SVC_HANDLER;
-
-/**
- * @class TAO_DIOP_Transport
- *
- * @brief Specialization of the base TAO_Transport class to handle the
- *  DIOP protocol.
- *
- *
- *
- */
-
-class TAO_DIOP_Export TAO_DIOP_Transport : public TAO_Transport
-{
-public:
-
-  /// Constructor.
-  TAO_DIOP_Transport (TAO_DIOP_Connection_Handler *handler,
-                      TAO_ORB_Core *orb_core,
-                      CORBA::Boolean flag);
-
-  /// Default destructor.
-  ~TAO_DIOP_Transport (void);
-
-  /// Return the connection service handler
-  TAO_DIOP_SVC_HANDLER *service_handler (void);
-
-  ///  The TAO_Transport methods, please check the documentation in
-  ///  "tao/Pluggable.h" for more details.
-  virtual ACE_HANDLE handle (void);
-
-  virtual ACE_Event_Handler *event_handler (void);
-
-  virtual void close_connection (void);
-
-  virtual int idle (void);
-
-  /// Write the complete Message_Block chain to the connection.
-  virtual ssize_t send (const ACE_Message_Block *mblk,
-                        const ACE_Time_Value *s = 0,
-                        size_t *bytes_transferred = 0);
-
-
-  /// Read len bytes from into buf.
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        const ACE_Time_Value *s = 0);
-
-  /// Read and process the message from the connection. The processing
-  /// of the message is done by delegating the work to the underlying
-  /// messaging object
-  virtual int read_process_message (ACE_Time_Value *max_time_value = 0,
-                                    int block =0);
-
-  virtual int register_handler (void);
-
-  /// @@TODO: These methods IMHO should have more meaningful
-  /// names. The names seem to indicate nothing.
-  virtual int send_request (TAO_Stub *stub,
-                            TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
-                            int twoway,
-                            ACE_Time_Value *max_wait_time);
-
-  virtual int send_message (TAO_OutputCDR &stream,
-                            TAO_Stub *stub = 0,
-                            int twoway = 1,
-                            ACE_Time_Value *max_time_wait = 0);
-
-  virtual void start_request (TAO_ORB_Core *orb_core,
-                              TAO_Target_Specification &spec,
-                              TAO_OutputCDR &output,
-                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void start_locate (TAO_ORB_Core *orb_core,
-                             TAO_Target_Specification &spec,
-                             TAO_Operation_Details &opdetails,
-                             TAO_OutputCDR &output,
-                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-  virtual CORBA::Boolean
-  send_request_header (TAO_Operation_Details &opdetails,
-                       TAO_Target_Specification &spec,
-                       TAO_OutputCDR &msg);
-
-  /// Initialising the messaging object
-  virtual int messaging_init (CORBA::Octet major,
-                              CORBA::Octet minor);
-
-  // @@ Frank : Not needed
-  /*
-  /// Open the service context list and process it.
-  virtual int tear_listen_point_list (TAO_InputCDR &cdr);
-  */
-private:
-
-  /// Process the message that we have read
-  int process_message (void);
-
-  // @@ Frank : Not needed
-  /*
-  /// Set the Bidirectional context info in the service context list
-  void set_bidir_context_info (TAO_Operation_Details &opdetails);
-
-  /// Add the listen points in <acceptor> to the <listen_point_list>
-  /// if this connection is in the same interface as that of the
-  /// endpoints in the <acceptor>
-  int get_listen_point (DIOP::ListenPointList &listen_point_list,
-                        TAO_Acceptor *acceptor);
-  */
-private:
-
-  /// The connection service handler used for accessing lower layer
-  /// communication protocols.
-  TAO_DIOP_Connection_Handler *connection_handler_;
-
-  /// Our messaging object.
-  TAO_Pluggable_Messaging *messaging_object_;
-
-  ACE_Message_Block local_buffer_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "DIOP_Transport.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/post.h"
-#endif  /* TAO_DIOP_TRANSPORT_H */
diff --git a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.i b/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.i
deleted file mode 100644
index 81bf354f364..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/DIOP_Transport.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// -*- C++ -*-
-//$Id$
diff --git a/TAO/examples/PluggableUDP/DIOP/Makefile b/TAO/examples/PluggableUDP/DIOP/Makefile
deleted file mode 100644
index 2a4006225e0..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/Makefile
+++ /dev/null
@@ -1,2296 +0,0 @@
-#----------------------------------------------------------------------------
-#      $Id$
-#
-#       Makefile for TAO_Strategies
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-MAKEFILE = Makefile
-LIBNAME  = libTAO_DIOP
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-ACE_SHLIBS = -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-CPP_SRCS += \
-  DIOP_Factory \
-  DIOP_Profile \
-  DIOP_Transport \
-  DIOP_Connector \
-  DIOP_Acceptor \
-  DIOP_Connection_Handler \
-  DIOP_Endpoint \
-
-IDL_SRC = \
-        $(addsuffix S.cpp, $(IDL_FILES)) \
-        $(addsuffix C.cpp, $(IDL_FILES))
-FILES = $(CPP_SRCS)
-DEFS  = $(addsuffix .h,$(FILES))
-LSRC  = $(addsuffix .cpp,$(FILES))
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nested.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/DIOP_Factory.o .obj/DIOP_Factory.so .shobj/DIOP_Factory.o .shobj/DIOP_Factory.so: DIOP_Factory.cpp DIOP_Factory.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.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/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- diop_export.h DIOP_Acceptor.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Connection_Handler.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/Transport.inl \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/ORB_Table.h \
- $(TAO_ROOT)/tao/ORB_Table.inl \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(TAO_ROOT)/tao/Connector_Registry.i \
- $(TAO_ROOT)/tao/debug.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- DIOP_Acceptor.i DIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Connector_Impl.h \
- $(TAO_ROOT)/tao/Connector_Impl.inl \
- $(TAO_ROOT)/tao/Connector_Impl.cpp
-
-.obj/DIOP_Profile.o .obj/DIOP_Profile.so .shobj/DIOP_Profile.o .shobj/DIOP_Profile.so: DIOP_Profile.cpp DIOP_Profile.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- DIOP_Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- diop_export.h DIOP_Endpoint.i DIOP_Profile.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/iiop_endpoints.h \
- $(TAO_ROOT)/tao/iiop_endpoints.i
-
-.obj/DIOP_Transport.o .obj/DIOP_Transport.so .shobj/DIOP_Transport.o .shobj/DIOP_Transport.so: DIOP_Transport.cpp DIOP_Transport.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(TAO_ROOT)/tao/Transport.inl \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- diop_export.h DIOP_Transport.i DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Connection_Handler.h \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i DIOP_Acceptor.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/ORB_Table.h \
- $(TAO_ROOT)/tao/ORB_Table.inl \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(TAO_ROOT)/tao/Connector_Registry.i \
- $(TAO_ROOT)/tao/debug.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- DIOP_Acceptor.i DIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- DIOP_Endpoint.h DIOP_Endpoint.i DIOP_Profile.i \
- $(TAO_ROOT)/tao/Acceptor_Registry.h \
- $(TAO_ROOT)/tao/Acceptor_Registry.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
- $(TAO_ROOT)/tao/Sync_Strategies.h \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/Sync_Strategies.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/GIOP_Message_Base.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
- $(TAO_ROOT)/tao/Pluggable_Messaging.i \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.h \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.h \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.h \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.h \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser.inl \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_10.inl \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_11.inl \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.h \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_12.inl \
- $(TAO_ROOT)/tao/GIOP_Message_Generator_Parser_Impl.inl \
- $(TAO_ROOT)/tao/GIOP_Message_Handler.h \
- $(TAO_ROOT)/tao/GIOP_Message_Handler.inl \
- $(TAO_ROOT)/tao/GIOP_Utils.h \
- $(TAO_ROOT)/tao/GIOP_Utils.i \
- $(TAO_ROOT)/tao/GIOP_Message_Base.i \
- $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
- $(TAO_ROOT)/tao/GIOP_Message_Lite.i
-
-.obj/DIOP_Connector.o .obj/DIOP_Connector.so .shobj/DIOP_Connector.o .shobj/DIOP_Connector.so: DIOP_Connector.cpp DIOP_Connector.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/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_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.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/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Connector_Impl.h \
- $(TAO_ROOT)/tao/Connector_Impl.inl \
- $(TAO_ROOT)/tao/Connector_Impl.cpp \
- DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Connection_Handler.h \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/Transport.inl \
- diop_export.h DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i DIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- DIOP_Endpoint.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- DIOP_Endpoint.i DIOP_Profile.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/tao/Base_Connection_Property.h \
- $(TAO_ROOT)/tao/Base_Connection_Property.inl
-
-.obj/DIOP_Acceptor.o .obj/DIOP_Acceptor.so .shobj/DIOP_Acceptor.o .shobj/DIOP_Acceptor.so: DIOP_Acceptor.cpp DIOP_Acceptor.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- DIOP_Connection_Handler.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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Connection_Handler.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/Transport.inl \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- diop_export.h DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/ORB_Table.h \
- $(TAO_ROOT)/tao/ORB_Table.inl \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Connector_Registry.h \
- $(TAO_ROOT)/tao/Connector_Registry.i \
- $(TAO_ROOT)/tao/debug.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- DIOP_Acceptor.i DIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- DIOP_Endpoint.h DIOP_Endpoint.i DIOP_Profile.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-
-.obj/DIOP_Connection_Handler.o .obj/DIOP_Connection_Handler.so .shobj/DIOP_Connection_Handler.o .shobj/DIOP_Connection_Handler.so: DIOP_Connection_Handler.cpp \
- DIOP_Connection_Handler.h \
- $(ACE_ROOT)/ace/pre.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/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.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_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.i \
- $(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/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Connection_Handler.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Transport.inl \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- diop_export.h DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Messaging_Policy_i.h \
- $(TAO_ROOT)/tao/Messaging_Policy_i.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- DIOP_Endpoint.h DIOP_Endpoint.i \
- $(TAO_ROOT)/tao/Base_Connection_Property.h \
- $(TAO_ROOT)/tao/Base_Connection_Property.inl
-
-.obj/DIOP_Endpoint.o .obj/DIOP_Endpoint.so .shobj/DIOP_Endpoint.o .shobj/DIOP_Endpoint.so: DIOP_Endpoint.cpp DIOP_Endpoint.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- diop_export.h DIOP_Endpoint.i DIOP_Connection_Handler.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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/Connection_Handler.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/SOCK.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Connection_Handler.inl \
- DIOP_Transport.h \
- $(TAO_ROOT)/tao/Transport.h \
- $(TAO_ROOT)/tao/Transport.inl \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- DIOP_Transport.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- DIOP_Connection_Handler.i \
- $(TAO_ROOT)/tao/debug.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/PluggableUDP/DIOP/Makefile.bor b/TAO/examples/PluggableUDP/DIOP/Makefile.bor
deleted file mode 100644
index 53752360e38..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/Makefile.bor
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Makefile for building the TAO PluggableUDP library
-#
-
-NAME = TAO_DIOP
-
-OBJFILES = \
-        $(OBJDIR)\DIOP_Factory.obj \
-        $(OBJDIR)\DIOP_Profile.obj \
-        $(OBJDIR)\DIOP_Transport.obj \
-        $(OBJDIR)\DIOP_Connector.obj \
-        $(OBJDIR)\DIOP_Acceptor.obj \
-        $(OBJDIR)\DIOP_Connection_Handler.obj \
-        $(OBJDIR)\DIOP_Endpoint.obj \
-
-!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DIOP_CFLAGS)
-!else
-
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DIOP_CFLAGS) \
-        -DTAO_DIOP_BUILD_DLL
-!endif
-
-CPPDIR = .
-
-INCLUDES = *.h
-
-LIBFILES = $(ACE_LIB) $(TAO_LIB)
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
diff --git a/TAO/examples/PluggableUDP/DIOP/README b/TAO/examples/PluggableUDP/DIOP/README
deleted file mode 100644
index 3f00555185c..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/README
+++ /dev/null
@@ -1,110 +0,0 @@
-DIOP - UDP Based Pluggable Protocol
-===================================
-
-This directory contains all of the code needed to use the UDP
-Pluggable Protocol (DIOP).  It should be considered a work in progress
-and will eventually be integrated in with the other standard pluggable
-protocols in tao/Strategies.
-
-Notes on the DIOP implementation:
-
-- The DIOP implemenation uses unconnected UDP sockets.
-
-- The server side implementation bypasses the actual TAO acceptor
-  and opens always a UDP socket on start-up.
-
-- The address of that UDP socket can be configured via
-  e.g. -ORBEndpoint diop://:1303
-
-  If nothing is specified, the implementation will select a port
-  and open a socket on all network interfaces.
-  (This is the default ORB behavior and can be overwritten using
-   the -ORBEndpoint switch)
-
-- Because no connections - no state - exist, all client requests
-  from different clients arrive at the same socket!
-
-- The client side DIOP implementation bypasses the actual
-  TAO connector. It installs a connection handler on the first
-  invocation on a remote CORBA object.
-
-
-DIOP Installation:
-
-- Compile TAO/examples/PluggableUDP/DIOP to create the DIOP library.
-
-- Uncomment the following line in TAO/tao/corbafwd.h:
-
-  #define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
-
-- The application using DIOP should have a svc.conf file with the
-  following entry:
-
-  dynamic DIOP_Factory Service_Object * TAO_DIOP:_make_TAO_DIOP_Protocol_Factory() ""
-  static Resource_Factory "-ORBProtocolFactory DIOP_Factory"
-
-
-Issues:
-
-- Optimization of DIOP_Transport::{send,recv}
-
-- Default port is the same on client and server, therefore
-  the client ports need to be explicitly set by -ORBEndpoint option.
-  Maybe there is a way to find free ports?
-
-- Remove commented out code from DIOP_* files.
-
-Limitations:
-
-- No preconnections are supported.
-
-- Only single threaded servers are supported as we cache parts of a UDP
-  packet. If we would allow multiple threads this buffer could be corrupted.
-
-- No thread-per connection is supported.
-
-- Requests from multiple clients are received on the same socket.
-
-
-Disclaimer:
-
-  This UDP Pluggable Protocol has been developed for Siemens base station
-  software. We assumed certain requriements, which do not fit everybody, so
-  be careful applying this pluggable protocol to your application. 
-
-  The assumptions we had:
-
-  - Almost 100% reliable UDP communication as we use IP over ATM
-
-       (Even if it would be less reliable you can manage it by using one-way
-	   request operations and one-way response operations in combination with
-	   application level timeouts.)
-  
-  - TCP got ruled out as it behaves to sluggish on sudden disconnections, we
-    needed to be able to plug & play CPU cards without impacting any ORB
-	communicating to that CPU.
-
-	   (This is the main reason why we do not keep any state in the client side
-	    of the Pluggable Protocol)
-
-  - As we use a special hardware configuration we defined that every GIOP message
-    (and therefore every IDL signature) message is shorter than 4kB, which is the
-	maximum length of a UDP packet anyway.
-	  
-	   (Support for fragmentation, as GIOP 1.2 supports it might help, this is
-	    a future option)
-
-
-Appendix:
-
- The client understands the following options:
-                           -d
-                           -k <ior>
-                           -t <timeout in ms>
-                           -i <iterations>
-
-Comments, Suggestions, or Feedback:
-
-  mailto:Michael.Kircher@mchp.siemens.de or,
-  mailto:John.Mackenzie.extern@icn.siemens.de or,
-  mailto:fhunleth@cs.wustl.edu
diff --git a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsp b/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsp
deleted file mode 100644
index d141c19ff21..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsp
+++ /dev/null
@@ -1,189 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TAO_DIOP" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=TAO_DIOP - 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 "TAO_DIOP.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 "TAO_DIOP.mak" CFG="TAO_DIOP - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO_DIOP - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO_DIOP - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "TAO_DIOP - 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 "DLL\Release\DIOP"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_DIOP_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../tao/" /I "../../../" /I "../../../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_DIOP_BUILD_DLL" /FD /c

-# SUBTRACT CPP /YX

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

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /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 /dll /machine:I386

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

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\Debug\DIOP"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_DIOP_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../tao/" /I "../../../" /I "../../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_DIOP_BUILD_DLL" /FD /c

-# SUBTRACT CPP /YX

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

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /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 /dll /debug /machine:I386 /pdbtype:sept

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

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TAO_DIOP - Win32 Release"

-# Name "TAO_DIOP - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\DIOP_Acceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connection_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Endpoint.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Profile.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Transport.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\DIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connection_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Endpoint.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\diop_export.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Transport.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ".i"

-# Begin Source File

-

-SOURCE=.\DIOP_Acceptor.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connection_Handler.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Endpoint.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Profile.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Transport.i

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsw b/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsw
deleted file mode 100644
index 4aaee2e0f9b..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP.dsw
+++ /dev/null
@@ -1,53 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "TAO_DIOP"=.\TAO_DIOP.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "UDP Client"=..\tests\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "UDP Server"=..\tests\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp b/TAO/examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp
deleted file mode 100644
index 1c04061945d..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/TAO_DIOP_Static.dsp
+++ /dev/null
@@ -1,182 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TAO_DIOP_Static" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=TAO_DIOP_Static - 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 NMAKE /f "TAO_DIOP_Static.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 "TAO_DIOP_Static.mak" CFG="TAO_DIOP_Static - Win32 Static Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO_DIOP_Static - Win32 Static Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "TAO_DIOP_Static - Win32 Static Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "TAO_DIOP_Static - Win32 Static 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 "LIB\Release\DIOP"

-# PROP Target_Dir ""

-LINK32=link.exe -lib

-MTL=midl.exe

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../tao/" /I "../../../" /I "../../../../" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "TAO_AS_STATIC_LIBS" /D "ACE_AS_STATIC_LIBS" /D "TAO_STRATEGIES_BUILD_DLL" /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

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"TAO_DIOPs.lib"

-

-!ELSEIF  "$(CFG)" == "TAO_DIOP_Static - Win32 Static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "TAO_DIOP_Static___Win32_Debug"

-# PROP BASE Intermediate_Dir "TAO_DIOP_Static___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "LIB\Debug\DIOP"

-# PROP Target_Dir ""

-LINK32=link.exe -lib

-MTL=midl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../../tao/" /I "../../../" /I "../../../../" /D "_WINDOWS" /D "_CONSOLE" /D "_DEBUG" /D "WIN32" /D "ACE_AS_STATIC_LIBS" /D "TAO_AS_STATIC_LIBS" /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

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"TAO_DIOPsd.lib"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TAO_DIOP_Static - Win32 Static Release"

-# Name "TAO_DIOP_Static - Win32 Static Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\DIOP_Acceptor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connection_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connector.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Endpoint.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Profile.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Transport.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\DIOP_Acceptor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connection_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connector.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Endpoint.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Transport.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ".i"

-# Begin Source File

-

-SOURCE=.\DIOP_Acceptor.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Connection_Handler.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Endpoint.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Profile.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DIOP_Transport.i

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/examples/PluggableUDP/DIOP/diop_export.h b/TAO/examples/PluggableUDP/DIOP/diop_export.h
deleted file mode 100644
index b3d07645edf..00000000000
--- a/TAO/examples/PluggableUDP/DIOP/diop_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_DIOP_EXPORT_H
-#define TAO_DIOP_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_DIOP_HAS_DLL)
-#    define TAO_DIOP_HAS_DLL 0
-#  endif /* ! TAO_DIOP_HAS_DLL */
-#else
-#  if !defined (TAO_DIOP_HAS_DLL)
-#    define TAO_DIOP_HAS_DLL 1
-#  endif /* ! TAO_DIOP_HAS_DLL */
-#endif
-
-#if defined (TAO_DIOP_HAS_DLL) && (TAO_DIOP_HAS_DLL == 1)
-#  if defined (TAO_DIOP_BUILD_DLL)
-#    define TAO_DIOP_Export ACE_Proper_Export_Flag
-#    define TAO_DIOP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_DIOP_BUILD_DLL */
-#    define TAO_DIOP_Export ACE_Proper_Import_Flag
-#    define TAO_DIOP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_DIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_DIOP_BUILD_DLL */
-#else /* TAO_DIOP_HAS_DLL == 1 */
-#  define TAO_DIOP_Export
-#  define TAO_DIOP_SINGLETON_DECLARATION(T)
-#  define TAO_DIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_DIOP_HAS_DLL == 1 */
-
-#endif /* TAO_DIOP_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/examples/PluggableUDP/Makefile.bor b/TAO/examples/PluggableUDP/Makefile.bor
deleted file mode 100644
index febb3337705..00000000000
--- a/TAO/examples/PluggableUDP/Makefile.bor
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#
-# Makefile for building the Pluggable UDP examples
-#
-
-DIRS = Diop \
-       tests
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/examples/PluggableUDP/README b/TAO/examples/PluggableUDP/README
deleted file mode 100644
index 67801d874a6..00000000000
--- a/TAO/examples/PluggableUDP/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory contains code for a pluggable UDP protocol for TAO.
-The individual directories contain READMEs on how to run the following
-examples:
-
-        . DIOP
-
-          Contains the implementation of the UDP pluggable protocol.
-          Code in this directory should be considered a work in
-          progress and will be added to tao/Strategies in the future.
-
-        . tests
-
-          This directory contains unit tests to exercise the DIOP
-          code.
diff --git a/TAO/examples/PluggableUDP/tests/Makefile b/TAO/examples/PluggableUDP/tests/Makefile
deleted file mode 100644
index d712bae97ce..00000000000
--- a/TAO/examples/PluggableUDP/tests/Makefile
+++ /dev/null
@@ -1,2114 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#       $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-IDL_FILES = UDP
-IDL_SRC = UDPC.cpp UDPS.cpp
-BIN = client server
-
-SRC = $(addsuffix .cpp, $(BIN) UDP_Client_i UDP_i ) $(IDL_SRC)
-
-CLIENT_OBJS = client.o UDP_Client_i.o UDP_i.o $(IDL_SRC:.cpp=.o)
-SERVER_OBJS = UDP_Client_i.o server.o UDP_i.o $(IDL_SRC:.cpp=.o)
-
-BUILD = $(BIN)
-VBIN = $(BIN:%=%$(VAR))
-TAO_IDLFLAGS += -Ge 1
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-TAO_SRVR_LIBS := -lTAO_PortableServer $(TAO_SRVR_LIBS)
-TAO_CLNT_LIBS := -lTAO_PortableServer $(TAO_CLNT_LIBS)
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: $(foreach ext, $(IDL_EXT), UDP$(ext))
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), UDP$(ext))
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- UDPC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- UDPC.i UDP_i.h UDPS.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i UDP_Client_i.h
-
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- UDP_i.h UDPS.h UDPC.h UDPC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i
-
-.obj/UDP_Client_i.o .obj/UDP_Client_i.so .shobj/UDP_Client_i.o .shobj/UDP_Client_i.so: UDP_Client_i.cpp UDP_Client_i.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/pre.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/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- UDPC.h UDPC.i
-
-.obj/UDP_i.o .obj/UDP_i.so .shobj/UDP_i.o .shobj/UDP_i.so: UDP_i.cpp UDP_i.h UDPS.h UDPC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- UDPC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i
-
-.obj/UDPC.o .obj/UDPC.so .shobj/UDPC.o .shobj/UDPC.so: UDPC.cpp UDPC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- UDPC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
-
-.obj/UDPS.o .obj/UDPS.so .shobj/UDPS.o .shobj/UDPS.so: UDPS.cpp UDPS.h UDPC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- UDPC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- UDPS_T.h UDPS_T.i UDPS_T.cpp UDPS.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(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/PortableServer/Key_Adapters.i \
- $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/PluggableUDP/tests/Makefile.bor b/TAO/examples/PluggableUDP/tests/Makefile.bor
deleted file mode 100644
index 6fe0da6b159..00000000000
--- a/TAO/examples/PluggableUDP/tests/Makefile.bor
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for building the PluggableUDP tests example
-#
-
-#MAKEFILES = Time_Client.bor Time_Server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/examples/PluggableUDP/tests/README b/TAO/examples/PluggableUDP/tests/README
deleted file mode 100644
index ec008493401..00000000000
--- a/TAO/examples/PluggableUDP/tests/README
+++ /dev/null
@@ -1,54 +0,0 @@
-DIOP - UDP Based Pluggable Protocol - Example
-=============================================
-
-This example tests the UDP Pluggable Protocol (DIOP) implementation by
-sending oneway requests to a server.  The server in turn replies to
-the client with the request ID, he got on the invocation. The client
-therefore implements the same object to handle replies.
-
-To start the test do the following:
-
-  server -o ior_file -ORBEndpoint diop://:1306
-
-  client -k file://ior_file -ORBEndpoint diop://:1305
-
- or just run the Perl Script
-
-  run_test.pl
-
-To test proper dispatching functionality of requests from several
-clients just start several clients in the same way, but with different
-ports
-
-The CORBA object implemenation checks the request ID for sequential
-ordering. If a request arrives out of order, it will note it - on
-client as well as on server side.
-
-Persistent IOR test:
-
-  - In order to be able to restart the server transparently to the
-    client, the server needs to use persistent IORs.
-
-    The port on which the server is listening should stay the same,
-    this can be achieved by e.g. "-ORBEndpoint diop://:1233"
-
-
-DIOP Installation and Implemenation:
-
-  Please see the $TAO_ROOT/examples/PluggableUDP/DIOP/README file for
-  more information.
-
-
-Appendix:
-
- The client understands the following options:
-                           -d
-                           -k <ior>
-                           -t <timeout in ms>
-                           -i <iterations>
-
-Comments, Suggestions, or Feedback:
-
-  mailto:Michael.Kircher@mchp.siemens.de or,
-  mailto:John.Mackenzie.extern@icn.siemens.de or,
-  mailto:fhunleth@cs.wustl.edu
diff --git a/TAO/examples/PluggableUDP/tests/UDP.dsw b/TAO/examples/PluggableUDP/tests/UDP.dsw
deleted file mode 100644
index 21b5d9e8bd7..00000000000
--- a/TAO/examples/PluggableUDP/tests/UDP.dsw
+++ /dev/null
@@ -1,63 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-

-###############################################################################

-

-Project: "TAO DLL"=..\..\..\tao\TAO.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "UDP Client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name UDP Server

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "UDP Server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/examples/PluggableUDP/tests/UDP.idl b/TAO/examples/PluggableUDP/tests/UDP.idl
deleted file mode 100644
index 27d0cf09963..00000000000
--- a/TAO/examples/PluggableUDP/tests/UDP.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- C++ -*- */
-// UDP.idl
-// $Id$
-
-interface UDP
-{
-  // = TITLE
-  //    Defines an interface that encapsulates operations that
-  //    return the current time of day and shuts down the server.
-
-  oneway void invoke (in string client_name,
-                      in UDP udpHandler,
-                      in long request_id);
-  // Returns the current time of day on another machine.
-
-  oneway void shutdown ();
-  // Shutdown the application.
-};
-
-
diff --git a/TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp
deleted file mode 100644
index faabc2cf14e..00000000000
--- a/TAO/examples/PluggableUDP/tests/UDP_Client_i.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id$
-
-#include "UDP_Client_i.h"
-
-// This is the interface program that accesses the remote object
-
-// Constructor.
-UDP_Client_i::UDP_Client_i (CORBA::ORB_ptr orb,
-                            UDP_ptr udp,
-                            UDP_ptr udpHandler,
-                            ACE_UINT32 msec,
-                            ACE_UINT32 iterations)
-: orb_ (CORBA::ORB::_duplicate (orb))
-, udp_ (UDP::_duplicate (udp))
-, udpHandler_ (UDP::_duplicate (udpHandler))
-, delay_ (msec)
-, iterations_ (iterations)
-{
-
-}
-
-//Destructor.
-UDP_Client_i::~UDP_Client_i (void)
-{
-  //no-op
-}
-
-int
-UDP_Client_i::svc ()
-{
-  ACE_CString client_name ("UDP");
-
-  ACE_TCHAR pid[256];
-  ACE_OS::sprintf (pid,
-                   "%u",
-                   ACE_static_cast (u_int, ACE_OS::getpid ()));
-  client_name += "_";
-  client_name += pid;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::String_var corba_client_name =
-        CORBA::string_dup (client_name.c_str ());
-
-      for (ACE_UINT32 i = 0;
-           i < iterations_;
-           i++)
-        {
-          udp_->invoke (corba_client_name.in (),
-                        udpHandler_.inout (),
-                        i,
-                        ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "invoked %s %d, going to wait %d ms\n",
-                      corba_client_name.in (),
-                      i,
-					  delay_));
-          ACE_Time_Value tv (0, delay_ * 1000);
-          ACE_OS::sleep (tv);  // wait to not flood the server
-        }
-
-      // shut down remote ORB
-      udp_->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_Time_Value tv (0, 50); // 50ms
-      ACE_OS::sleep (tv);  // let the previous request go through
-
-      // Shut down local ORB, trigger the end of the ORB event loop
-	  // in the main thread.
-      orb_->shutdown ();
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "\tException");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-
-  return 0;
-}
-
diff --git a/TAO/examples/PluggableUDP/tests/UDP_Client_i.h b/TAO/examples/PluggableUDP/tests/UDP_Client_i.h
deleted file mode 100644
index fe66b78e496..00000000000
--- a/TAO/examples/PluggableUDP/tests/UDP_Client_i.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/UDP
-//
-// = FILENAME
-//    UDP_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the client functionality of the UDP test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
-
-#ifndef UDP_CLIENT_I_H
-#define UDP_CLIENT_I_H
-
-#include "ace/Task.h"
-#include "tao/corba.h"
-
-#include "UDPC.h"
-
-class UDP_Client_i
-: public ACE_Task_Base
-{
-  // = TITLE
-  //    UDP Client interface subclass.
-  //
-  // = DESCRIPTION
-  //    This class wrapps the client functionality into one class
-  //
-public:
-  // = Initialization and termination methods.
-  UDP_Client_i (CORBA::ORB_ptr orb,
-                UDP_ptr udp,
-                UDP_ptr udpHandler,
-                ACE_UINT32 msec,
-                ACE_UINT32 iterations);
-  // Constructor
-
-  virtual ~UDP_Client_i (void);
-  // Destructor
-
-private:
-  // Runs in a separate thread.
-  virtual int svc (void );
-
-private:
-  CORBA::ORB_var orb_;
-
-  UDP_var udp_;
-
-  UDP_var udpHandler_;
-
-  ACE_UINT32 delay_;
-
-  ACE_UINT32 iterations_;
-};
-
-
-#endif /* UDP_CLIENT_I_H */
diff --git a/TAO/examples/PluggableUDP/tests/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/UDP_i.cpp
deleted file mode 100644
index e7c3349e79c..00000000000
--- a/TAO/examples/PluggableUDP/tests/UDP_i.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// $Id$
-
-#include "UDP_i.h"
-
-ACE_RCSID(UDP, UDP_i, "")
-
-// Constructor
-UDP_i::UDP_i (void)
-{
-  // no-op
-}
-
-// Destructor
-
-UDP_i::~UDP_i (void)
-{
-  // no-op
-}
-
-// Set the ORB pointer.
-
-void
-UDP_i::orb (CORBA::ORB_ptr o)
-{
-  this->orb_ = CORBA::ORB::_duplicate (o);
-}
-
-
-void
-UDP_i::invoke (const char * client_name,
-               UDP_ptr udpHandler,
-               CORBA::Long request_id,
-               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "UDP_i::invoke: name = %s request id = %d\n",
-                  client_name,
-                  request_id));
-      ACE_DEBUG ((LM_DEBUG,
-                  "."));
-
-      CORBA::Long last_request_id = 0;
-      if (request_id_table_.find (client_name,
-                                  last_request_id) != -1)
-        {
-          if (last_request_id + 1 != request_id)
-            ACE_DEBUG ((LM_DEBUG,
-                        "UDP_i::invoke: failure on %s expected id = %d, got %d\n",
-                        client_name,
-                        last_request_id+1,
-                        request_id));
-        }
-
-      request_id_table_.rebind (client_name,
-                                request_id);
-
-      if (!CORBA::is_nil (udpHandler))
-        {
-          udpHandler->invoke (client_name,
-                              UDP::_nil (),
-                              request_id,
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-    }
-  ACE_CATCHANY
-    {
-       ACE_DEBUG ((LM_DEBUG,
-                   "UDP_i::svc: Received exception\n"));
-    }
-  ACE_ENDTRY;
-}
-
-// Shutdown.
-
-void
-UDP_i::shutdown (CORBA::Environment & )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "%s\n",
-              "UDP_i is shutting down"));
-
-  // Instruct the ORB to shutdown.
-  this->orb_->shutdown ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>;
-template class ACE_Hash_Map_Entry<CORBA::String_var, int>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::String_var, int, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Thread_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<CORBA::String_var, int>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/PluggableUDP/tests/UDP_i.h b/TAO/examples/PluggableUDP/tests/UDP_i.h
deleted file mode 100644
index ae76fa81dfc..00000000000
--- a/TAO/examples/PluggableUDP/tests/UDP_i.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/UDP
-//
-// = FILENAME
-//    UDP_i.h
-//
-// = DESCRIPTION
-//    This class implements the server functionality of the UDP test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
-
-#ifndef UDP_I_H
-#define UDP_I_H
-
-#include "UDPS.h"
-
-class UDP_i: public POA_UDP
-{
-  // = TITLE
-  //    UDP Object Implementation
-  //
-  // = DESCRIPTION
-  //    This class implements the UDP object, which accepts two methods.
-  //    The first, <invoke> accepts a string identifying the client
-  //    and a request_id so that the server can verify if the requests
-  //    arrived in order.
-public:
-  // = Initialization and termination methods.
-  UDP_i (void);
-  // Constructor
-
-  ~UDP_i (void);
-  // Destructor
-
-  virtual void invoke (const char *client_name,
-                       UDP_ptr udpHandler,
-                       CORBA::Long request_id,
-                       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (CORBA::Environment &env)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  // Shutdown the server.
-
-  void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
-
-private:
-  CORBA::ORB_var orb_;
-  // ORB pointer.
-
-  ACE_Hash_Map_Manager_Ex < CORBA::String_var,
-                            CORBA::Long,
-                            ACE_Hash < const char * >,
-                            ACE_Equal_To < const char * >,
-                            ACE_Thread_Mutex > request_id_table_;
-};
-
-#endif /* UDP_I_H */
-
-
diff --git a/TAO/examples/PluggableUDP/tests/client.cpp b/TAO/examples/PluggableUDP/tests/client.cpp
deleted file mode 100644
index 0f5353b2c40..00000000000
--- a/TAO/examples/PluggableUDP/tests/client.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/UDP
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    This is the client for the UDP test.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-#include "UDPC.h"
-
-#include "UDP_i.h"
-#include "UDP_Client_i.h"
-
-ACE_RCSID(AMI, client, "$Id$")
-
-const char *ior = "file://test.ior";
-unsigned int msec = 500;
-unsigned int iterations = 500;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "dk:t:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':
-        TAO_debug_level++;
-        break;
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-      case 't':
-        msec = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'i':
-        iterations = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-d "
-                           "-k <ior> "
-                           "-t <timeout in ms> "
-                           "-i <iterations> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      UDP_var udp_var =
-        UDP::_narrow (object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (udp_var.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      // Activate POA to handle the call back.
-
-      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);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Instantiate reply handler
-      UDP_i udp_i;
-
-      // let it remember our ORB
-      udp_i.orb (orb.in ());
-
-      UDP_var udpHandler_var =
-        udp_i._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Instantiate client
-      UDP_Client_i* client = new UDP_Client_i (orb.in (),
-                                               udp_var.in (),
-                                               udpHandler_var.in (),
-											   msec,
-											   iterations);
-
-      // let the client run in a separate thread
-      client->activate ();
-
-      // ORB loop, will be shut down by our client thread
-      orb->run ();  // Fetch responses
-
-      ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
-
-	  root_poa->destroy (true,  // ethernalize objects
- 					     false, // wait for completion
-						 ACE_TRY_ENV);
-	  orb->destroy (ACE_TRY_ENV);
-
-	  // it is save to delete the client, because the client was actually
-	  // the one calling orb->shutdown () triggering the end of the ORB
-	  // event loop.
-	  delete client;
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/PluggableUDP/tests/client.dsp b/TAO/examples/PluggableUDP/tests/client.dsp
deleted file mode 100644
index 6687db10697..00000000000
--- a/TAO/examples/PluggableUDP/tests/client.dsp
+++ /dev/null
@@ -1,417 +0,0 @@
-# Microsoft Developer Studio Project File - Name="UDP Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

-

-CFG=UDP Client - Win32 Alpha Debug

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

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

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

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="UDP Client - Win32 Alpha Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "UDP Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "UDP Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "UDP Client - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "UDP Client - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\client\Release"

-# PROP BASE Intermediate_Dir ".\client\Release"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.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 TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\client\Debug"

-# PROP BASE Intermediate_Dir ".\client\Debug"

-# PROP BASE Target_Dir ".\client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\client"

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\PortableServer"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "client\Alpha Debug"

-# PROP BASE Intermediate_Dir "client\Alpha Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "client"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "client"

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "client\Alpha Release"

-# PROP BASE Intermediate_Dir "client\Alpha Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "client"

-# 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 "client"

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "UDP Client - Win32 Release"

-# Name "UDP Client - Win32 Debug"

-# Name "UDP Client - Win32 Alpha Debug"

-# Name "UDP Client - Win32 Alpha Release"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\client.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDP_Client_i.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDP_i.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDPC.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDPS.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\UDP_Client_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDP_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDPC.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ".idl"

-# Begin Source File

-

-SOURCE=.\UDP.idl

-

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

-

-# PROP Ignore_Default_Tool 1

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

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

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# PROP Ignore_Default_Tool 1

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

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

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-USERDEP__UDP_I="..\..\..\..\tao_idl\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-USERDEP__UDP_I="..\..\..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/examples/PluggableUDP/tests/run_test.pl b/TAO/examples/PluggableUDP/tests/run_test.pl
deleted file mode 100755
index 41ca7f667f9..00000000000
--- a/TAO/examples/PluggableUDP/tests/run_test.pl
+++ /dev/null
@@ -1,40 +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';
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("time.ior");
-
-$SV = new PerlACE::Process ("server", "-o $iorfile -ORBendpoint diop://:12345");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -t 10 -i 1000");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: could not find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/examples/PluggableUDP/tests/server.cpp b/TAO/examples/PluggableUDP/tests/server.cpp
deleted file mode 100644
index 77ff8950d84..00000000000
--- a/TAO/examples/PluggableUDP/tests/server.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/UDP
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    Implementation of the server running the UDP object.
-//
-// = AUTHOR
-//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
-//
-// ============================================================================
-
-#include "ace/Get_Opt.h"
-#include "tao/corba.h"
-#include "UDP_i.h"
-
-ACE_RCSID(AMI, server, "$Id$")
-
-const char *ior_output_file = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.optarg;
-        break;
-      case 'd':
-        TAO_debug_level++;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", 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 =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Install a persistent POA in order to achieve a persistent IOR
-      // for our object.
-      //*
-      CORBA::PolicyList policies;
-      policies.length (2);
-      policies[0] =
-        root_poa->create_lifespan_policy(PortableServer::PERSISTENT,
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      policies[1] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      PortableServer::POA_var persistent_poa =
-        root_poa->create_POA("persistent",
-                             poa_manager.in (),
-                             policies,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      policies[0]->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      policies[1]->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      //*/
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      UDP_i udp_i;
-
-      udp_i.orb (orb.in ());
-
-      //*
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("UDP_Object");
-
-      persistent_poa->activate_object_with_id (id.in (),
-                                               &udp_i,
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        persistent_poa->id_to_reference (id.in (),
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      UDP_var udp_var = UDP::_narrow (obj.in (), ACE_TRY_ENV);
-
-      //*/
-      //UDP_var udp_var = udp_i._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (CORBA::is_nil (udp_var.in ()))
-        ACE_DEBUG ((LM_DEBUG,
-                    "Failed to narrow correct object reference.\n"));
-
-      CORBA::String_var ior =
-        orb->object_to_string (udp_var.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;
-
-
-      /*
-      // Instantiate reply handler
-      UDP_i udpHandler_i;
-
-      udpHandler_i.orb (orb.in ());
-
-      UDP_var udpHandler_var =
-        udpHandler_i._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Instantiate client
-      UDP_Client_i* client = new UDP_Client_i (orb,
-                                               udp_var.in (),
-                                               udpHandler_var.in ());
-
-      client->activate ();
-      */
-
-      orb->run ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      //delete client;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/PluggableUDP/tests/server.dsp b/TAO/examples/PluggableUDP/tests/server.dsp
deleted file mode 100644
index f3820bd25f2..00000000000
--- a/TAO/examples/PluggableUDP/tests/server.dsp
+++ /dev/null
@@ -1,399 +0,0 @@
-# Microsoft Developer Studio Project File - Name="UDP Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

-

-CFG=UDP Server - Win32 Alpha 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="UDP Server - Win32 Alpha Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "UDP Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "UDP Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "UDP Server - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE "UDP Server - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\server\Release"

-# PROP BASE Intermediate_Dir ".\server\Release"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.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 TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\server\Debug"

-# PROP BASE Intermediate_Dir ".\server\Debug"

-# PROP BASE Target_Dir ".\server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\server"

-CPP=cl.exe

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao\PortableServer"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "server\Alpha Debug"

-# PROP BASE Intermediate_Dir "server\Alpha Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "server"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir "server"

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "server\Alpha Release"

-# PROP BASE Intermediate_Dir "server\Alpha Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "server"

-# 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 "server"

-CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\" /I "..\..\..\..\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-RSC=rc.exe

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "UDP Server - Win32 Release"

-# Name "UDP Server - Win32 Debug"

-# Name "UDP Server - Win32 Alpha Debug"

-# Name "UDP Server - Win32 Alpha Release"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\server.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDP_i.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDPC.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDPS.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=.\UDP_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDPC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\UDPS.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ".idl"

-# Begin Source File

-

-SOURCE=.\UDP.idl

-

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

-

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

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

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# PROP Ignore_Default_Tool 1

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

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

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# PROP BASE Ignore_Default_Tool 1

-# PROP Ignore_Default_Tool 1

-USERDEP__UDP_I="..\..\..\..\tao_idl\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-USERDEP__UDP_I="..\..\..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\UDP.idl

-InputName=UDP

-

-BuildCmds= \

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

-

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

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/examples/PluggableUDP/tests/svc.conf b/TAO/examples/PluggableUDP/tests/svc.conf
deleted file mode 100644
index 710efbf5209..00000000000
--- a/TAO/examples/PluggableUDP/tests/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-dynamic DIOP_Factory Service_Object * TAO_DIOP:_make_TAO_DIOP_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory DIOP_Factory"
-
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index 370424c78cc..05f6acada8d 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -52,7 +52,7 @@ Quoter_Factory_Finder_Server::init (int argc,
                                     CORBA::Environment &ACE_TRY_ENV)
 {
   const char *exception_message = "Null Message";
-
+  
   ACE_TRY
     {
       exception_message = "While ORB_Manager::init";
@@ -170,9 +170,11 @@ Quoter_Factory_Finder_Server::run (CORBA::Environment &ACE_TRY_ENV)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Factory_Finder_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  if (orb_manager_.orb()->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "run"),
+                      -1);
   return 0;
 }
 
@@ -194,7 +196,7 @@ Quoter_Factory_Finder_Server::parse_args (void)
         break;
       default:
         exit_code = 1;
-        ACE_ERROR ((LM_ERROR,
+        ACE_ERROR ((LM_ERROR, 
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
       case '?':
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 87499fafe18..baf2352115b 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -116,7 +116,7 @@ Quoter_Generic_Factory_Server::init (int argc,
         ACE_ERROR ((LM_ERROR,
                    " (%P|%t) Unable get the Naming Service.\n"));
 
-
+      
       if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     "Generic_Factory: Have a proper reference to the Naming Service.\n"));
@@ -217,13 +217,17 @@ Quoter_Generic_Factory_Server::init (int argc,
 int
 Quoter_Generic_Factory_Server::run (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Generic_Factory_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  if (orb_manager_.orb()->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "run"),
+                      -1);
   return 0;
 }
 
@@ -247,7 +251,7 @@ Quoter_Generic_Factory_Server::parse_args (void)
         break;
       default:
         exit_code = 1;
-        ACE_ERROR ((LM_ERROR,
+        ACE_ERROR ((LM_ERROR, 
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
       case '?':
diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile
index 03679a97577..5661a758537 100644
--- a/TAO/examples/Quoter/Makefile
+++ b/TAO/examples/Quoter/Makefile
@@ -6,6 +6,8 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # TAO_ROOT
 
+override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1
+
 # The following lines tell the souce code that the trading
 # service is available.
 
@@ -43,7 +45,17 @@ GENERIC_FACTORY_OBJS = $(COMMON_OBJS) Generic_Factory.o Generic_Factory_i.o
 
 BIN2 = client server Factory_Finder Generic_Factory
 
-TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs -Ge 1
+#### If the TAO orbsvcs library wasn't built with sufficient components,
+#### don't try to build here.
+TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
+ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
+  ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS)))
+    ifeq ($(minimum_corba),0)
+      BIN = $(BIN2)
+    endif # minimum_corba
+  endif # LifeCycle
+endif # Naming
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -61,18 +73,6 @@ else # ! ACE_HAS_GNUG_PRE_2_8
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS)))
-    ifeq ($(minimum_corba),0)
-      BIN = $(BIN2)
-    endif # minimum_corba
-  endif # LifeCycle
-endif # Naming
-
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 7ee6209844f..18d0d690154 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -268,8 +268,8 @@ CosLifeCycle::LifeCycleObject::_nil ();
 // Move this object using <there> and <the_criteria>
 
 void
-Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
-                const CosLifeCycle::Criteria & /* the_criteria */,
+Quoter_i::move (CosLifeCycle::FactoryFinder_ptr there,
+                const CosLifeCycle::Criteria &the_criteria,
                 CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        CosLifeCycle::NoFactory,
@@ -277,10 +277,14 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
                        CosLifeCycle::InvalidCriteria,
                        CosLifeCycle::CannotMeetCriteria))
 {
-  ACE_ERROR ((LM_ERROR,
-              "Quoter_i::move: The Quoter object is not movable!"));
+  ACE_UNUSED_ARG (there);
+  ACE_UNUSED_ARG (the_criteria);
+
+  ACE_ERROR ((LM_ERROR, 
+			  "Quoter_i::move: The Quoter object is not movable!"));
+
+  ACE_THROW (new CosLifeCycle::NotMovable);
 
-  ACE_THROW (CosLifeCycle::NotMovable());
 }
 
 
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index 79b642a1204..aea5b5ccd64 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -9,7 +9,7 @@
 //    Quoter_i.h
 //
 // = AUTHOR
-//    Darrell Brunsch <brunsch@uci.edu>
+//    Darrell Brunsch
 //
 // ============================================================================
 
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index fb1da3e21c8..c52c57ff0bd 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -211,13 +211,17 @@ Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
 int
 Quoter_Server::run (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nQuoter Example: Quoter_Server is running\n"));
 
-  orb_manager_.orb()->run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  if (orb_manager_.orb()->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "run"),
+                      -1);
   return 0;
 }
 
diff --git a/TAO/examples/README b/TAO/examples/README
index cb61ea91555..15494c690b6 100644
--- a/TAO/examples/README
+++ b/TAO/examples/README
@@ -74,11 +74,6 @@ examples:
           This example shows how to store the state of CORBA servants in
           persistent memory.
 
-        . PluggableUDP
-        
-          This example tests the UDP Pluggable Protocol (DIOP) implementation by
-          sending oneway requests to a server.
-
         . POA
 
           Contains various small examples of POA features based on
diff --git a/TAO/examples/Simple/bank/run_test.pl b/TAO/examples/Simple/bank/run_test.pl
index ad99091c941..306d5b0a25d 100755
--- a/TAO/examples/Simple/bank/run_test.pl
+++ b/TAO/examples/Simple/bank/run_test.pl
@@ -6,37 +6,33 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../bin";
-use PerlACE::Run_Test;
-
+require ACEutils;
+require Process;
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("bank.ior");
+$iorfile = "bank.ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: Could not find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = Process::Create($EXEPREFIX."client$EXE_EXT","-f $iorfile");
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: the client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimedWait (1);
 }
 
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate the server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl
index f8a88e36242..3be6c7823be 100755
--- a/TAO/examples/Simple/echo/run_test.pl
+++ b/TAO/examples/Simple/echo/run_test.pl
@@ -6,39 +6,34 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+require Process;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("echo.ior");
+$iorfile = "echo.ior";
 
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: Could not find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$client = Process::Create($EXEPREFIX."client$EXE_EXT", "-f $iorfile -x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate the server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
+
 unlink $iorfile;
 
 exit $status;
-
diff --git a/TAO/examples/Simple/grid/run_test.pl b/TAO/examples/Simple/grid/run_test.pl
index 949f8b42585..31d1ba57a89 100755
--- a/TAO/examples/Simple/grid/run_test.pl
+++ b/TAO/examples/Simple/grid/run_test.pl
@@ -6,36 +6,32 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+require Process;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("grid.ior");
+$iorfile = "grid.ior";
 
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: Could not find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$client = Process::Create($EXEPREFIX."client$EXE_EXT", "-f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate the server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/examples/Simple/time-date/client.conf b/TAO/examples/Simple/time-date/client.conf
deleted file mode 100644
index a72676ee49a..00000000000
--- a/TAO/examples/Simple/time-date/client.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-# Empty configuration file, the default configuration works just fine
-# for the client, but the svc.conf file (or -ORBSkipServiceConfigOpen)
-# breaks it.
diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl
index 038a97933a2..5fc9d903b85 100755
--- a/TAO/examples/Simple/time-date/run_test.pl
+++ b/TAO/examples/Simple/time-date/run_test.pl
@@ -6,34 +6,37 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+require Process;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("timedate.ior");
-$conf = PerlACE::LocalFile ("client.conf");
+$iorfile = "./ior";
 
 # Remove the file before starting the test.
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client", "-f $iorfile -ORBSvcConf $conf");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: waiting for file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                            "-f $iorfile -ORBSkipServiceConfigOpen");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if ($CL->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$SV->Kill (); 
+$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate the server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
+}
 
 unlink $iorfile;
 
diff --git a/TAO/examples/Simple/time/client.dsp b/TAO/examples/Simple/time/client.dsp
index 5b347c7d836..8189526e28a 100644
--- a/TAO/examples/Simple/time/client.dsp
+++ b/TAO/examples/Simple/time/client.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Simple Time Client - Win32 Release

+CFG=Simple Time Client - Win32 Alpha Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,20 +14,20 @@ CFG=Simple Time Client - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

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

 !MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="Simple Time Client - Win32 Release"

+!MESSAGE NMAKE /f "client.mak" CFG="Simple Time Client - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Simple Time Client - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Simple Time Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Client - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "Simple Time Client - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

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

 

@@ -41,9 +42,11 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\client"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -66,9 +69,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\client"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -78,30 +83,867 @@ LINK32=link.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 TAO_CosNamingd.lib TAO_IORTabled.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "client\Alpha Debug"

+# PROP BASE Intermediate_Dir "client\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "client"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "client"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd ..\..\..\..\\ /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "client\Alpha Release"

+# PROP BASE Intermediate_Dir "client\Alpha Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "client"

+# 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 "client"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

 !ENDIF 

 

 # Begin Target

 

 # Name "Simple Time Client - Win32 Release"

 # Name "Simple Time Client - Win32 Debug"

+# Name "Simple Time Client - Win32 Alpha Debug"

+# Name "Simple Time Client - Win32 Alpha Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\client.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Debug"

+

+DEP_CPP_CLIEN=\

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

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

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

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

+	"..\..\..\..\ace\Addr.h"\

+	"..\..\..\..\ace\Addr.i"\

+	"..\..\..\..\ace\Atomic_Op.i"\

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

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

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

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

+	"..\..\..\..\ace\Basic_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\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\INET_Addr.h"\

+	"..\..\..\..\ace\INET_Addr.i"\

+	"..\..\..\..\ace\IO_Cntl_Msg.h"\

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

+	"..\..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\..\ace\IPC_SAP.i"\

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

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

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

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

+	"..\..\..\..\ace\Malloc.h"\

+	"..\..\..\..\ace\Malloc.i"\

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

+	"..\..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\..\ace\Malloc_T.h"\

+	"..\..\..\..\ace\Malloc_T.i"\

+	"..\..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\..\ace\Managed_Object.h"\

+	"..\..\..\..\ace\Managed_Object.i"\

+	"..\..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\..\ace\Map_Manager.h"\

+	"..\..\..\..\ace\Map_Manager.i"\

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

+	"..\..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\..\ace\Synch.h"\

+	"..\..\..\..\ace\Synch.i"\

+	"..\..\..\..\ace\Synch_Options.h"\

+	"..\..\..\..\ace\Synch_Options.i"\

+	"..\..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\..\ace\Synch_T.h"\

+	"..\..\..\..\ace\Synch_T.i"\

+	"..\..\..\..\ace\Task.h"\

+	"..\..\..\..\ace\Task.i"\

+	"..\..\..\..\ace\Task_T.cpp"\

+	"..\..\..\..\ace\Task_T.h"\

+	"..\..\..\..\ace\Task_T.i"\

+	"..\..\..\..\ace\Thread.h"\

+	"..\..\..\..\ace\Thread.i"\

+	"..\..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\..\ace\Time_Value.h"\

+	"..\..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\..\ace\Timer_Queue_T.cpp"\

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

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

+	"..\..\..\tao\ORB.i"\

+	"..\..\..\tao\ORB_Core.h"\

+	"..\..\..\tao\ORB_Core.i"\

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

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

+	"..\..\..\tao\params.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\Server_Request.h"\

+	"..\..\..\tao\Server_Request.i"\

+	"..\..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\..\tao\Stub.h"\

+	"..\..\..\tao\Stub.i"\

+	"..\..\..\tao\Typecode.h"\

+	"..\..\..\tao\Typecode.i"\

+	

+NODEP_CPP_CLIEN=\

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

+	"..\..\..\..\ace\Connector.i"\

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

+	"..\..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\..\ace\Svc_Handler.i"\

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

+	"..\..\..\tao\Align.h"\

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

+	"..\..\..\tao\Connect.h"\

+	"..\..\..\tao\Connect.i"\

+	"..\..\..\tao\GIOP.h"\

+	"..\..\..\tao\GIOP.i"\

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

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

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

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

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

+	"..\..\..\tao\Operation_Table.h"\

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

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

+	"..\..\..\tao\ORB_Strategies_T.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\Servant_Base.h"\

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

+	"..\..\..\tao\Union.h"\

+	"..\..\..\tao\varout.cpp"\

+	"..\..\..\tao\varout.h"\

+	"..\..\..\tao\varout.i"\

+	".\Client_impl.h"\

+	".\TimeC.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_Client_i.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeC.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Debug"

+

+DEP_CPP_TIMEC=\

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

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

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

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

+	"..\..\..\..\ace\Addr.h"\

+	"..\..\..\..\ace\Addr.i"\

+	"..\..\..\..\ace\Atomic_Op.i"\

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

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

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

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

+	"..\..\..\..\ace\Basic_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\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\INET_Addr.h"\

+	"..\..\..\..\ace\INET_Addr.i"\

+	"..\..\..\..\ace\IO_Cntl_Msg.h"\

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

+	"..\..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\..\ace\IPC_SAP.i"\

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

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

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

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

+	"..\..\..\..\ace\Malloc.h"\

+	"..\..\..\..\ace\Malloc.i"\

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

+	"..\..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\..\ace\Malloc_T.h"\

+	"..\..\..\..\ace\Malloc_T.i"\

+	"..\..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\..\ace\Managed_Object.h"\

+	"..\..\..\..\ace\Managed_Object.i"\

+	"..\..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\..\ace\Map_Manager.h"\

+	"..\..\..\..\ace\Map_Manager.i"\

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

+	"..\..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\..\ace\Synch.h"\

+	"..\..\..\..\ace\Synch.i"\

+	"..\..\..\..\ace\Synch_Options.h"\

+	"..\..\..\..\ace\Synch_Options.i"\

+	"..\..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\..\ace\Synch_T.h"\

+	"..\..\..\..\ace\Synch_T.i"\

+	"..\..\..\..\ace\Task.h"\

+	"..\..\..\..\ace\Task.i"\

+	"..\..\..\..\ace\Task_T.cpp"\

+	"..\..\..\..\ace\Task_T.h"\

+	"..\..\..\..\ace\Task_T.i"\

+	"..\..\..\..\ace\Thread.h"\

+	"..\..\..\..\ace\Thread.i"\

+	"..\..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\..\ace\Time_Value.h"\

+	"..\..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\..\ace\Timer_Queue_T.cpp"\

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

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

+	"..\..\..\tao\ORB.i"\

+	"..\..\..\tao\ORB_Core.h"\

+	"..\..\..\tao\ORB_Core.i"\

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

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

+	"..\..\..\tao\params.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\Server_Request.h"\

+	"..\..\..\tao\Server_Request.i"\

+	"..\..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\..\tao\Stub.h"\

+	"..\..\..\tao\Stub.i"\

+	"..\..\..\tao\Typecode.h"\

+	"..\..\..\tao\Typecode.i"\

+	

+NODEP_CPP_TIMEC=\

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

+	"..\..\..\..\ace\Connector.i"\

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

+	"..\..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\..\ace\Svc_Handler.i"\

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

+	"..\..\..\tao\Align.h"\

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

+	"..\..\..\tao\Connect.h"\

+	"..\..\..\tao\Connect.i"\

+	"..\..\..\tao\GIOP.h"\

+	"..\..\..\tao\GIOP.i"\

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

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

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

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

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

+	"..\..\..\tao\Operation_Table.h"\

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

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

+	"..\..\..\tao\ORB_Strategies_T.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\Servant_Base.h"\

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

+	"..\..\..\tao\Union.h"\

+	"..\..\..\tao\varout.cpp"\

+	"..\..\..\tao\varout.h"\

+	"..\..\..\tao\varout.i"\

+	".\TimeC.h"\

+	".\TimeC.i"\

+	".\TimeS.h"\

+	".\TimeS.i"\

+	".\TimeS_T.cpp"\

+	".\TimeS_T.h"\

+	".\TimeS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeS.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Debug"

+

+DEP_CPP_TIMES=\

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

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

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

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

+	"..\..\..\..\ace\Addr.h"\

+	"..\..\..\..\ace\Addr.i"\

+	"..\..\..\..\ace\Atomic_Op.i"\

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

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

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

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

+	"..\..\..\..\ace\Basic_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\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\INET_Addr.h"\

+	"..\..\..\..\ace\INET_Addr.i"\

+	"..\..\..\..\ace\IO_Cntl_Msg.h"\

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

+	"..\..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\..\ace\IPC_SAP.i"\

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

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

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

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

+	"..\..\..\..\ace\Malloc.h"\

+	"..\..\..\..\ace\Malloc.i"\

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

+	"..\..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\..\ace\Malloc_T.h"\

+	"..\..\..\..\ace\Malloc_T.i"\

+	"..\..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\..\ace\Managed_Object.h"\

+	"..\..\..\..\ace\Managed_Object.i"\

+	"..\..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\..\ace\Map_Manager.h"\

+	"..\..\..\..\ace\Map_Manager.i"\

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

+	"..\..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\..\ace\Synch.h"\

+	"..\..\..\..\ace\Synch.i"\

+	"..\..\..\..\ace\Synch_Options.h"\

+	"..\..\..\..\ace\Synch_Options.i"\

+	"..\..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\..\ace\Synch_T.h"\

+	"..\..\..\..\ace\Synch_T.i"\

+	"..\..\..\..\ace\Task.h"\

+	"..\..\..\..\ace\Task.i"\

+	"..\..\..\..\ace\Task_T.cpp"\

+	"..\..\..\..\ace\Task_T.h"\

+	"..\..\..\..\ace\Task_T.i"\

+	"..\..\..\..\ace\Thread.h"\

+	"..\..\..\..\ace\Thread.i"\

+	"..\..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\..\ace\Time_Value.h"\

+	"..\..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\..\ace\Timer_Queue_T.cpp"\

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

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

+	"..\..\..\tao\ORB.i"\

+	"..\..\..\tao\ORB_Core.h"\

+	"..\..\..\tao\ORB_Core.i"\

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

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

+	"..\..\..\tao\params.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\Server_Request.h"\

+	"..\..\..\tao\Server_Request.i"\

+	"..\..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\..\tao\Stub.h"\

+	"..\..\..\tao\Stub.i"\

+	"..\..\..\tao\Typecode.h"\

+	"..\..\..\tao\Typecode.i"\

+	

+NODEP_CPP_TIMES=\

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

+	"..\..\..\..\ace\Connector.i"\

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

+	"..\..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\..\ace\Svc_Handler.i"\

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

+	"..\..\..\tao\Align.h"\

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

+	"..\..\..\tao\Connect.h"\

+	"..\..\..\tao\Connect.i"\

+	"..\..\..\tao\GIOP.h"\

+	"..\..\..\tao\GIOP.i"\

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

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

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

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

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

+	"..\..\..\tao\Operation_Table.h"\

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

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

+	"..\..\..\tao\ORB_Strategies_T.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\Servant_Base.h"\

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

+	"..\..\..\tao\Union.h"\

+	"..\..\..\tao\varout.cpp"\

+	"..\..\..\tao\varout.h"\

+	"..\..\..\tao\varout.i"\

+	".\TimeC.h"\

+	".\TimeC.i"\

+	".\TimeS.h"\

+	".\TimeS.i"\

+	".\TimeS_T.cpp"\

+	".\TimeS_T.h"\

+	".\TimeS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -197,6 +1039,86 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Debug"

+

+# PROP BASE Ignore_Default_Tool 1

+# PROP Ignore_Default_Tool 1

+USERDEP__TIME_="..\..\..\tao_idl\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Time.idl

+InputName=Time

+

+BuildCmds= \

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

+

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

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Simple Time Client - Win32 Alpha Release"

+

+# PROP BASE Ignore_Default_Tool 1

+# PROP Ignore_Default_Tool 1

+USERDEP__TIME_="..\..\..\tao_idl\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Time.idl

+InputName=Time

+

+BuildCmds= \

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

+

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

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ENDIF 

 

 # End Source File

diff --git a/TAO/examples/Simple/time/run_test.pl b/TAO/examples/Simple/time/run_test.pl
index 2001e9c85e4..1f9a7b4b9f4 100755
--- a/TAO/examples/Simple/time/run_test.pl
+++ b/TAO/examples/Simple/time/run_test.pl
@@ -5,37 +5,32 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+require Process;
 
 $status = 0;
-$iorfile = PerlACE::LocalFile ("time.ior");
+$iorfile = "time.ior";
 
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile -x");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: Could not find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = Process::Create ($EXEPREFIX."client$EXE_EXT", "-f $iorfile -x");
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimeWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($SV->TimedWait (1) == -1) {
+  print STDERR "ERROR: cannot terminate the server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/examples/Simple/time/server.dsp b/TAO/examples/Simple/time/server.dsp
index 11589a25cf7..60753f258d1 100644
--- a/TAO/examples/Simple/time/server.dsp
+++ b/TAO/examples/Simple/time/server.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Simple Time Server - Win32 Debug

+CFG=Simple Time Server - Win32 Alpha Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,20 +14,20 @@ CFG=Simple Time Server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

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

 !MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="Simple Time Server - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="Simple Time Server - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Simple Time Server - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Simple Time Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Server - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "Simple Time Server - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

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

 

@@ -41,9 +42,11 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\server"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -66,9 +69,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\server"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -78,30 +83,875 @@ LINK32=link.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 TAO_CosNamingd.lib TAO_IORTabled.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\PortableServer" /libpath:"..\..\..\tao\IORTable" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "server\Alpha Debug"

+# PROP BASE Intermediate_Dir "server\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "server"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "server"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd ..\..\..\..\\ /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "server\Alpha Release"

+# PROP BASE Intermediate_Dir "server\Alpha Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "server"

+# 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 "server"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+

 !ENDIF 

 

 # Begin Target

 

 # Name "Simple Time Server - Win32 Release"

 # Name "Simple Time Server - Win32 Debug"

+# Name "Simple Time Server - Win32 Alpha Debug"

+# Name "Simple Time Server - Win32 Alpha Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\server.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Debug"

+

+DEP_CPP_SERVE=\

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

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

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

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

+	"..\..\..\..\ace\Addr.h"\

+	"..\..\..\..\ace\Addr.i"\

+	"..\..\..\..\ace\Atomic_Op.i"\

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

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

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

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

+	"..\..\..\..\ace\Basic_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\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\INET_Addr.h"\

+	"..\..\..\..\ace\INET_Addr.i"\

+	"..\..\..\..\ace\IO_Cntl_Msg.h"\

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

+	"..\..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\..\ace\IPC_SAP.i"\

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

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

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

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

+	"..\..\..\..\ace\Malloc.h"\

+	"..\..\..\..\ace\Malloc.i"\

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

+	"..\..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\..\ace\Malloc_T.h"\

+	"..\..\..\..\ace\Malloc_T.i"\

+	"..\..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\..\ace\Managed_Object.h"\

+	"..\..\..\..\ace\Managed_Object.i"\

+	"..\..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\..\ace\Map_Manager.h"\

+	"..\..\..\..\ace\Map_Manager.i"\

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

+	"..\..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\..\ace\Synch.h"\

+	"..\..\..\..\ace\Synch.i"\

+	"..\..\..\..\ace\Synch_Options.h"\

+	"..\..\..\..\ace\Synch_Options.i"\

+	"..\..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\..\ace\Synch_T.h"\

+	"..\..\..\..\ace\Synch_T.i"\

+	"..\..\..\..\ace\Task.h"\

+	"..\..\..\..\ace\Task.i"\

+	"..\..\..\..\ace\Task_T.cpp"\

+	"..\..\..\..\ace\Task_T.h"\

+	"..\..\..\..\ace\Task_T.i"\

+	"..\..\..\..\ace\Thread.h"\

+	"..\..\..\..\ace\Thread.i"\

+	"..\..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\..\ace\Time_Value.h"\

+	"..\..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\..\ace\Timer_Queue_T.cpp"\

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

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

+	"..\..\..\tao\ORB.i"\

+	"..\..\..\tao\ORB_Core.h"\

+	"..\..\..\tao\ORB_Core.i"\

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

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

+	"..\..\..\tao\params.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\Server_Request.h"\

+	"..\..\..\tao\Server_Request.i"\

+	"..\..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\..\tao\Stub.h"\

+	"..\..\..\tao\Stub.i"\

+	"..\..\..\tao\Typecode.h"\

+	"..\..\..\tao\Typecode.i"\

+	

+NODEP_CPP_SERVE=\

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

+	"..\..\..\..\ace\Connector.i"\

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

+	"..\..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\..\ace\Svc_Handler.i"\

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

+	"..\..\..\tao\Align.h"\

+	"..\..\..\tao\Connect.h"\

+	"..\..\..\tao\Connect.i"\

+	"..\..\..\tao\GIOP.h"\

+	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

+	"..\..\..\tao\Operation_Table.h"\

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

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

+	"..\..\..\tao\ORB_Strategies_T.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\Servant_Base.h"\

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

+	"..\..\..\tao\TAO.h"\

+	"..\..\..\tao\Union.h"\

+	"..\..\..\tao\varout.cpp"\

+	"..\..\..\tao\varout.h"\

+	"..\..\..\tao\varout.i"\

+	".\Server_impl.h"\

+	".\Time_impl.h"\

+	".\TimeC.h"\

+	".\TimeC.i"\

+	".\TimeS.h"\

+	".\TimeS.i"\

+	".\TimeS_T.cpp"\

+	".\TimeS_T.h"\

+	".\TimeS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_i.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeC.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Debug"

+

+DEP_CPP_TIMEC=\

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

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

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

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

+	"..\..\..\..\ace\Addr.h"\

+	"..\..\..\..\ace\Addr.i"\

+	"..\..\..\..\ace\Atomic_Op.i"\

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

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

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

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

+	"..\..\..\..\ace\Basic_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\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\INET_Addr.h"\

+	"..\..\..\..\ace\INET_Addr.i"\

+	"..\..\..\..\ace\IO_Cntl_Msg.h"\

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

+	"..\..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\..\ace\IPC_SAP.i"\

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

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

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

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

+	"..\..\..\..\ace\Malloc.h"\

+	"..\..\..\..\ace\Malloc.i"\

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

+	"..\..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\..\ace\Malloc_T.h"\

+	"..\..\..\..\ace\Malloc_T.i"\

+	"..\..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\..\ace\Managed_Object.h"\

+	"..\..\..\..\ace\Managed_Object.i"\

+	"..\..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\..\ace\Map_Manager.h"\

+	"..\..\..\..\ace\Map_Manager.i"\

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

+	"..\..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\..\ace\Synch.h"\

+	"..\..\..\..\ace\Synch.i"\

+	"..\..\..\..\ace\Synch_Options.h"\

+	"..\..\..\..\ace\Synch_Options.i"\

+	"..\..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\..\ace\Synch_T.h"\

+	"..\..\..\..\ace\Synch_T.i"\

+	"..\..\..\..\ace\Task.h"\

+	"..\..\..\..\ace\Task.i"\

+	"..\..\..\..\ace\Task_T.cpp"\

+	"..\..\..\..\ace\Task_T.h"\

+	"..\..\..\..\ace\Task_T.i"\

+	"..\..\..\..\ace\Thread.h"\

+	"..\..\..\..\ace\Thread.i"\

+	"..\..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\..\ace\Time_Value.h"\

+	"..\..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\..\ace\Timer_Queue_T.cpp"\

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

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

+	"..\..\..\tao\ORB.i"\

+	"..\..\..\tao\ORB_Core.h"\

+	"..\..\..\tao\ORB_Core.i"\

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

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

+	"..\..\..\tao\params.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\Server_Request.h"\

+	"..\..\..\tao\Server_Request.i"\

+	"..\..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\..\tao\Stub.h"\

+	"..\..\..\tao\Stub.i"\

+	"..\..\..\tao\Typecode.h"\

+	"..\..\..\tao\Typecode.i"\

+	

+NODEP_CPP_TIMEC=\

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

+	"..\..\..\..\ace\Connector.i"\

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

+	"..\..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\..\ace\Svc_Handler.i"\

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

+	"..\..\..\tao\Align.h"\

+	"..\..\..\tao\Connect.h"\

+	"..\..\..\tao\Connect.i"\

+	"..\..\..\tao\GIOP.h"\

+	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

+	"..\..\..\tao\Operation_Table.h"\

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

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

+	"..\..\..\tao\ORB_Strategies_T.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\Servant_Base.h"\

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

+	"..\..\..\tao\Union.h"\

+	"..\..\..\tao\varout.cpp"\

+	"..\..\..\tao\varout.h"\

+	"..\..\..\tao\varout.i"\

+	".\TimeC.h"\

+	".\TimeC.i"\

+	".\TimeS.h"\

+	".\TimeS.i"\

+	".\TimeS_T.cpp"\

+	".\TimeS_T.h"\

+	".\TimeS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeS.cpp

+

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

+

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

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Debug"

+

+DEP_CPP_TIMES=\

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

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

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

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

+	"..\..\..\..\ace\Addr.h"\

+	"..\..\..\..\ace\Addr.i"\

+	"..\..\..\..\ace\Atomic_Op.i"\

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

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

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

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

+	"..\..\..\..\ace\Basic_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\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\INET_Addr.h"\

+	"..\..\..\..\ace\INET_Addr.i"\

+	"..\..\..\..\ace\IO_Cntl_Msg.h"\

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

+	"..\..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\..\ace\IPC_SAP.i"\

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

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

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

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

+	"..\..\..\..\ace\Malloc.h"\

+	"..\..\..\..\ace\Malloc.i"\

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

+	"..\..\..\..\ace\Malloc_T.cpp"\

+	"..\..\..\..\ace\Malloc_T.h"\

+	"..\..\..\..\ace\Malloc_T.i"\

+	"..\..\..\..\ace\Managed_Object.cpp"\

+	"..\..\..\..\ace\Managed_Object.h"\

+	"..\..\..\..\ace\Managed_Object.i"\

+	"..\..\..\..\ace\Map_Manager.cpp"\

+	"..\..\..\..\ace\Map_Manager.h"\

+	"..\..\..\..\ace\Map_Manager.i"\

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

+	"..\..\..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\..\..\ace\Svc_Handler.cpp"\

+	"..\..\..\..\ace\Svc_Handler.h"\

+	"..\..\..\..\ace\Synch.h"\

+	"..\..\..\..\ace\Synch.i"\

+	"..\..\..\..\ace\Synch_Options.h"\

+	"..\..\..\..\ace\Synch_Options.i"\

+	"..\..\..\..\ace\Synch_T.cpp"\

+	"..\..\..\..\ace\Synch_T.h"\

+	"..\..\..\..\ace\Synch_T.i"\

+	"..\..\..\..\ace\Task.h"\

+	"..\..\..\..\ace\Task.i"\

+	"..\..\..\..\ace\Task_T.cpp"\

+	"..\..\..\..\ace\Task_T.h"\

+	"..\..\..\..\ace\Task_T.i"\

+	"..\..\..\..\ace\Thread.h"\

+	"..\..\..\..\ace\Thread.i"\

+	"..\..\..\..\ace\Thread_Manager.h"\

+	"..\..\..\..\ace\Thread_Manager.i"\

+	"..\..\..\..\ace\Time_Value.h"\

+	"..\..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\..\ace\Timer_Queue_T.cpp"\

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

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

+	"..\..\..\tao\ORB.i"\

+	"..\..\..\tao\ORB_Core.h"\

+	"..\..\..\tao\ORB_Core.i"\

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

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

+	"..\..\..\tao\params.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\Server_Request.h"\

+	"..\..\..\tao\Server_Request.i"\

+	"..\..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\..\tao\Stub.h"\

+	"..\..\..\tao\Stub.i"\

+	"..\..\..\tao\Typecode.h"\

+	"..\..\..\tao\Typecode.i"\

+	

+NODEP_CPP_TIMES=\

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

+	"..\..\..\..\ace\Connector.i"\

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

+	"..\..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\..\ace\Svc_Handler.i"\

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

+	"..\..\..\tao\Align.h"\

+	"..\..\..\tao\Connect.h"\

+	"..\..\..\tao\Connect.i"\

+	"..\..\..\tao\GIOP.h"\

+	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

+	"..\..\..\tao\Operation_Table.h"\

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

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

+	"..\..\..\tao\ORB_Strategies_T.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\Servant_Base.h"\

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

+	"..\..\..\tao\Union.h"\

+	"..\..\..\tao\varout.cpp"\

+	"..\..\..\tao\varout.h"\

+	"..\..\..\tao\varout.i"\

+	".\TimeC.h"\

+	".\TimeC.i"\

+	".\TimeS.h"\

+	".\TimeS.i"\

+	".\TimeS_T.cpp"\

+	".\TimeS_T.h"\

+	".\TimeS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -196,6 +1046,84 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Debug"

+

+# PROP BASE Ignore_Default_Tool 1

+# PROP Ignore_Default_Tool 1

+USERDEP__TIME_="..\..\..\tao_idl\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Time.idl

+InputName=Time

+

+BuildCmds= \

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

+

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

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "Simple Time Server - Win32 Alpha Release"

+

+USERDEP__TIME_="..\..\..\tao_idl\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Time.idl

+InputName=Time

+

+BuildCmds= \

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

+

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

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

 !ENDIF 

 

 # End Source File

diff --git a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
index 7ef862e3aea..c4fbf15b245 100644
--- a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
+++ b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
@@ -1,5 +1,4 @@
 // $Id$ 
-
 // ============================================================================
 //
 // 
@@ -9,19 +8,23 @@
 // = AUTHOR
 //    Michael Kircher (mk1@cs.wustl.edu)
 //    Modified for new protocol by Hans Ridder <ridder@veritas.com>
-//    Further improved by Kevin Regan <kregan@infoglide.com>
 //
 // = DESCRIPTION
 //   Resolves the initial reference to the Naming service,
 //   the orb has to be given as a parameter to the
 //   resolve_name_service call. 
+// 
 //
 // ============================================================================
 
+
+
+
 import org.omg.CORBA.*;
 import java.net.*;
 import java.io.*;
 
+
 public class NS_Resolve
 {
   private static final String ACE_DEFAULT_MULTICAST_ADDR = "224.9.9.2";
@@ -31,126 +34,88 @@ public class NS_Resolve
   int nameServicePort_;
 
   public NS_Resolve (String nameServicePort)
-  {
-    if (nameServicePort != null)
-      {
-        // If a name service port string was given, parse it
-        nameServicePort_ = Integer.parseInt (nameServicePort);
-      }
-    else
-      {
-        // Otherwise, just use the default TAO name service port
-        nameServicePort_ = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
-      }
-  }
+    {
+      if (nameServicePort != null)
+        {
+          // If a name service port string was given, parse it
+          nameServicePort_ = Integer.parseInt (nameServicePort);
+        }
+      else
+        {
+          // Otherwise, just use the default TAO name service port
+          nameServicePort_ = TAO_DEFAULT_NAME_SERVER_REQUEST_PORT;
+        }
+    }
 
   public org.omg.CORBA.Object resolve_name_service (org.omg.CORBA.ORB orb)
-  {
-    MulticastSocket sendSocket = null;
-    ServerSocket listenSocket = null;
-    Socket replySocket = null;
-
-    try
-      {
-        // Create the multicast socket at any port
-        sendSocket = new MulticastSocket(0);
-
-        // Create a socket at any port for the Naming Service answer
-        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() + 3;
-        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());
-        msg.write(0);
-
-        // 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);
-        replySocket = listenSocket.accept();
+    {
+      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() + 3;
+	  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());
+	  msg.write(0);
+
+	  // 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();
       
-        // @@ The restriction right now is that the length of the IOR cannot be longer than 4096
-        char[] reply = new char[4096];
-
-        // Receive the reply (0 terminated string) or time out
-        replySocket.setSoTimeout(3000);
-        InputStream in = replySocket.getInputStream();
-        int length;
-        for (length = 0; length < reply.length; length++)
-          {
-            int c = in.read();
-
-            if (c == -1) 
-              {
-                throw new IOException("Unexpected EOF.");
-              }
-
-            reply[ length ] = (char) c;
-	    
-            if (c == 0) 
-              {
-                break;
-              }
-          }
-
-        // Convert the String into ??
-        return orb.string_to_object(new String(reply, 2, length-2));
-      }
-    catch (SocketException e)
-      {
-        System.err.println (e);
-      }
-    catch (java.io.InterruptedIOException e)
-      {
-        System.err.println ("NS_Resolve: The receive lasted too long");
-      } 
-    catch(org.omg.CORBA.SystemException e) 
-      {
-        System.err.println(e);
-      }	
-    catch (java.io.IOException e)
-      {
-        System.err.println (e);
-      }
-    finally 
-      {
-        // Close the sockets.
-
-        if (sendSocket != null) 
-          {
-            sendSocket.close();
-          }
-
-        if (listenSocket != null) 
-          {
-            try 
-              {
-                listenSocket.close();
-              }
-            catch (IOException e) {}
-          }
-
-        if (replySocket != null) 
-          {
-            try 
-              {
-                replySocket.close();
-              }
-            catch (IOException e) {}
-          }
-      }
-
-    return null;
-  } 
+	  // @@ The restriction right now is that the length of the IOR cannot be longer than 4096
+	  byte[] reply = new byte[4096];
+
+	  // Receive the reply (0 terminated string) or time out
+	  replySocket.setSoTimeout(3000);
+	  InputStream in = replySocket.getInputStream();
+	  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, 2, length-2));
+	}
+      catch (SocketException e)
+	{
+	  System.err.println (e);
+	}
+      catch (java.io.InterruptedIOException e)
+	{
+	  System.err.println ("NS_Resolve: The receive lasted too long");
+	} 
+      catch(org.omg.CORBA.SystemException e) 
+	{
+	  System.err.println(e);
+	}	
+      catch (java.io.IOException e)
+	{
+	  System.err.println (e);
+	}
+      return null;
+    } 
 }
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 14766b7a4ea..f2fd6988de3 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -357,7 +357,11 @@ main (int argc, char *argv [])
 
       // Run the ORB
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "CORBA::ORB::run"),
+                          -1);
       ACE_TRY_CHECK;
 
       delete demo_consumer;
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index a0bb4dd105f..8c7ad923928 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -7,60 +7,40 @@
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
-    {
-      const char *orb_name = "";
+  const char *orb_name = "";
 
-      cout << "Initializing the ORB!" << endl;
-      CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
-                                                argv,
-                                                orb_name,
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  cout << "Initializing the ORB!" << endl;
+  CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
+                                            argv,
+                                            orb_name);
+  CORBA::Object_var orb_obj =
+    the_orb->resolve_initial_references ("RootPOA");
 
-      CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  PortableServer::POA_var the_root_poa =
+    PortableServer::POA::_narrow (orb_obj.in ());
+  PortableServer::POAManager_var the_poa_manager =
+    the_root_poa->the_POAManager ();
 
-      PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Retrieving the servants IOR from a file
+  cout << "Reading the IOR!" << endl;
 
-      PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  const char *filename =
+    "file://ior.txt";
 
-      // Retrieving the servants IOR from a file
-      cout << "Reading the IOR!" << endl;
+  orb_obj =
+    the_orb->string_to_object (filename);
 
-      const char *filename =
-        "file://ior.txt";
+  cout << "Narrowing the IOR!" << endl;
 
-      orb_obj =
-        the_orb->string_to_object (filename, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  W32_Test_Interface_var mycall =
+    W32_Test_Interface::_narrow (orb_obj.in ());
 
-      cout << "Narrowing the IOR!" << endl;
+  cout << "Sending the Request!" << endl;
+  char *response = mycall->getresponse (1);
+  cout << "The answer ..." << response << endl;
 
-      W32_Test_Interface_var mycall =
-        W32_Test_Interface::_narrow (orb_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      cout << "Sending the Request!" << endl;
-      char *response = mycall->getresponse (1);
-      cout << "The answer ..." << response << endl;
-
-      // Free up the string.
-      CORBA::string_free (response);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  // Free up the string.
+  CORBA::string_free (response);
 
   return 0;
 }
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 0b5e4803b11..84e257e8d0d 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -41,61 +41,41 @@ END_MESSAGE_MAP()
 static void *
 spawn_my_orb_thread (void *)
 {
-  ACE_TRY_NEW_ENV
-    {
-      // Initialization arguments for the ORB
-      const char *orb_name = "";
-
-      CORBA::ORB_var the_orb =
-        CORBA::ORB_init (__argc,
-                         __argv,
-                         orb_name,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-	    
-      CORBA::Object_var orb_obj =
-        the_orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var the_root_poa =
-        PortableServer::POA::_narrow (orb_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var the_poa_manager =
-        the_root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      the_poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Initializing the NamingService
-      W32_Test_Impl myservant;
-      W32_Test_Interface_var orb_servant =
-        myservant._this (ACE_TRY_CHECK);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        the_orb->object_to_string (orb_servant.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      FILE *output_file = ACE_OS::fopen ("ior.txt",
-                                        "w");
-      ACE_OS::fprintf (output_file,
-                       "%s",
-                       ior.in ());
-      ACE_OS::fclose (output_file);
-
-      the_orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
+  // Initialization arguments for the ORB
+  const char *orb_name = "";
+
+  CORBA::ORB_var the_orb =
+    CORBA::ORB_init (__argc,
+                     __argv,
+                     orb_name);
+	
+  CORBA::Object_var orb_obj =
+    the_orb->resolve_initial_references ("RootPOA");
+
+  PortableServer::POA_var the_root_poa =
+    PortableServer::POA::_narrow (orb_obj.in ());
+
+  PortableServer::POAManager_var the_poa_manager =
+    the_root_poa->the_POAManager ();
+
+  the_poa_manager->activate ();
+
+  // Initializing the NamingService
+  W32_Test_Impl myservant;
+  W32_Test_Interface_var orb_servant =
+    myservant._this();
+
+  CORBA::String_var ior =
+    the_orb->object_to_string (orb_servant.in ());
+
+  FILE *output_file = ACE_OS::fopen ("ior.txt",
+                                    "w");
+  ACE_OS::fprintf (output_file,
+                   "%s",
+                   ior.in ());
+  ACE_OS::fclose (output_file);
+
+  the_orb->run ();
 
   return 0;
 }
@@ -112,36 +92,21 @@ CServerApp::CServerApp()
 
 CServerApp::~CServerApp()
 {
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var the_shutdown_orb;
-
-      int argc = 0;
-      char **argv = 0;
-      const char *orb_name = "";
-
-      // Retrieving a reference to the ORB used inside the thread
-      the_shutdown_orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         orb_name,
-                         ACE_TRY_ENV);	
-      ACE_TRY_CHECK;
-
-      the_shutdown_orb->shutdown (0, // wait_for_completion
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-	    
-      ACE_Thread_Manager::instance ()->wait ();
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::ORB_var the_shutdown_orb;
 
+  int argc = 0;
+  char **argv = 0;
+  const char *orb_name = "";
+
+  // Retrieving a reference to the ORB used inside the thread
+  the_shutdown_orb =
+    CORBA::ORB_init (argc,
+                     argv,
+                     orb_name);	
+
+  the_shutdown_orb->shutdown ();
+	
+  ACE_Thread_Manager::instance ()->wait ();
 
   ACE::fini ();
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index 62cef5a4223..a89aaf5229d 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -25,7 +25,7 @@ main (int argc, char* argv[])
       TAO_CEC_Event_Loader event_service;
 
       // To intialise the service
-      int result =
+      int result = 
         event_service.init (argc, argv);
 
       if (result == -1)
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index 22f4f18cee6..14fca4a53f7 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -6,7 +6,7 @@ ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LSRC = CosEvent_Service.cpp
+LSRC = CosEvent_Service.cpp \
 
 ES_OBJS=$(LSRC:.cpp=.o)
 
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index 24360350d31..aacaa38298d 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -10,7 +10,8 @@ SRC = $(DUMP_SRCS)
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE
+
 BIN2 = Dump_Schedule
 
 #### If the TAO orbsvcs library wasn't built with sufficient components,
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index e86c010666f..e377271a858 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -62,9 +62,7 @@ Event_Service::run (int argc, char* argv[])
         return 1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->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"),
@@ -82,8 +80,7 @@ Event_Service::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the Naming Service.\n"),
@@ -222,8 +219,8 @@ Event_Service::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__));
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (this->orb_->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
 
       naming_context->unbind (channel_name, ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/FT_Service/Makefile b/TAO/orbsvcs/FT_Service/Makefile
deleted file mode 100644
index 38ece35ccf7..00000000000
--- a/TAO/orbsvcs/FT_Service/Makefile
+++ /dev/null
@@ -1,720 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LIBNAME  = libTAO_FTService
-LIB      = $(LIBNAME).a
-SHLIB    = $(LIBNAME).$(SOEXT)
-
-VPATH=.:
-
-ACE_SHLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO -lACE
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-CPP_SRCS += \
-	FT_CORBA_ServiceC \
-	FT_CORBA_ServiceS
-
-FILES = $(CPP_SRCS)
-DEFS  = $(addsuffix .h,$(FILES))
-LSRC  = $(addsuffix .cpp,$(FILES))
-
-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 (and local hacks)
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/FT_CORBA_ServiceC.o .obj/FT_CORBA_ServiceC.so .shobj/FT_CORBA_ServiceC.o .shobj/FT_CORBA_ServiceC.so: FT_CORBA_ServiceC.cpp FT_CORBA_ServiceC.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/FT_CORBAC.h \
- $(TAO_ROOT)/tao/ftcorbafwd.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/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.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 \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.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/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/FT_CORBAC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/Request_Info.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.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/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(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/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/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 \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(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/Protocol_Factory.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
- $(TAO_ROOT)/tao/Pluggable_Messaging.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/InterfaceC.h \
- $(TAO_ROOT)/tao/ifrfwd.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.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/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
- FT_CORBA_ServiceC.i
-
-.obj/FT_CORBA_ServiceS.o .obj/FT_CORBA_ServiceS.so .shobj/FT_CORBA_ServiceS.o .shobj/FT_CORBA_ServiceS.so: FT_CORBA_ServiceS.cpp FT_CORBA_ServiceS.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/ftpoafwd.h \
- $(TAO_ROOT)/tao/ftcorbafwd.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/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.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 \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.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/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/FT_CORBAS.h \
- $(TAO_ROOT)/tao/FT_CORBAC.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/FT_CORBAC.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/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServerC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/FT_CORBAS.i \
- FT_CORBA_ServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/Request_Info.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.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/Server_Request.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
- $(ACE_ROOT)/ace/Pair_T.cpp \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/Key_Adapters.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(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/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/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 \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
- $(TAO_ROOT)/tao/Pluggable_Messaging.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/InterfaceC.h \
- $(TAO_ROOT)/tao/ifrfwd.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.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/MessagingS_T.h \
- $(TAO_ROOT)/tao/MessagingS_T.i \
- $(TAO_ROOT)/tao/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Notify/notify_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotificationC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/event_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNotifyFilterC.i \
- FT_CORBA_ServiceC.i FT_CORBA_ServiceS.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.bor b/TAO/orbsvcs/IFR_Service/IFR_Service.bor
index 064073a4015..2d3928c81fe 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.bor
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.bor
@@ -63,7 +63,6 @@ CFLAGS = \
 	$(TAO_PORTABLESERVER_CFLAGS) \
 	$(TAO_SVC_UTILS_CFLAGS)	\
 	$(TAO_IORTABLE_CFLAGS) \
-	$(TAO_IFR_CLIENT_CFLAGS) \
 	-DTCF_HAS_DLL=$(TCF_DLLFLAG)
 
 LIBFILES = \
@@ -72,7 +71,6 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB) \
 	$(TAO_SVC_UTILS_LIB) \
 	$(TAO_IORTABLE_LIB) \
-	$(TAO_IFR_CLIENT_LIB) \
 	$(CORE_BINDIR)\TypeCodeFactory_DLL$(LIB_DECORATOR).lib
 
 CPPDIR = .
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index 9f6217c7c50..483b243e994 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -119,9 +119,17 @@ IFR_Service::init (int argc,
 int
 IFR_Service::run (CORBA::Environment &ACE_TRY_ENV)
 {
-  this->orb_->run (0, ACE_TRY_ENV);
+  int status = this->orb_->run (0,
+                                ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Error: IFR_Service::run"),
+                        -1);
+    }
+
   return 0;
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceS.cpp b/TAO/orbsvcs/IFR_Service/InterfaceS.cpp
index 407bc353258..7310a2f1791 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceS.cpp
+++ b/TAO/orbsvcs/IFR_Service/InterfaceS.cpp
@@ -19,9 +19,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_INTERFACES_CPP
-#define TAO_IDL_INTERFACES_CPP
-
 #include "InterfaceS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
@@ -264,6 +261,9 @@ static int _TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 _TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void)
 {}
 
+_TAO_IRObject_ThruPOA_Proxy_Impl::~_TAO_IRObject_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 IR_DefinitionKind 
@@ -360,72 +360,18 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
 
   IR_DefinitionKind _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->def_kind (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->def_kind (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_DefinitionKind _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_CORBA_IRObject::destroy_skel (
@@ -437,65 +383,13 @@ void POA_CORBA_IRObject::destroy_skel (
 {
   POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference;
 
-  _tao_server_request.argument_flag (0);
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->destroy (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->destroy (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_IRObject::_is_a_skel (
@@ -589,148 +483,6 @@ POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::CORBA::IRObject::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_CORBA_IRObject *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
-    TAO_ServerRequest &_tao_server_request,
-    POA_CORBA_IRObject *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_Contained_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -982,6 +734,9 @@ static int _TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::_TAO_Contained_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::~_TAO_Contained_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 char * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::id (
@@ -1173,7 +928,7 @@ void POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::version (
   return;
 }
 
-IR_Container_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
+IR::Container_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1235,7 +990,7 @@ char * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::absolute_name (
       );
 }
 
-IR_Repository_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::containing_repository (
+IR::Repository_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::containing_repository (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1266,7 +1021,7 @@ IR_Repository_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::containing_reposito
       );
 }
 
-IR_Contained::Description * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
+IR::Contained::Description * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1365,73 +1120,18 @@ void POA_IR::Contained::_get_id_skel (
 
   CORBA::String_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->id (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->id (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      char * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Contained::_set_id_skel (
@@ -1444,73 +1144,20 @@ void POA_IR::Contained::_set_id_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
 
-  _tao_server_request.argument_flag (0);
-    CORBA::String_var id;
+  CORBA::String_var id;
   if (!(
     (_tao_in >> id.out ())
   ))
-    ACE_THROW (CORBA::MARSHAL());
-
+    ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->id (
       id.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->id (
-          id.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::Contained::_get_name_skel (
@@ -1524,73 +1171,18 @@ void POA_IR::Contained::_get_name_skel (
 
   CORBA::String_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->name (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->name (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      char * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Contained::_set_name_skel (
@@ -1603,73 +1195,20 @@ void POA_IR::Contained::_set_name_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
 
-  _tao_server_request.argument_flag (0);
-    CORBA::String_var name;
+  CORBA::String_var name;
   if (!(
     (_tao_in >> name.out ())
   ))
-    ACE_THROW (CORBA::MARSHAL());
-
+    ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->name (
       name.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->name (
-          name.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::Contained::_get_version_skel (
@@ -1683,73 +1222,18 @@ void POA_IR::Contained::_get_version_skel (
 
   CORBA::String_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->version (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->version (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      char * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Contained::_set_version_skel (
@@ -1762,73 +1246,20 @@ void POA_IR::Contained::_set_version_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
 
-  _tao_server_request.argument_flag (0);
-    CORBA::String_var version;
+  CORBA::String_var version;
   if (!(
     (_tao_in >> version.out ())
   ))
-    ACE_THROW (CORBA::MARSHAL());
-
+    ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->version (
       version.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->version (
-          version.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::Contained::_get_defined_in_skel (
@@ -1842,73 +1273,18 @@ void POA_IR::Contained::_get_defined_in_skel (
 
   IR_Container_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->defined_in (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->defined_in (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_Container_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Contained::_get_absolute_name_skel (
@@ -1922,73 +1298,18 @@ void POA_IR::Contained::_get_absolute_name_skel (
 
   CORBA::String_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->absolute_name (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->absolute_name (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      char * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Contained::_get_containing_repository_skel (
@@ -2002,73 +1323,18 @@ void POA_IR::Contained::_get_containing_repository_skel (
 
   IR_Repository_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->containing_repository (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->containing_repository (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_Repository_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Contained::describe_skel (
@@ -2082,73 +1348,18 @@ void POA_IR::Contained::describe_skel (
 
   IR_Contained::Description_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->describe (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->describe (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_Contained::Description * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Contained::move_skel (
@@ -2161,8 +1372,7 @@ void POA_IR::Contained::move_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
 
-  _tao_server_request.argument_flag (0);
-    IR_Container_var new_container;
+  IR_Container_var new_container;
   CORBA::String_var new_name;
   CORBA::String_var new_version;
   if (!(
@@ -2170,72 +1380,18 @@ void POA_IR::Contained::move_skel (
     (_tao_in >> new_name.out ()) &&
     (_tao_in >> new_version.out ())
   ))
-    ACE_THROW (CORBA::MARSHAL());
-
+    ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->move (
       new_container.in (),
       new_name.in (),
       new_version.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->move (
-          new_container.in (),
-          new_name.in (),
-          new_version.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::Contained::_is_a_skel (
@@ -2315,7 +1471,7 @@ const char* POA_IR::Contained::_interface_repository_id (void) const
   return "IDL:omg.org/IR/Contained:1.0";
 }
 
-IR_Contained*
+IR::Contained*
 POA_IR::Contained::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
@@ -2332,841 +1488,6 @@ POA_IR::Contained::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_Contained::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::TAO_ServerRequestInfo_IR_Contained_id_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::result (char * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::TAO_ServerRequestInfo_IR_Contained_id_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    const char * id,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::TAO_ServerRequestInfo_IR_Contained_name_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_get::result (char * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::TAO_ServerRequestInfo_IR_Contained_name_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    const char * name,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    name_ (name)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_name_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::TAO_ServerRequestInfo_IR_Contained_version_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_get::result (char * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::TAO_ServerRequestInfo_IR_Contained_version_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    const char * version,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    version_ (version)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_version_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::TAO_ServerRequestInfo_IR_Contained_defined_in_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_defined_in_get::result (IR::Container_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::TAO_ServerRequestInfo_IR_Contained_absolute_name_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_absolute_name_get::result (char * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::TAO_ServerRequestInfo_IR_Contained_containing_repository_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_containing_repository_get::result (IR::Repository_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::TAO_ServerRequestInfo_IR_Contained_describe (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_describe::result (IR::Contained::Description * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::TAO_ServerRequestInfo_IR_Contained_move (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Contained *tao_impl,
-    IR_Container_ptr new_container,
-    const char * new_name,
-    const char * new_version,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    new_container_ (new_container),
-    new_name_ (new_name),
-    new_version_ (new_version)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_new_container = parameter_list->length ();
-  parameter_list->length (length_new_container + 1);
-  (*parameter_list)[length_new_container].argument <<=  this->new_container_;
-  
-  (*parameter_list)[length_new_container].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_new_name = parameter_list->length ();
-  parameter_list->length (length_new_name + 1);
-  (*parameter_list)[length_new_name].argument <<= new_name_;
-  (*parameter_list)[length_new_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_new_version = parameter_list->length ();
-  parameter_list->length (length_new_version + 1);
-  (*parameter_list)[length_new_version].argument <<= new_version_;
-  (*parameter_list)[length_new_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_Container_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -3422,6 +1743,9 @@ static int _TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::~_TAO_Container_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 IR::Contained_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
@@ -3457,7 +1781,7 @@ IR::Contained_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
       );
 }
 
-IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
+IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
     CORBA_Object *_collocated_tao_target_,
     IR_DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
@@ -3492,7 +1816,7 @@ IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
       );
 }
 
-IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
+IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
     CORBA_Object *_collocated_tao_target_,
     const char * search_name,
     CORBA::Long levels_to_search,
@@ -3531,7 +1855,7 @@ IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
       );
 }
 
-IR_Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
+IR::Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
     CORBA_Object *_collocated_tao_target_,
     IR_DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
@@ -3568,7 +1892,7 @@ IR_Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::descri
       );
 }
 
-IR_ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
+IR::ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3605,7 +1929,7 @@ IR_ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
       );
 }
 
-IR_ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
+IR::ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3646,7 +1970,7 @@ IR_ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
       );
 }
 
-IR_StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
+IR::StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3685,7 +2009,7 @@ IR_StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
       );
 }
 
-IR_UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
+IR::UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3726,7 +2050,7 @@ IR_UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
       );
 }
 
-IR_EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
+IR::EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3765,7 +2089,7 @@ IR_EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
       );
 }
 
-IR_AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
+IR::AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3804,7 +2128,7 @@ IR_AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
       );
 }
 
-IR_InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
+IR::InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3847,7 +2171,7 @@ IR_InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_interface
       );
 }
 
-IR_ValueDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
+IR::ValueDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3898,7 +2222,7 @@ IR_ValueDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
       );
 }
 
-IR_ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
+IR::ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3937,7 +2261,7 @@ IR_ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
       );
 }
 
-IR_ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
+IR::ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -3976,7 +2300,7 @@ IR_ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_exception
       );
 }
 
-IR_NativeDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
+IR::NativeDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -4051,75 +2375,19 @@ void POA_IR::Container::lookup_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->lookup (
       search_name.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->lookup (
-          search_name.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_Contained_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
+      ACE_CHECK;
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::contents_skel (
@@ -4141,77 +2409,20 @@ void POA_IR::Container::contents_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->contents (
       limit_type,
       exclude_inherited,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->contents (
-          limit_type,
-          exclude_inherited,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::lookup_name_skel (
@@ -4237,81 +2448,22 @@ void POA_IR::Container::lookup_name_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->lookup_name (
       search_name.in (),
       levels_to_search,
       limit_type,
       exclude_inherited,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->lookup_name (
-          search_name.in (),
-          levels_to_search,
-          limit_type,
-          exclude_inherited,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::describe_contents_skel (
@@ -4335,79 +2487,21 @@ void POA_IR::Container::describe_contents_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->describe_contents (
       limit_type,
       exclude_inherited,
       max_returned_objs,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->describe_contents (
-          limit_type,
-          exclude_inherited,
-          max_returned_objs,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_module_skel (
@@ -4431,79 +2525,21 @@ void POA_IR::Container::create_module_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_module (
       id.in (),
       name.in (),
       version.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_module (
-          id.in (),
-          name.in (),
-          version.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_constant_skel (
@@ -4531,15 +2567,7 @@ void POA_IR::Container::create_constant_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_constant (
       id.in (),
       name.in (),
       version.in (),
@@ -4547,67 +2575,15 @@ void POA_IR::Container::create_constant_skel (
       value,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_constant (
-          id.in (),
-          name.in (),
-          version.in (),
-          type.in (),
-          value,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_struct_skel (
@@ -4633,81 +2609,22 @@ void POA_IR::Container::create_struct_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_struct (
       id.in (),
       name.in (),
       version.in (),
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_struct (
-          id.in (),
-          name.in (),
-          version.in (),
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_StructDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_union_skel (
@@ -4735,15 +2652,7 @@ void POA_IR::Container::create_union_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_union (
       id.in (),
       name.in (),
       version.in (),
@@ -4751,67 +2660,15 @@ void POA_IR::Container::create_union_skel (
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_union (
-          id.in (),
-          name.in (),
-          version.in (),
-          discriminator_type.in (),
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_enum_skel (
@@ -4819,7 +2676,7 @@ void POA_IR::Container::create_enum_skel (
     void *_tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
-  )
+)
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
@@ -4837,81 +2694,22 @@ void POA_IR::Container::create_enum_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_enum (
       id.in (),
       name.in (),
       version.in (),
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_enum (
-          id.in (),
-          name.in (),
-          version.in (),
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_alias_skel (
@@ -4937,81 +2735,22 @@ void POA_IR::Container::create_alias_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_alias (
       id.in (),
       name.in (),
       version.in (),
       original_type.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_alias (
-          id.in (),
-          name.in (),
-          version.in (),
-          original_type.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_interface_skel (
@@ -5041,15 +2780,7 @@ void POA_IR::Container::create_interface_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_interface (
       id.in (),
       name.in (),
       version.in (),
@@ -5058,68 +2789,15 @@ void POA_IR::Container::create_interface_skel (
       is_local,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_interface (
-          id.in (),
-          name.in (),
-          version.in (),
-          base_interfaces,
-          is_abstract,
-          is_local,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_value_skel (
@@ -5157,15 +2835,7 @@ void POA_IR::Container::create_value_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_value (
       id.in (),
       name.in (),
       version.in (),
@@ -5178,72 +2848,15 @@ void POA_IR::Container::create_value_skel (
       initializers,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_value (
-          id.in (),
-          name.in (),
-          version.in (),
-          is_custom,
-          is_abstract,
-          base_value.in (),
-          is_truncatable,
-          abstract_base_values,
-          supported_interfaces,
-          initializers,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_value_box_skel (
@@ -5269,81 +2882,22 @@ void POA_IR::Container::create_value_box_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_value_box (
       id.in (),
       name.in (),
       version.in (),
       original_type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_value_box (
-          id.in (),
-          name.in (),
-          version.in (),
-          original_type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_exception_skel (
@@ -5369,81 +2923,22 @@ void POA_IR::Container::create_exception_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_exception (
       id.in (),
       name.in (),
       version.in (),
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_exception (
-          id.in (),
-          name.in (),
-          version.in (),
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::create_native_skel (
@@ -5467,79 +2962,21 @@ void POA_IR::Container::create_native_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_native (
       id.in (),
       name.in (),
       version.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_native (
-          id.in (),
-          name.in (),
-          version.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Container::_is_a_skel (
@@ -5636,1614 +3073,6 @@ POA_IR::Container::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_Container::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::TAO_ServerRequestInfo_IR_Container_lookup (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * search_name,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    search_name_ (search_name)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_name = parameter_list->length ();
-  parameter_list->length (length_search_name + 1);
-  (*parameter_list)[length_search_name].argument <<= search_name_;
-  (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::result (IR::Contained_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::TAO_ServerRequestInfo_IR_Container_contents (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    IR_DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    limit_type_ (limit_type),
-    exclude_inherited_ (exclude_inherited)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
-  
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::result (IR::ContainedSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::TAO_ServerRequestInfo_IR_Container_lookup_name (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * search_name,
-    const CORBA::Long & levels_to_search,
-    IR_DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    search_name_ (search_name),
-    levels_to_search_ (levels_to_search),
-    limit_type_ (limit_type),
-    exclude_inherited_ (exclude_inherited)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_name = parameter_list->length ();
-  parameter_list->length (length_search_name + 1);
-  (*parameter_list)[length_search_name].argument <<= search_name_;
-  (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_levels_to_search = parameter_list->length ();
-  parameter_list->length (length_levels_to_search + 1);
-  (*parameter_list)[length_levels_to_search].argument <<= levels_to_search_;
-  (*parameter_list)[length_levels_to_search].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
-  
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup_name::result (IR::ContainedSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::TAO_ServerRequestInfo_IR_Container_describe_contents (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    IR_DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    const CORBA::Long & max_returned_objs,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    limit_type_ (limit_type),
-    exclude_inherited_ (exclude_inherited),
-    max_returned_objs_ (max_returned_objs)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
-  
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_max_returned_objs = parameter_list->length ();
-  parameter_list->length (length_max_returned_objs + 1);
-  (*parameter_list)[length_max_returned_objs].argument <<= max_returned_objs_;
-  (*parameter_list)[length_max_returned_objs].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::result (IR::Container::DescriptionSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::TAO_ServerRequestInfo_IR_Container_create_module (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_module::result (IR::ModuleDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::TAO_ServerRequestInfo_IR_Container_create_constant (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<= value_;
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_constant::result (IR::ConstantDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::TAO_ServerRequestInfo_IR_Container_create_struct (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_struct::result (IR::StructDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::TAO_ServerRequestInfo_IR_Container_create_union (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr discriminator_type,
-    const IR_UnionMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    discriminator_type_ (discriminator_type),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_discriminator_type = parameter_list->length ();
-  parameter_list->length (length_discriminator_type + 1);
-  (*parameter_list)[length_discriminator_type].argument <<=  this->discriminator_type_;
-  
-  (*parameter_list)[length_discriminator_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_union::result (IR::UnionDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::TAO_ServerRequestInfo_IR_Container_create_enum (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_EnumMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_enum::result (IR::EnumDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::TAO_ServerRequestInfo_IR_Container_create_alias (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr original_type,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    original_type_ (original_type)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_original_type = parameter_list->length ();
-  parameter_list->length (length_original_type + 1);
-  (*parameter_list)[length_original_type].argument <<=  this->original_type_;
-  
-  (*parameter_list)[length_original_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_alias::result (IR::AliasDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::TAO_ServerRequestInfo_IR_Container_create_interface (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_InterfaceDefSeq & base_interfaces,
-    const CORBA::Boolean & is_abstract,
-    const CORBA::Boolean & is_local,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    base_interfaces_ (base_interfaces),
-    is_abstract_ (is_abstract),
-    is_local_ (is_local)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_local = parameter_list->length ();
-  parameter_list->length (length_is_local + 1);
-  (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-  (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_interface::result (IR::InterfaceDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::TAO_ServerRequestInfo_IR_Container_create_value (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::Boolean & is_custom,
-    const CORBA::Boolean & is_abstract,
-    IR_ValueDef_ptr base_value,
-    const CORBA::Boolean & is_truncatable,
-    const IR_ValueDefSeq & abstract_base_values,
-    const IR_InterfaceDefSeq & supported_interfaces,
-    const IR_InitializerSeq & initializers,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    is_custom_ (is_custom),
-    is_abstract_ (is_abstract),
-    base_value_ (base_value),
-    is_truncatable_ (is_truncatable),
-    abstract_base_values_ (abstract_base_values),
-    supported_interfaces_ (supported_interfaces),
-    initializers_ (initializers)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_custom = parameter_list->length ();
-  parameter_list->length (length_is_custom + 1);
-  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_value = parameter_list->length ();
-  parameter_list->length (length_base_value + 1);
-  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
-  
-  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_truncatable = parameter_list->length ();
-  parameter_list->length (length_is_truncatable + 1);
-  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_abstract_base_values = parameter_list->length ();
-  parameter_list->length (length_abstract_base_values + 1);
-  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
-  
-  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_initializers = parameter_list->length ();
-  parameter_list->length (length_initializers + 1);
-  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
-  
-  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value::result (IR::ValueDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::TAO_ServerRequestInfo_IR_Container_create_value_box (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr original_type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    original_type_def_ (original_type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_value_box::result (IR::ValueBoxDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::TAO_ServerRequestInfo_IR_Container_create_exception (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_exception::result (IR::ExceptionDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::TAO_ServerRequestInfo_IR_Container_create_native (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Container *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Container::TAO_ServerRequestInfo_IR_Container_create_native::result (IR::NativeDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_IDLType_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -7465,6 +3294,9 @@ static int _TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::_TAO_IDLType_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::~_TAO_IDLType_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl::type (
@@ -7530,73 +3362,18 @@ void POA_IR::IDLType::_get_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::IDLType::_is_a_skel (
@@ -7693,84 +3470,6 @@ POA_IR::IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_IDLType::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::TAO_ServerRequestInfo_IR_IDLType_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::IDLType *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_Repository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -8037,6 +3736,9 @@ static int _TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::~_TAO_Repository_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 IR::Contained_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
@@ -8105,7 +3807,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_ty
       );
 }
 
-IR_PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
+IR::PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
     IR_PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
@@ -8138,7 +3840,7 @@ IR_PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
       );
 }
 
-IR_StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
+IR::StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -8171,7 +3873,7 @@ IR_StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
       );
 }
 
-IR_WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
+IR::WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -8204,7 +3906,7 @@ IR_WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
       );
 }
 
-IR_SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
+IR::SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     IR_IDLType_ptr element_type,
@@ -8239,7 +3941,7 @@ IR_SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
       );
 }
 
-IR_ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
+IR::ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
     IR_IDLType_ptr element_type,
@@ -8274,7 +3976,7 @@ IR_ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
       );
 }
 
-IR_FixedDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
+IR::FixedDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
     CORBA::Short scale,
@@ -8348,75 +4050,19 @@ void POA_IR::Repository::lookup_id_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->lookup_id (
       search_id.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->lookup_id (
-          search_id.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_Contained_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::get_canonical_typecode_skel (
@@ -8436,75 +4082,19 @@ void POA_IR::Repository::get_canonical_typecode_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->get_canonical_typecode (
       tc.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->get_canonical_typecode (
-          tc.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::get_primitive_skel (
@@ -8524,75 +4114,19 @@ void POA_IR::Repository::get_primitive_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->get_primitive (
       kind,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->get_primitive (
-          kind,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::create_string_skel (
@@ -8612,75 +4146,19 @@ void POA_IR::Repository::create_string_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_string (
       bound,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_string (
-          bound,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_StringDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::create_wstring_skel (
@@ -8700,75 +4178,19 @@ void POA_IR::Repository::create_wstring_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_wstring (
       bound,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_wstring (
-          bound,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::create_sequence_skel (
@@ -8790,77 +4212,20 @@ void POA_IR::Repository::create_sequence_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_sequence (
       bound,
       element_type.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_sequence (
-          bound,
-          element_type.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::create_array_skel (
@@ -8882,77 +4247,20 @@ void POA_IR::Repository::create_array_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array ri (
-      _tao_server_request,
-      _tao_impl,
+   _tao_retval = _tao_impl->create_array (
       length,
       element_type.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_array (
-          length,
-          element_type.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::create_fixed_skel (
@@ -8974,77 +4282,20 @@ void POA_IR::Repository::create_fixed_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_fixed (
       digits,
       scale,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_fixed (
-          digits,
-          scale,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::Repository::_is_a_skel (
@@ -9144,705 +4395,6 @@ POA_IR::Repository::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_Repository::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::TAO_ServerRequestInfo_IR_Repository_lookup_id (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    const char * search_id,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    search_id_ (search_id)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_id = parameter_list->length ();
-  parameter_list->length (length_search_id + 1);
-  (*parameter_list)[length_search_id].argument <<= search_id_;
-  (*parameter_list)[length_search_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::result (IR::Contained_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    tc_ (tc)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_tc = parameter_list->length ();
-  parameter_list->length (length_tc + 1);
-  (*parameter_list)[length_tc].argument <<= tc_;
-  (*parameter_list)[length_tc].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::TAO_ServerRequestInfo_IR_Repository_get_primitive (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    IR_PrimitiveKind & kind,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    kind_ (kind)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_kind = parameter_list->length ();
-  parameter_list->length (length_kind + 1);
-  (*parameter_list)[length_kind].argument <<=  this->kind_;
-  
-  (*parameter_list)[length_kind].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::result (IR::PrimitiveDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::TAO_ServerRequestInfo_IR_Repository_create_string (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_string::result (IR::StringDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::TAO_ServerRequestInfo_IR_Repository_create_wstring (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_wstring::result (IR::WstringDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::TAO_ServerRequestInfo_IR_Repository_create_sequence (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    const CORBA::ULong & bound,
-    IR_IDLType_ptr element_type,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    bound_ (bound),
-    element_type_ (element_type)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_element_type = parameter_list->length ();
-  parameter_list->length (length_element_type + 1);
-  (*parameter_list)[length_element_type].argument <<=  this->element_type_;
-  
-  (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_sequence::result (IR::SequenceDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::TAO_ServerRequestInfo_IR_Repository_create_array (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    const CORBA::ULong & length,
-    IR_IDLType_ptr element_type,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    length_ (length),
-    element_type_ (element_type)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_length = parameter_list->length ();
-  parameter_list->length (length_length + 1);
-  (*parameter_list)[length_length].argument <<= length_;
-  (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_element_type = parameter_list->length ();
-  parameter_list->length (length_element_type + 1);
-  (*parameter_list)[length_element_type].argument <<=  this->element_type_;
-  
-  (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_array::result (IR::ArrayDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::TAO_ServerRequestInfo_IR_Repository_create_fixed (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::Repository *tao_impl,
-    const CORBA::UShort & digits,
-    const CORBA::Short & scale,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    digits_ (digits),
-    scale_ (scale)
-{}
-
-Dynamic::ParameterList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_digits = parameter_list->length ();
-  parameter_list->length (length_digits + 1);
-  (*parameter_list)[length_digits].argument <<= digits_;
-  (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_scale = parameter_list->length ();
-  parameter_list->length (length_scale + 1);
-  (*parameter_list)[length_scale].argument <<= scale_;
-  (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_create_fixed::result (IR::FixedDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ComponentRepository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -10109,9 +4661,12 @@ static int _TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarec
 POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_component (
+IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_component (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -10152,7 +4707,7 @@ IR_ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_
       );
 }
 
-IR_HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home (
+IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -10243,15 +4798,7 @@ void POA_IR::ComponentRepository::create_component_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_component (
       id.in (),
       name.in (),
       version.in (),
@@ -10259,67 +4806,15 @@ void POA_IR::ComponentRepository::create_component_skel (
       supports_interfaces,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_component (
-          id.in (),
-          name.in (),
-          version.in (),
-          base_component.in (),
-          supports_interfaces,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentRepository::create_home_skel (
@@ -10349,15 +4844,7 @@ void POA_IR::ComponentRepository::create_home_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_home (
       id.in (),
       name.in (),
       version.in (),
@@ -10366,68 +4853,15 @@ void POA_IR::ComponentRepository::create_home_skel (
       primary_key.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_home (
-          id.in (),
-          name.in (),
-          version.in (),
-          base_home.in (),
-          managed_component.in (),
-          primary_key.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentRepository::_is_a_skel (
@@ -10530,245 +4964,6 @@ POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ComponentRepository::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequestInfo_IR_ComponentRepository_create_component (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentRepository *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ComponentDef_ptr base_component,
-    const IR_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    base_component_ (base_component),
-    supports_interfaces_ (supports_interfaces)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_component = parameter_list->length ();
-  parameter_list->length (length_base_component + 1);
-  (*parameter_list)[length_base_component].argument <<=  this->base_component_;
-  
-  (*parameter_list)[length_base_component].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_supports_interfaces = parameter_list->length ();
-  parameter_list->length (length_supports_interfaces + 1);
-  (*parameter_list)[length_supports_interfaces].argument <<=  this->supports_interfaces_;
-  
-  (*parameter_list)[length_supports_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_IR_ComponentRepository_create_home (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentRepository *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_HomeDef_ptr base_home,
-    IR_ComponentDef_ptr managed_component,
-    IR_ValueDef_ptr primary_key,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    base_home_ (base_home),
-    managed_component_ (managed_component),
-    primary_key_ (primary_key)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_home = parameter_list->length ();
-  parameter_list->length (length_base_home + 1);
-  (*parameter_list)[length_base_home].argument <<=  this->base_home_;
-  
-  (*parameter_list)[length_base_home].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_managed_component = parameter_list->length ();
-  parameter_list->length (length_managed_component + 1);
-  (*parameter_list)[length_managed_component].argument <<=  this->managed_component_;
-  
-  (*parameter_list)[length_managed_component].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_primary_key = parameter_list->length ();
-  parameter_list->length (length_primary_key + 1);
-  (*parameter_list)[length_primary_key].argument <<=  this->primary_key_;
-  
-  (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ModuleDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -11036,6 +5231,9 @@ static int _TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ModuleDef_ThruPOA_Proxy_Impl::~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -11161,9 +5359,6 @@ POA_IR::ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ModuleDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ConstantDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -11420,6 +5615,9 @@ static int _TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_TAO_ConstantDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type (
@@ -11453,7 +5651,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type (
       );
 }
 
-IR_IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
+IR::IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -11612,73 +5810,18 @@ void POA_IR::ConstantDef::_get_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ConstantDef::_get_type_def_skel (
@@ -11692,73 +5835,18 @@ void POA_IR::ConstantDef::_get_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ConstantDef::_set_type_def_skel (
@@ -11777,65 +5865,14 @@ void POA_IR::ConstantDef::_set_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->type_def (
       type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ConstantDef::_get_value_skel (
@@ -11849,73 +5886,18 @@ void POA_IR::ConstantDef::_get_value_skel (
 
   CORBA::Any_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->value (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->value (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Any * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ConstantDef::_set_value_skel (
@@ -11934,65 +5916,14 @@ void POA_IR::ConstantDef::_set_value_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->value (
       value,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->value (
-          value,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ConstantDef::_is_a_skel (
@@ -12092,381 +6023,6 @@ POA_IR::ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ConstantDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::TAO_ServerRequestInfo_IR_ConstantDef_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ConstantDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ConstantDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ConstantDef *tao_impl,
-    IR_IDLType_ptr type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    type_def_ (type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::TAO_ServerRequestInfo_IR_ConstantDef_value_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ConstantDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::TAO_ServerRequestInfo_IR_ConstantDef_value_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ConstantDef *tao_impl,
-    const CORBA::Any & value,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<= value_;
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_value_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_TypedefDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -12719,6 +6275,9 @@ static int _TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_TAO_TypedefDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl::~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -12844,9 +6403,6 @@ POA_IR::TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_TypedefDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_StructDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -13117,9 +6673,12 @@ static int _TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::_TAO_StructDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::~_TAO_StructDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_StructMemberSeq * POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
+IR::StructMemberSeq * POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13218,73 +6777,18 @@ void POA_IR::StructDef::_get_members_skel (
 
   IR_StructMemberSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->members (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->members (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::StructDef::_set_members_skel (
@@ -13303,65 +6807,14 @@ void POA_IR::StructDef::_set_members_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->members (
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->members (
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::StructDef::_is_a_skel (
@@ -13470,158 +6923,6 @@ POA_IR::StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_StructDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::TAO_ServerRequestInfo_IR_StructDef_members_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::StructDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::result (IR::StructMemberSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::TAO_ServerRequestInfo_IR_StructDef_members_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::StructDef *tao_impl,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_UnionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -13896,6 +7197,9 @@ static int _TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::_TAO_UnionDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::~_TAO_UnionDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
@@ -13929,7 +7233,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type
       );
 }
 
-IR_IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
+IR::IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13992,7 +7296,7 @@ void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
   return;
 }
 
-IR_UnionMemberSeq * POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
+IR::UnionMemberSeq * POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -14091,73 +7395,18 @@ void POA_IR::UnionDef::_get_discriminator_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get ri (
-      _tao_server_request,
-      _tao_impl ,
+  _tao_retval = _tao_impl->discriminator_type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->discriminator_type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::UnionDef::_get_discriminator_type_def_skel (
@@ -14171,73 +7420,18 @@ void POA_IR::UnionDef::_get_discriminator_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->discriminator_type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->discriminator_type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::UnionDef::_set_discriminator_type_def_skel (
@@ -14256,65 +7450,14 @@ void POA_IR::UnionDef::_set_discriminator_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->discriminator_type_def (
       discriminator_type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->discriminator_type_def (
-          discriminator_type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::UnionDef::_get_members_skel (
@@ -14328,73 +7471,18 @@ void POA_IR::UnionDef::_get_members_skel (
 
   IR_UnionMemberSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->members (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->members (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::UnionDef::_set_members_skel (
@@ -14413,65 +7501,14 @@ void POA_IR::UnionDef::_set_members_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->members (
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->members (
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::UnionDef::_is_a_skel (
@@ -14580,382 +7617,6 @@ POA_IR::UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_UnionDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::UnionDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::UnionDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::UnionDef *tao_impl,
-    IR_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    discriminator_type_def_ (discriminator_type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_discriminator_type_def = parameter_list->length ();
-  parameter_list->length (length_discriminator_type_def + 1);
-  (*parameter_list)[length_discriminator_type_def].argument <<=  this->discriminator_type_def_;
-  
-  (*parameter_list)[length_discriminator_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::TAO_ServerRequestInfo_IR_UnionDef_members_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::UnionDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_get::result (IR::UnionMemberSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::TAO_ServerRequestInfo_IR_UnionDef_members_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::UnionDef *tao_impl,
-    const IR_UnionMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_EnumDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -15210,6 +7871,9 @@ static int _TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::_TAO_EnumDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::~_TAO_EnumDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 IR::EnumMemberSeq * POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
@@ -15310,73 +7974,18 @@ void POA_IR::EnumDef::_get_members_skel (
 
   IR_EnumMemberSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->members (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->members (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::EnumDef::_set_members_skel (
@@ -15395,65 +8004,14 @@ void POA_IR::EnumDef::_set_members_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->members (
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->members (
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::EnumDef::_is_a_skel (
@@ -15559,158 +8117,6 @@ POA_IR::EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_EnumDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::TAO_ServerRequestInfo_IR_EnumDef_members_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::EnumDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::result (IR::EnumMemberSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::TAO_ServerRequestInfo_IR_EnumDef_members_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::EnumDef *tao_impl,
-    const IR_EnumMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_AliasDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -15965,9 +8371,12 @@ static int _TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::_TAO_AliasDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::~_TAO_AliasDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_IDLType_ptr POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
+IR::IDLType_ptr POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16065,73 +8474,18 @@ void POA_IR::AliasDef::_get_original_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->original_type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->original_type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::AliasDef::_set_original_type_def_skel (
@@ -16150,65 +8504,14 @@ void POA_IR::AliasDef::_set_original_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->original_type_def (
       original_type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->original_type_def (
-          original_type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::AliasDef::_is_a_skel (
@@ -16314,158 +8617,6 @@ POA_IR::AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_AliasDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::AliasDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::AliasDef *tao_impl,
-    IR_IDLType_ptr original_type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    original_type_def_ (original_type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_NativeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -16718,6 +8869,9 @@ static int _TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_NativeDef_ThruPOA_Proxy_Impl::_TAO_NativeDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_NativeDef_ThruPOA_Proxy_Impl::~_TAO_NativeDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -16847,9 +9001,6 @@ POA_IR::NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_NativeDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_PrimitiveDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -17072,9 +9223,12 @@ static int _TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_PrimitiveKind POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
+IR::PrimitiveKind POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -17138,72 +9292,18 @@ void POA_IR::PrimitiveDef::_get_kind_skel (
 
   IR_PrimitiveKind _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->kind (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->kind (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_PrimitiveKind _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::PrimitiveDef::_is_a_skel (
@@ -17303,84 +9403,6 @@ POA_IR::PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_PrimitiveDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::PrimitiveDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::result (IR::PrimitiveKind result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_StringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -17623,6 +9645,9 @@ static int _TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::_TAO_StringDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::~_TAO_StringDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
@@ -17721,72 +9746,18 @@ void POA_IR::StringDef::_get_bound_skel (
 
   CORBA::ULong _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->bound (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->bound (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ULong _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::StringDef::_set_bound_skel (
@@ -17805,65 +9776,14 @@ void POA_IR::StringDef::_set_bound_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->bound (
       bound,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::StringDef::_is_a_skel (
@@ -17963,157 +9883,6 @@ POA_IR::StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_StringDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::TAO_ServerRequestInfo_IR_StringDef_bound_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::StringDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::TAO_ServerRequestInfo_IR_StringDef_bound_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::StringDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_WstringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -18356,6 +10125,9 @@ static int _TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::_TAO_WstringDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::~_TAO_WstringDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
@@ -18454,72 +10226,18 @@ void POA_IR::WstringDef::_get_bound_skel (
 
   CORBA::ULong _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->bound (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->bound (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ULong _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::WstringDef::_set_bound_skel (
@@ -18538,65 +10256,14 @@ void POA_IR::WstringDef::_set_bound_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->bound (
       bound,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::WstringDef::_is_a_skel (
@@ -18696,157 +10363,6 @@ POA_IR::WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_WstringDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::TAO_ServerRequestInfo_IR_WstringDef_bound_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::WstringDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::TAO_ServerRequestInfo_IR_WstringDef_bound_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::WstringDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_FixedDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -19091,6 +10607,9 @@ static int _TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::_TAO_FixedDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::~_TAO_FixedDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::UShort POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
@@ -19252,72 +10771,18 @@ void POA_IR::FixedDef::_get_digits_skel (
 
   CORBA::UShort _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->digits (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->digits (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::UShort _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::FixedDef::_set_digits_skel (
@@ -19336,65 +10801,14 @@ void POA_IR::FixedDef::_set_digits_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->digits (
       digits,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->digits (
-          digits,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::FixedDef::_get_scale_skel (
@@ -19408,72 +10822,18 @@ void POA_IR::FixedDef::_get_scale_skel (
 
   CORBA::Short _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->scale (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->scale (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Short _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::FixedDef::_set_scale_skel (
@@ -19492,65 +10852,14 @@ void POA_IR::FixedDef::_set_scale_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->scale (
       scale,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->scale (
-          scale,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::FixedDef::_is_a_skel (
@@ -19650,305 +10959,6 @@ POA_IR::FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_FixedDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::TAO_ServerRequestInfo_IR_FixedDef_digits_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::FixedDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::TAO_ServerRequestInfo_IR_FixedDef_digits_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::FixedDef *tao_impl,
-    const CORBA::UShort & digits,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    digits_ (digits)
-{}
-
-Dynamic::ParameterList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_digits = parameter_list->length ();
-  parameter_list->length (length_digits + 1);
-  (*parameter_list)[length_digits].argument <<= digits_;
-  (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::TAO_ServerRequestInfo_IR_FixedDef_scale_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::FixedDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::TAO_ServerRequestInfo_IR_FixedDef_scale_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::FixedDef *tao_impl,
-    const CORBA::Short & scale,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    scale_ (scale)
-{}
-
-Dynamic::ParameterList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_scale = parameter_list->length ();
-  parameter_list->length (length_scale + 1);
-  (*parameter_list)[length_scale].argument <<= scale_;
-  (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_scale_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_SequenceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -20194,6 +11204,9 @@ static int _TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_TAO_SequenceDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
@@ -20290,7 +11303,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type (
       );
 }
 
-IR_IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
+IR::IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -20386,72 +11399,18 @@ void POA_IR::SequenceDef::_get_bound_skel (
 
   CORBA::ULong _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->bound (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->bound (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ULong _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::SequenceDef::_set_bound_skel (
@@ -20470,65 +11429,14 @@ void POA_IR::SequenceDef::_set_bound_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->bound (
       bound,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::SequenceDef::_get_element_type_skel (
@@ -20542,73 +11450,18 @@ void POA_IR::SequenceDef::_get_element_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->element_type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->element_type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::SequenceDef::_get_element_type_def_skel (
@@ -20622,73 +11475,18 @@ void POA_IR::SequenceDef::_get_element_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->element_type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->element_type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::SequenceDef::_set_element_type_def_skel (
@@ -20707,65 +11505,14 @@ void POA_IR::SequenceDef::_set_element_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->element_type_def (
       element_type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->element_type_def (
-          element_type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::SequenceDef::_is_a_skel (
@@ -20865,381 +11612,6 @@ POA_IR::SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_SequenceDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::TAO_ServerRequestInfo_IR_SequenceDef_bound_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::SequenceDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::TAO_ServerRequestInfo_IR_SequenceDef_bound_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::SequenceDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::SequenceDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::SequenceDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::SequenceDef *tao_impl,
-    IR_IDLType_ptr element_type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    element_type_def_ (element_type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_element_type_def = parameter_list->length ();
-  parameter_list->length (length_element_type_def + 1);
-  (*parameter_list)[length_element_type_def].argument <<=  this->element_type_def_;
-  
-  (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ArrayDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -21485,6 +11857,9 @@ static int _TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_TAO_ArrayDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
@@ -21581,7 +11956,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type (
       );
 }
 
-IR_IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
+IR::IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21677,72 +12052,18 @@ void POA_IR::ArrayDef::_get_length_skel (
 
   CORBA::ULong _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->length (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->length (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ULong _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ArrayDef::_set_length_skel (
@@ -21761,65 +12082,14 @@ void POA_IR::ArrayDef::_set_length_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->length (
       length,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->length (
-          length,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ArrayDef::_get_element_type_skel (
@@ -21833,73 +12103,18 @@ void POA_IR::ArrayDef::_get_element_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->element_type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->element_type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ArrayDef::_get_element_type_def_skel (
@@ -21913,73 +12128,18 @@ void POA_IR::ArrayDef::_get_element_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->element_type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->element_type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ArrayDef::_set_element_type_def_skel (
@@ -21998,65 +12158,14 @@ void POA_IR::ArrayDef::_set_element_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->element_type_def (
       element_type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->element_type_def (
-          element_type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ArrayDef::_is_a_skel (
@@ -22156,381 +12265,6 @@ POA_IR::ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ArrayDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::TAO_ServerRequestInfo_IR_ArrayDef_length_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ArrayDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::result (CORBA::ULong result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::TAO_ServerRequestInfo_IR_ArrayDef_length_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ArrayDef *tao_impl,
-    const CORBA::ULong & length,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    length_ (length)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_length = parameter_list->length ();
-  parameter_list->length (length_length + 1);
-  (*parameter_list)[length_length].argument <<= length_;
-  (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ArrayDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ArrayDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ArrayDef *tao_impl,
-    IR_IDLType_ptr element_type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    element_type_def_ (element_type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_element_type_def = parameter_list->length ();
-  parameter_list->length (length_element_type_def + 1);
-  (*parameter_list)[length_element_type_def].argument <<=  this->element_type_def_;
-  
-  (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ExceptionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -22801,6 +12535,9 @@ static int _TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::type (
@@ -22834,7 +12571,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::type (
       );
 }
 
-IR_StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
+IR::StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22931,73 +12668,18 @@ void POA_IR::ExceptionDef::_get_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ExceptionDef::_get_members_skel (
@@ -23011,73 +12693,18 @@ void POA_IR::ExceptionDef::_get_members_skel (
 
   IR_StructMemberSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->members (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->members (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ExceptionDef::_set_members_skel (
@@ -23096,65 +12723,14 @@ void POA_IR::ExceptionDef::_set_members_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->members (
       members,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->members (
-          members,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ExceptionDef::_is_a_skel (
@@ -23240,233 +12816,6 @@ const char* POA_IR::ExceptionDef::_interface_repository_id (void) const
   return "IDL:omg.org/IR/ExceptionDef:1.0";
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::TAO_ServerRequestInfo_IR_ExceptionDef_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ExceptionDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::TAO_ServerRequestInfo_IR_ExceptionDef_members_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ExceptionDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_get::result (IR::StructMemberSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::TAO_ServerRequestInfo_IR_ExceptionDef_members_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ExceptionDef *tao_impl,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_AttributeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -23723,6 +13072,9 @@ static int _TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_TAO_AttributeDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type (
@@ -23756,7 +13108,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type (
       );
 }
 
-IR_IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
+IR::IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -23819,7 +13171,7 @@ void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
   return;
 }
 
-IR_AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
+IR::AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -23915,73 +13267,18 @@ void POA_IR::AttributeDef::_get_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::AttributeDef::_get_type_def_skel (
@@ -23995,73 +13292,18 @@ void POA_IR::AttributeDef::_get_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::AttributeDef::_set_type_def_skel (
@@ -24080,65 +13322,14 @@ void POA_IR::AttributeDef::_set_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->type_def (
       type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::AttributeDef::_get_mode_skel (
@@ -24152,72 +13343,18 @@ void POA_IR::AttributeDef::_get_mode_skel (
 
   IR_AttributeMode _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->mode (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->mode (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_AttributeMode _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::AttributeDef::_set_mode_skel (
@@ -24236,65 +13373,15 @@ void POA_IR::AttributeDef::_set_mode_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set ri (
-      _tao_server_request,
-      _tao_impl,
+
+  _tao_impl->mode (
       mode,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->mode (
-          mode,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::AttributeDef::_is_a_skel (
@@ -24394,382 +13481,6 @@ POA_IR::AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_AttributeDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::TAO_ServerRequestInfo_IR_AttributeDef_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::AttributeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::AttributeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::AttributeDef *tao_impl,
-    IR_IDLType_ptr type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    type_def_ (type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::TAO_ServerRequestInfo_IR_AttributeDef_mode_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::AttributeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_get::result (IR::AttributeMode result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::TAO_ServerRequestInfo_IR_AttributeDef_mode_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::AttributeDef *tao_impl,
-    IR_AttributeMode & mode,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    mode_ (mode)
-{}
-
-Dynamic::ParameterList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_OperationDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -25081,6 +13792,9 @@ static int _TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::_TAO_OperationDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::~_TAO_OperationDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result (
@@ -25114,7 +13828,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result (
       );
 }
 
-IR_IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
+IR::IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -25177,7 +13891,7 @@ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
   return;
 }
 
-IR_ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
+IR::ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -25240,7 +13954,7 @@ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
   return;
 }
 
-IR_OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
+IR::OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -25303,7 +14017,7 @@ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
   return;
 }
 
-IR_ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
+IR::ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -25366,7 +14080,7 @@ void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
   return;
 }
 
-IR_ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
+IR::ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -25462,73 +14176,18 @@ void POA_IR::OperationDef::_get_result_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->result (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->result (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::OperationDef::_get_result_def_skel (
@@ -25542,73 +14201,18 @@ void POA_IR::OperationDef::_get_result_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->result_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->result_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::OperationDef::_set_result_def_skel (
@@ -25627,65 +14231,14 @@ void POA_IR::OperationDef::_set_result_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->result_def (
       result_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->result_def (
-          result_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::OperationDef::_get_params_skel (
@@ -25699,73 +14252,18 @@ void POA_IR::OperationDef::_get_params_skel (
 
   IR_ParDescriptionSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get ri (
-      _tao_server_request,
-      _tao_impl ,
+  _tao_retval = _tao_impl->params (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->params (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::OperationDef::_set_params_skel (
@@ -25784,65 +14282,14 @@ void POA_IR::OperationDef::_set_params_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->params (
       params,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->params (
-          params,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::OperationDef::_get_mode_skel (
@@ -25856,72 +14303,18 @@ void POA_IR::OperationDef::_get_mode_skel (
 
   IR_OperationMode _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->mode (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->mode (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_OperationMode _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::OperationDef::_set_mode_skel (
@@ -25940,65 +14333,14 @@ void POA_IR::OperationDef::_set_mode_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->mode (
       mode,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->mode (
-          mode,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::OperationDef::_get_contexts_skel (
@@ -26012,73 +14354,18 @@ void POA_IR::OperationDef::_get_contexts_skel (
 
   IR_ContextIdSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->contexts (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->contexts (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::OperationDef::_set_contexts_skel (
@@ -26097,65 +14384,14 @@ void POA_IR::OperationDef::_set_contexts_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->contexts (
       contexts,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->contexts (
-          contexts,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::OperationDef::_get_exceptions_skel (
@@ -26169,73 +14405,18 @@ void POA_IR::OperationDef::_get_exceptions_skel (
 
   IR_ExceptionDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->exceptions (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->exceptions (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::OperationDef::_set_exceptions_skel (
@@ -26254,65 +14435,14 @@ void POA_IR::OperationDef::_set_exceptions_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->exceptions (
       exceptions,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->exceptions (
-          exceptions,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::OperationDef::_is_a_skel (
@@ -26412,829 +14542,6 @@ POA_IR::OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_OperationDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::TAO_ServerRequestInfo_IR_OperationDef_result_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::TAO_ServerRequestInfo_IR_OperationDef_result_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::TAO_ServerRequestInfo_IR_OperationDef_result_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    IR_IDLType_ptr result_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    result_def_ (result_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_result_def = parameter_list->length ();
-  parameter_list->length (length_result_def + 1);
-  (*parameter_list)[length_result_def].argument <<=  this->result_def_;
-  
-  (*parameter_list)[length_result_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::TAO_ServerRequestInfo_IR_OperationDef_params_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_get::result (IR::ParDescriptionSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::TAO_ServerRequestInfo_IR_OperationDef_params_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    const IR_ParDescriptionSeq & params,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    params_ (params)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::TAO_ServerRequestInfo_IR_OperationDef_mode_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_get::result (IR::OperationMode result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::TAO_ServerRequestInfo_IR_OperationDef_mode_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    IR_OperationMode & mode,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    mode_ (mode)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::TAO_ServerRequestInfo_IR_OperationDef_contexts_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_get::result (IR::ContextIdSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::TAO_ServerRequestInfo_IR_OperationDef_contexts_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    const IR_ContextIdSeq & contexts,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    contexts_ (contexts)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_get::result (IR::ExceptionDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::OperationDef *tao_impl,
-    const IR_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    exceptions_ (exceptions)
-{}
-
-Dynamic::ParameterList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_InterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -27513,9 +14820,12 @@ static int _TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
+IR::InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -27737,7 +15047,7 @@ CORBA::Boolean POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-IR_AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
+IR::AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -27782,7 +15092,7 @@ IR_AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribu
       );
 }
 
-IR_OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
+IR::OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -27864,73 +15174,18 @@ void POA_IR::InterfaceDef::_get_base_interfaces_skel (
 
   IR_InterfaceDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->base_interfaces (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->base_interfaces (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::InterfaceDef::_set_base_interfaces_skel (
@@ -27949,65 +15204,14 @@ void POA_IR::InterfaceDef::_set_base_interfaces_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->base_interfaces (
       base_interfaces,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->base_interfaces (
-          base_interfaces,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::InterfaceDef::_get_is_abstract_skel (
@@ -28021,72 +15225,18 @@ void POA_IR::InterfaceDef::_get_is_abstract_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_abstract (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_abstract (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::InterfaceDef::_set_is_abstract_skel (
@@ -28105,65 +15255,14 @@ void POA_IR::InterfaceDef::_set_is_abstract_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->is_abstract (
       is_abstract,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->is_abstract (
-          is_abstract,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::InterfaceDef::_get_is_local_skel (
@@ -28177,72 +15276,18 @@ void POA_IR::InterfaceDef::_get_is_local_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_local (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_local (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::InterfaceDef::_set_is_local_skel (
@@ -28261,65 +15306,14 @@ void POA_IR::InterfaceDef::_set_is_local_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->is_local (
       is_local,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->is_local (
-          is_local,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::InterfaceDef::is_a_skel (
@@ -28339,74 +15333,19 @@ void POA_IR::InterfaceDef::is_a_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_a (
       interface_id.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_a (
-          interface_id.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::InterfaceDef::create_attribute_skel (
@@ -28438,15 +15377,7 @@ void POA_IR::InterfaceDef::create_attribute_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_attribute (
       id.in (),
       name.in (),
       version.in (),
@@ -28456,69 +15387,15 @@ void POA_IR::InterfaceDef::create_attribute_skel (
       put_exceptions,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_attribute (
-          id.in (),
-          name.in (),
-          version.in (),
-          type.in (),
-          mode,
-          get_exceptions,
-          put_exceptions,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::InterfaceDef::create_operation_skel (
@@ -28552,15 +15429,7 @@ void POA_IR::InterfaceDef::create_operation_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_operation (
       id.in (),
       name.in (),
       version.in (),
@@ -28571,70 +15440,15 @@ void POA_IR::InterfaceDef::create_operation_skel (
       contexts,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_operation (
-          id.in (),
-          name.in (),
-          version.in (),
-          result.in (),
-          mode,
-          params,
-          exceptions,
-          contexts,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::InterfaceDef::_is_a_skel (
@@ -28740,806 +15554,6 @@ POA_IR::InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_InterfaceDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::result (IR::InterfaceDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    const IR_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    base_interfaces_ (base_interfaces)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    is_abstract_ (is_abstract)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    const CORBA::Boolean & is_local,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    is_local_ (is_local)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_local = parameter_list->length ();
-  parameter_list->length (length_is_local + 1);
-  (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-  (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::TAO_ServerRequestInfo_IR_InterfaceDef_is_a (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    const char * interface_id,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    interface_id_ (interface_id)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_interface_id = parameter_list->length ();
-  parameter_list->length (length_interface_id + 1);
-  (*parameter_list)[length_interface_id].argument <<= interface_id_;
-  (*parameter_list)[length_interface_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    IR_AttributeMode & mode,
-    const IR_ExceptionDefSeq & get_exceptions,
-    const IR_ExceptionDefSeq & put_exceptions,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    mode_ (mode),
-    get_exceptions_ (get_exceptions),
-    put_exceptions_ (put_exceptions)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_get_exceptions = parameter_list->length ();
-  parameter_list->length (length_get_exceptions + 1);
-  (*parameter_list)[length_get_exceptions].argument <<=  this->get_exceptions_;
-  
-  (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_put_exceptions = parameter_list->length ();
-  parameter_list->length (length_put_exceptions + 1);
-  (*parameter_list)[length_put_exceptions].argument <<=  this->put_exceptions_;
-  
-  (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute::result (IR::AttributeDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::InterfaceDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr result,
-    IR_OperationMode & mode,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    const IR_ContextIdSeq & contexts,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    result_ (result),
-    mode_ (mode),
-    params_ (params),
-    exceptions_ (exceptions),
-    contexts_ (contexts)
-{}
-
-Dynamic::ParameterList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_result = parameter_list->length ();
-  parameter_list->length (length_result + 1);
-  (*parameter_list)[length_result].argument <<=  this->result_;
-  
-  (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_create_operation::result (IR::OperationDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ValueMemberDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -29796,6 +15810,9 @@ static int _TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type (
@@ -29829,7 +15846,7 @@ CORBA::TypeCode_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type (
       );
 }
 
-IR_IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
+IR::IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -29988,73 +16005,18 @@ void POA_IR::ValueMemberDef::_get_type_skel (
 
   CORBA::TypeCode_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::TypeCode_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueMemberDef::_get_type_def_skel (
@@ -30068,73 +16030,18 @@ void POA_IR::ValueMemberDef::_get_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueMemberDef::_set_type_def_skel (
@@ -30153,65 +16060,14 @@ void POA_IR::ValueMemberDef::_set_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->type_def (
       type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueMemberDef::_get_access_skel (
@@ -30225,72 +16081,18 @@ void POA_IR::ValueMemberDef::_get_access_skel (
 
   CORBA::Visibility _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->access (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->access (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Visibility _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval)
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueMemberDef::_set_access_skel (
@@ -30309,65 +16111,14 @@ void POA_IR::ValueMemberDef::_set_access_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set ri (
-      _tao_server_request,
-      _tao_impl ,
+  _tao_impl->access (
       access,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->access (
-          access,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueMemberDef::_is_a_skel (
@@ -30467,381 +16218,6 @@ POA_IR::ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ValueMemberDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueMemberDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueMemberDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueMemberDef *tao_impl,
-    IR_IDLType_ptr type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    type_def_ (type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueMemberDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Visibility result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueMemberDef *tao_impl,
-    const CORBA::Visibility & access,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    access_ (access)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_access = parameter_list->length ();
-  parameter_list->length (length_access + 1);
-  (*parameter_list)[length_access].argument <<= access_;
-  (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_access_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ValueDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -31131,9 +16507,12 @@ static int _TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::_TAO_ValueDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::~_TAO_ValueDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
+IR::InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -31196,7 +16575,7 @@ void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
   return;
 }
 
-IR_InitializerSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
+IR::InitializerSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -31259,7 +16638,7 @@ void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
   return;
 }
 
-IR_ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
+IR::ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -31322,7 +16701,7 @@ void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
   return;
 }
 
-IR_ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
+IR::ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -31607,7 +16986,7 @@ CORBA::Boolean POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-IR_ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
+IR::ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -31648,7 +17027,7 @@ IR_ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_mem
       );
 }
 
-IR_AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
+IR::AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -31693,7 +17072,7 @@ IR_AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
       );
 }
 
-IR_OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
+IR::OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -31775,73 +17154,18 @@ void POA_IR::ValueDef::_get_supported_interfaces_skel (
 
   IR_InterfaceDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->supported_interfaces (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->supported_interfaces (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_set_supported_interfaces_skel (
@@ -31860,65 +17184,14 @@ void POA_IR::ValueDef::_set_supported_interfaces_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->supported_interfaces (
       supported_interfaces,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->supported_interfaces (
-          supported_interfaces,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueDef::_get_initializers_skel (
@@ -31932,73 +17205,18 @@ void POA_IR::ValueDef::_get_initializers_skel (
 
   IR_InitializerSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->initializers (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->initializers (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_InitializerSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_set_initializers_skel (
@@ -32017,65 +17235,14 @@ void POA_IR::ValueDef::_set_initializers_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->initializers (
       initializers,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->initializers (
-          initializers,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueDef::_get_base_value_skel (
@@ -32089,73 +17256,18 @@ void POA_IR::ValueDef::_get_base_value_skel (
 
   IR_ValueDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->base_value (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->base_value (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_set_base_value_skel (
@@ -32174,65 +17286,14 @@ void POA_IR::ValueDef::_set_base_value_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->base_value (
       base_value.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->base_value (
-          base_value.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueDef::_get_abstract_base_values_skel (
@@ -32246,73 +17307,18 @@ void POA_IR::ValueDef::_get_abstract_base_values_skel (
 
   IR_ValueDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->abstract_base_values (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->abstract_base_values (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_set_abstract_base_values_skel (
@@ -32331,65 +17337,14 @@ void POA_IR::ValueDef::_set_abstract_base_values_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->abstract_base_values (
       abstract_base_values,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->abstract_base_values (
-          abstract_base_values,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueDef::_get_is_abstract_skel (
@@ -32403,72 +17358,18 @@ void POA_IR::ValueDef::_get_is_abstract_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_abstract (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_abstract (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_set_is_abstract_skel (
@@ -32487,65 +17388,14 @@ void POA_IR::ValueDef::_set_is_abstract_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->is_abstract (
       is_abstract,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->is_abstract (
-          is_abstract,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueDef::_get_is_custom_skel (
@@ -32559,72 +17409,18 @@ void POA_IR::ValueDef::_get_is_custom_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_custom (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_custom (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_set_is_custom_skel (
@@ -32643,65 +17439,14 @@ void POA_IR::ValueDef::_set_is_custom_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->is_custom (
       is_custom,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->is_custom (
-          is_custom,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueDef::_get_is_truncatable_skel (
@@ -32715,72 +17460,18 @@ void POA_IR::ValueDef::_get_is_truncatable_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_truncatable (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_truncatable (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_set_is_truncatable_skel (
@@ -32799,65 +17490,14 @@ void POA_IR::ValueDef::_set_is_truncatable_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->is_truncatable (
       is_truncatable,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->is_truncatable (
-          is_truncatable,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueDef::is_a_skel (
@@ -32877,74 +17517,19 @@ void POA_IR::ValueDef::is_a_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_a (
       id.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_a (
-          id.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::create_value_member_skel (
@@ -32972,15 +17557,7 @@ void POA_IR::ValueDef::create_value_member_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_value_member (
       id.in (),
       name.in (),
       version.in (),
@@ -32988,67 +17565,15 @@ void POA_IR::ValueDef::create_value_member_skel (
       access,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_value_member (
-          id.in (),
-          name.in (),
-          version.in (),
-          type.in (),
-          access,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::create_attribute_skel (
@@ -33080,15 +17605,7 @@ void POA_IR::ValueDef::create_attribute_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_attribute (
       id.in (),
       name.in (),
       version.in (),
@@ -33098,69 +17615,15 @@ void POA_IR::ValueDef::create_attribute_skel (
       put_exceptions,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_attribute (
-          id.in (),
-          name.in (),
-          version.in (),
-          type.in (),
-          mode,
-          get_exceptions,
-          put_exceptions,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::create_operation_skel (
@@ -33194,15 +17657,7 @@ void POA_IR::ValueDef::create_operation_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_operation (
       id.in (),
       name.in (),
       version.in (),
@@ -33213,70 +17668,15 @@ void POA_IR::ValueDef::create_operation_skel (
       contexts,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_operation (
-          id.in (),
-          name.in (),
-          version.in (),
-          result.in (),
-          mode,
-          params,
-          exceptions,
-          contexts,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueDef::_is_a_skel (
@@ -33382,1514 +17782,6 @@ POA_IR::ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ValueDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const IR_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    supported_interfaces_ (supported_interfaces)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::TAO_ServerRequestInfo_IR_ValueDef_initializers_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_get::result (IR::InitializerSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::TAO_ServerRequestInfo_IR_ValueDef_initializers_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const IR_InitializerSeq & initializers,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    initializers_ (initializers)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_initializers = parameter_list->length ();
-  parameter_list->length (length_initializers + 1);
-  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
-  
-  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::TAO_ServerRequestInfo_IR_ValueDef_base_value_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_get::result (IR::ValueDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::TAO_ServerRequestInfo_IR_ValueDef_base_value_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl ,
-    IR_ValueDef_ptr base_value,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    base_value_ (base_value)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_base_value = parameter_list->length ();
-  parameter_list->length (length_base_value + 1);
-  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
-  
-  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR::ValueDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const IR_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    abstract_base_values_ (abstract_base_values)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_abstract_base_values = parameter_list->length ();
-  parameter_list->length (length_abstract_base_values + 1);
-  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
-  
-  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    is_abstract_ (is_abstract)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const CORBA::Boolean & is_custom,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    is_custom_ (is_custom)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_custom = parameter_list->length ();
-  parameter_list->length (length_is_custom + 1);
-  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_custom_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    is_truncatable_ (is_truncatable)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_truncatable = parameter_list->length ();
-  parameter_list->length (length_is_truncatable + 1);
-  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::TAO_ServerRequestInfo_IR_ValueDef_is_a (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const char * id,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::TAO_ServerRequestInfo_IR_ValueDef_create_value_member (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    const CORBA::Visibility & access,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    access_ (access)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_access = parameter_list->length ();
-  parameter_list->length (length_access + 1);
-  (*parameter_list)[length_access].argument <<= access_;
-  (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_value_member::result (IR::ValueMemberDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::TAO_ServerRequestInfo_IR_ValueDef_create_attribute (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    IR_AttributeMode & mode,
-    const IR_ExceptionDefSeq & get_exceptions,
-    const IR_ExceptionDefSeq & put_exceptions,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    mode_ (mode),
-    get_exceptions_ (get_exceptions),
-    put_exceptions_ (put_exceptions)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_get_exceptions = parameter_list->length ();
-  parameter_list->length (length_get_exceptions + 1);
-  (*parameter_list)[length_get_exceptions].argument <<=  this->get_exceptions_;
-  
-  (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_put_exceptions = parameter_list->length ();
-  parameter_list->length (length_put_exceptions + 1);
-  (*parameter_list)[length_put_exceptions].argument <<=  this->put_exceptions_;
-  
-  (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_attribute::result (IR::AttributeDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::TAO_ServerRequestInfo_IR_ValueDef_create_operation (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr result,
-    IR_OperationMode & mode,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    const IR_ContextIdSeq & contexts,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    result_ (result),
-    mode_ (mode),
-    params_ (params),
-    exceptions_ (exceptions),
-    contexts_ (contexts)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_result = parameter_list->length ();
-  parameter_list->length (length_result + 1);
-  (*parameter_list)[length_result].argument <<=  this->result_;
-  
-  (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_create_operation::result (IR::OperationDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ValueBoxDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -35144,9 +18036,12 @@ static int _TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
+IR::IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -35244,73 +18139,18 @@ void POA_IR::ValueBoxDef::_get_original_type_def_skel (
 
   IR_IDLType_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->original_type_def (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->original_type_def (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ValueBoxDef::_set_original_type_def_skel (
@@ -35329,65 +18169,14 @@ void POA_IR::ValueBoxDef::_set_original_type_def_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->original_type_def (
       original_type_def.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->original_type_def (
-          original_type_def.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ValueBoxDef::_is_a_skel (
@@ -35493,158 +18282,6 @@ POA_IR::ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ValueBoxDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueBoxDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR::IDLType_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ValueBoxDef *tao_impl,
-    IR_IDLType_ptr original_type_def,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    original_type_def_ (original_type_def)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ProvidesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -35897,9 +18534,12 @@ static int _TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
+IR::InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -35963,73 +18603,18 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
 
   IR_InterfaceDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->interface_type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->interface_type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ProvidesDef::_is_a_skel (
@@ -36129,84 +18714,6 @@ POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ProvidesDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ProvidesDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_UsesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -36460,9 +18967,12 @@ static int _TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::~_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
+IR::InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -36557,73 +19067,18 @@ void POA_IR::UsesDef::_get_interface_type_skel (
 
   IR_InterfaceDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->interface_type (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->interface_type (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::UsesDef::_get_is_multiple_skel (
@@ -36637,72 +19092,18 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_multiple (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_multiple (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::UsesDef::_is_a_skel (
@@ -36802,159 +19203,6 @@ POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_UsesDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::UsesDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::UsesDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_EventDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -37208,6 +19456,9 @@ static int _TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::~_TAO_EventDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
@@ -37243,7 +19494,7 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-IR_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
+IR::ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -37313,74 +19564,19 @@ void POA_IR::EventDef::is_a_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_a (
       event_id.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_a (
-          event_id.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::EventDef::_get_event_skel (
@@ -37394,73 +19590,18 @@ void POA_IR::EventDef::_get_event_skel (
 
   IR_ValueDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->event (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->event (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::EventDef::_is_a_skel (
@@ -37560,168 +19701,6 @@ POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_EventDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::EventDef *tao_impl,
-    const char * event_id,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    event_id_ (event_id)
-{}
-
-Dynamic::ParameterList *
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_event_id = parameter_list->length ();
-  parameter_list->length (length_event_id + 1);
-  (*parameter_list)[length_event_id].argument <<= event_id_;
-  (*parameter_list)[length_event_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_event_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::EventDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_event_get::result (IR::ValueDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_EmitsDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -37975,6 +19954,9 @@ static int _TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::_TAO_EmitsDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl::~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -38100,9 +20082,6 @@ POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_EmitsDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_PublishesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -38356,6 +20335,9 @@ static int _TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::_TAO_PublishesDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl::~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -38481,9 +20463,6 @@ POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_PublishesDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ConsumesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -38737,6 +20716,9 @@ static int _TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl::~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -38862,9 +20844,6 @@ POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ConsumesDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_ComponentDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -39158,9 +21137,12 @@ static int _TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
+IR::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -39223,7 +21205,7 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
   return;
 }
 
-IR_ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
+IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -39254,7 +21236,7 @@ IR_ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component
       );
 }
 
-IR_ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
+IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -39285,7 +21267,7 @@ IR_ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inter
       );
 }
 
-IR_UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
+IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -39316,7 +21298,7 @@ IR_UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
       );
 }
 
-IR_EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
+IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -39347,7 +21329,7 @@ IR_EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
       );
 }
 
-IR_PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
+IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -39378,7 +21360,7 @@ IR_PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_eve
       );
 }
 
-IR_ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
+IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -39440,7 +21422,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
       );
 }
 
-IR_ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
+IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -39479,7 +21461,7 @@ IR_ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides
       );
 }
 
-IR_UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
+IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -39520,7 +21502,7 @@ IR_UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
       );
 }
 
-IR_EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
+IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -39559,7 +21541,7 @@ IR_EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
       );
 }
 
-IR_PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
+IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -39598,7 +21580,7 @@ IR_PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publish
       );
 }
 
-IR_ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
+IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -39673,73 +21655,18 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
 
   IR_InterfaceDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->supported_interfaces (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->supported_interfaces (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_set_supported_interfaces_skel (
@@ -39758,65 +21685,14 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_impl->supported_interfaces (
       supported_interfaces,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      _tao_impl->supported_interfaces (
-          supported_interfaces,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_base_component_skel (
@@ -39830,73 +21706,18 @@ void POA_IR::ComponentDef::_get_base_component_skel (
 
   IR_ComponentDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->base_component (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->base_component (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_get_provides_interfaces_skel (
@@ -39910,73 +21731,18 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
 
   IR_ProvidesDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->provides_interfaces (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->provides_interfaces (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ProvidesDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_get_uses_interfaces_skel (
@@ -39990,73 +21756,18 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
 
   IR_UsesDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->uses_interfaces (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->uses_interfaces (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_UsesDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_get_emits_events_skel (
@@ -40070,73 +21781,18 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
 
   IR_EmitsDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->emits_events (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->emits_events (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_EmitsDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_get_publishes_events_skel (
@@ -40150,73 +21806,18 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
 
   IR_PublishesDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->publishes_events (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->publishes_events (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_PublishesDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_get_consumes_events_skel (
@@ -40230,73 +21831,18 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
 
   IR_ConsumesDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->consumes_events (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->consumes_events (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ConsumesDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_get_is_basic_skel (
@@ -40310,72 +21856,18 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_basic (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_basic (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::create_provides_skel (
@@ -40401,81 +21893,22 @@ void POA_IR::ComponentDef::create_provides_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_provides (
       id.in (),
       name.in (),
       version.in (),
       interface_type.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_provides (
-          id.in (),
-          name.in (),
-          version.in (),
-          interface_type.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ProvidesDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::create_uses_skel (
@@ -40503,15 +21936,7 @@ void POA_IR::ComponentDef::create_uses_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_uses (
       id.in (),
       name.in (),
       version.in (),
@@ -40519,67 +21944,15 @@ void POA_IR::ComponentDef::create_uses_skel (
       is_multiple,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_uses (
-          id.in (),
-          name.in (),
-          version.in (),
-          interface_type.in (),
-          is_multiple,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_UsesDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::create_emits_skel (
@@ -40605,81 +21978,22 @@ void POA_IR::ComponentDef::create_emits_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_emits (
       id.in (),
       name.in (),
       version.in (),
       value.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_emits (
-          id.in (),
-          name.in (),
-          version.in (),
-          value.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_EmitsDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::create_publishes_skel (
@@ -40705,81 +22019,22 @@ void POA_IR::ComponentDef::create_publishes_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_publishes (
       id.in (),
       name.in (),
       version.in (),
       value.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_publishes (
-          id.in (),
-          name.in (),
-          version.in (),
-          value.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_PublishesDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  _tao_server_request.init_reply ();
-  
+
+ _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::create_consumes_skel (
@@ -40805,81 +22060,22 @@ void POA_IR::ComponentDef::create_consumes_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_consumes (
       id.in (),
       name.in (),
       version.in (),
       value.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_consumes (
-          id.in (),
-          name.in (),
-          version.in (),
-          value.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ConsumesDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::ComponentDef::_is_a_skel (
@@ -40988,1220 +22184,6 @@ POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_ComponentDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    const IR_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    supported_interfaces_ (supported_interfaces)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_ComponentDef_create_provides (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_InterfaceDef_ptr interface_type,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    interface_type_ (interface_type)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_interface_type = parameter_list->length ();
-  parameter_list->length (length_interface_type + 1);
-  (*parameter_list)[length_interface_type].argument <<=  this->interface_type_;
-  
-  (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_ComponentDef_create_uses (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_InterfaceDef_ptr interface_type,
-    const CORBA::Boolean & is_multiple,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    interface_type_ (interface_type),
-    is_multiple_ (is_multiple)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_interface_type = parameter_list->length ();
-  parameter_list->length (length_interface_type + 1);
-  (*parameter_list)[length_interface_type].argument <<=  this->interface_type_;
-  
-  (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_multiple = parameter_list->length ();
-  parameter_list->length (length_is_multiple + 1);
-  (*parameter_list)[length_is_multiple].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
-  (*parameter_list)[length_is_multiple].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_ComponentDef_create_emits (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr value,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr value,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::ComponentDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr value,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -42455,6 +22437,9 @@ static int _TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
@@ -42490,7 +22475,7 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-IR_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
+IR::ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -42560,74 +22545,19 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_a (
       primary_key_id.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_a (
-          primary_key_id.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
@@ -42641,73 +22571,18 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
 
   IR_ValueDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->primary_key (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->primary_key (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::PrimaryKeyDef::_is_a_skel (
@@ -42807,168 +22682,6 @@ POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_PrimaryKeyDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::PrimaryKeyDef *tao_impl,
-    const char * primary_key_id,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    primary_key_id_ (primary_key_id)
-{}
-
-Dynamic::ParameterList *
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_primary_key_id = parameter_list->length ();
-  parameter_list->length (length_primary_key_id + 1);
-  (*parameter_list)[length_primary_key_id].argument <<= primary_key_id_;
-  (*parameter_list)[length_primary_key_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::PrimaryKeyDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (IR::ValueDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_FactoryDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -43280,6 +22993,9 @@ static int _TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::_TAO_FactoryDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl::~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -43405,9 +23121,6 @@ POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_FactoryDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_FinderDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -43719,6 +23432,9 @@ static int _TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl::_TAO_FinderDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl::~_TAO_FinderDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
 //
@@ -43844,9 +23560,6 @@ POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_FinderDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
-
 class TAO_IR_HomeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -44136,9 +23849,12 @@ static int _TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
 {}
 
+POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::~_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
+{}
+
 // ThruPOA Implementation of the IDL interface methods
 
-IR_HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
+IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -44169,7 +23885,7 @@ IR_HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
       );
 }
 
-IR_ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
+IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -44200,7 +23916,7 @@ IR_ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
       );
 }
 
-IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
+IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -44231,7 +23947,7 @@ IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
       );
 }
 
-IR_FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
+IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -44262,7 +23978,7 @@ IR_FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
       );
 }
 
-IR_FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
+IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -44324,7 +24040,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
       );
 }
 
-IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_key (
+IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_key (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -44363,7 +24079,7 @@ IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_key
       );
 }
 
-IR_FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
+IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -44404,7 +24120,7 @@ IR_FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
       );
 }
 
-IR_FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
+IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -44481,73 +24197,18 @@ void POA_IR::HomeDef::_get_base_home_skel (
 
   IR_HomeDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->base_home (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->base_home (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::_get_managed_component_skel (
@@ -44561,73 +24222,18 @@ void POA_IR::HomeDef::_get_managed_component_skel (
 
   IR_ComponentDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->managed_component (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->managed_component (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
+  ACE_CHECK;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::_get_primary_key_skel (
@@ -44641,73 +24247,18 @@ void POA_IR::HomeDef::_get_primary_key_skel (
 
   IR_PrimaryKeyDef_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->primary_key (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->primary_key (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::_get_factories_skel (
@@ -44721,73 +24272,18 @@ void POA_IR::HomeDef::_get_factories_skel (
 
   IR_FactoryDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->factories (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->factories (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_FactoryDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::_get_finders_skel (
@@ -44801,73 +24297,18 @@ void POA_IR::HomeDef::_get_finders_skel (
 
   IR_FinderDefSeq_var _tao_retval;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->finders (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->finders (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_FinderDefSeq * _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::_get_is_basic_skel (
@@ -44881,72 +24322,18 @@ void POA_IR::HomeDef::_get_is_basic_skel (
 
   CORBA::Boolean _tao_retval = 0;
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->is_basic (
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->is_basic (
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Boolean _tao_retval_info = _tao_retval;
-      ri.result (_tao_retval_info);
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::create_primary_key_skel (
@@ -44972,81 +24359,22 @@ void POA_IR::HomeDef::create_primary_key_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_primary_key (
       id.in (),
       name.in (),
       version.in (),
       primary_key.in (),
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_primary_key (
-          id.in (),
-          name.in (),
-          version.in (),
-          primary_key.in (),
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::create_factory_skel (
@@ -45074,15 +24402,7 @@ void POA_IR::HomeDef::create_factory_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_factory (
       id.in (),
       name.in (),
       version.in (),
@@ -45090,67 +24410,15 @@ void POA_IR::HomeDef::create_factory_skel (
       exceptions,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_factory (
-          id.in (),
-          name.in (),
-          version.in (),
-          params,
-          exceptions,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_FactoryDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::create_finder_skel (
@@ -45178,15 +24446,7 @@ void POA_IR::HomeDef::create_finder_skel (
   ))
     ACE_THROW (CORBA::MARSHAL () );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-      _tao_server_request.orb_core ()->server_request_interceptors (),
-      _tao_server_request.interceptor_count ()
-    );
-  
-  POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder ri (
-      _tao_server_request,
-      _tao_impl,
+  _tao_retval = _tao_impl->create_finder (
       id.in (),
       name.in (),
       version.in (),
@@ -45194,67 +24454,15 @@ void POA_IR::HomeDef::create_finder_skel (
       exceptions,
       ACE_TRY_ENV
     );
-  
-  ACE_TRY
-    {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      _tao_retval = 
-      _tao_impl->create_finder (
-          id.in (),
-          name.in (),
-          version.in (),
-          params,
-          exceptions,
-          ACE_TRY_ENV
-        );
-      TAO_INTERCEPTOR_CHECK;
-      
-#if (TAO_HAS_INTERCEPTORS == 1)
-      IR_FinderDef_ptr _tao_retval_info = _tao_retval._retn ();
-      ri.result (_tao_retval_info);
-      _tao_retval = _tao_retval_info;
-      ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-    {
-      ri.forward_reference (exc); 
-      _tao_vfr.send_other (
-        &ri,
-        ACE_TRY_ENV
-      );
-      ACE_TRY_CHECK;
-      _tao_server_request.forward_location (exc.forward.in ());
-    }
-  ACE_CATCHANY
-    {
-      ri.exception (&ACE_ANY_EXCEPTION);
-      _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
-        );
-      ACE_TRY_CHECK;
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
+
   ACE_CHECK;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
+
   _tao_server_request.init_reply ();
-  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
   if (!(
-      (_tao_out << _tao_retval.in ())
-    ))
-    ACE_THROW (CORBA::MARSHAL());
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+    (_tao_out << _tao_retval.in ())
+  ))
+    ACE_THROW (CORBA::MARSHAL () );
 }
 
 void POA_IR::HomeDef::_is_a_skel (
@@ -45363,792 +24571,3 @@ POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return IR_HomeDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::TAO_ServerRequestInfo_IR_HomeDef_factories_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::TAO_ServerRequestInfo_IR_HomeDef_finders_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr primary_key,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    primary_key_ (primary_key)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_primary_key = parameter_list->length ();
-  parameter_list->length (length_primary_key + 1);
-  (*parameter_list)[length_primary_key].argument <<=  this->primary_key_;
-  
-  (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDef_create_factory (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    params_ (params),
-    exceptions_ (exceptions)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef_create_finder (
-    TAO_ServerRequest &_tao_server_request,
-    POA_IR::HomeDef *tao_impl,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
-  )
-  : TAO_ServerRequestInfo (_tao_server_request),
-    _tao_impl (tao_impl),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    params_ (params),
-    exceptions_ (exceptions)
-{}
-
-Dynamic::ParameterList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  
-  return safe_result_any._retn ();
-}
-
-char *
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
-    CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return
-    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
-}
-
-CORBA::Boolean
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
-}
-
-void 
-POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result)
-{
-  // Update the result.
-   this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-#endif /* ifndef TAO_IDL_INTERFACES_CPP */
-
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceS.h b/TAO/orbsvcs/IFR_Service/InterfaceS.h
index d73b559d338..6cdb0b3b1a5 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceS.h
+++ b/TAO/orbsvcs/IFR_Service/InterfaceS.h
@@ -32,8 +32,6 @@
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
-#include "tao/PortableInterceptor.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
@@ -135,113 +133,6 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_CORBA_IRObject;
-    TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
-      TAO_ServerRequest &_tao_server_request,
-      POA_CORBA_IRObject *tao_impl
-      ,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-  private:
-    TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &);
-    void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &);
-    
-  private:
-    POA_CORBA_IRObject *_tao_impl;
-    void result (IR::DefinitionKind        result);
-     // update the result 
-    IR_DefinitionKind  _result;
-  };
-
-  class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInfo
-  {
-  public:
-    friend class POA_CORBA_IRObject;
-    TAO_ServerRequestInfo_CORBA_IRObject_destroy (
-      TAO_ServerRequest &_tao_server_request,
-      POA_CORBA_IRObject *tao_impl
-      ,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Boolean target_is_a (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-  private:
-    TAO_ServerRequestInfo_CORBA_IRObject_destroy (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &);
-    void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &);
-  
-  private:
-    POA_CORBA_IRObject *_tao_impl;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 ///////////////////////////////////////////////////////////////////////
@@ -303,7 +194,7 @@ class _TAO_IRObject_ThruPOA_Proxy_Impl
 public:
   _TAO_IRObject_ThruPOA_Proxy_Impl (void);
 
-  virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void);
 
     virtual IR_DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_,
@@ -581,575 +472,6 @@ TAO_NAMESPACE  POA_IR
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_Contained_id_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_id_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-      
-      
-    private:
-      TAO_ServerRequestInfo_IR_Contained_id_get (const TAO_ServerRequestInfo_IR_Contained_id_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_id_get &);
-      
-    private:
-      POA_IR::Contained *_tao_impl;
-      void result (char *result);
-      // update the result 
-      char *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_id_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_id_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_id_set (const TAO_ServerRequestInfo_IR_Contained_id_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_id_set &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      const char * id_;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_name_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_name_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_name_get (const TAO_ServerRequestInfo_IR_Contained_name_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_name_get &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      void result (char *    result);
-      // update the result 
-      char *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_name_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_name_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_name_set (const TAO_ServerRequestInfo_IR_Contained_name_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_name_set &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      const char * name_;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_version_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_version_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_version_get (const TAO_ServerRequestInfo_IR_Contained_version_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_version_get &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      void result (char *    result);
-      // update the result 
-      char *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_version_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_version_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_version_set (const TAO_ServerRequestInfo_IR_Contained_version_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_version_set &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      const char * version_;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_defined_in_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_defined_in_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_defined_in_get (const TAO_ServerRequestInfo_IR_Contained_defined_in_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_defined_in_get &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      void result (IR::Container_ptr    result);
-      // update the result 
-      IR_Container_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_absolute_name_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_absolute_name_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_absolute_name_get (const TAO_ServerRequestInfo_IR_Contained_absolute_name_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_absolute_name_get &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      void result (char *    result);
-     // update the result 
-    char *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_containing_repository_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_containing_repository_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_containing_repository_get (const TAO_ServerRequestInfo_IR_Contained_containing_repository_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_containing_repository_get &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      void result (IR::Repository_ptr    result);
-      // update the result 
-      IR_Repository_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_describe : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_describe (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_describe (const TAO_ServerRequestInfo_IR_Contained_describe &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_describe &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      void result (IR::Contained::Description *    result);
-      // update the result 
-      IR_Contained::Description *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Contained_move : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Contained;
-      TAO_ServerRequestInfo_IR_Contained_move (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Contained *tao_impl
-        ,
-        IR_Container_ptr new_container,
-        const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Contained_move (const TAO_ServerRequestInfo_IR_Contained_move &);
-      void operator= (const TAO_ServerRequestInfo_IR_Contained_move &);
-  
-    private:
-      POA_IR::Contained *_tao_impl;
-      IR_Container_ptr new_container_;
-      const char * new_name_;
-      const char * new_version_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 ///////////////////////////////////////////////////////////////////////
@@ -1212,7 +534,7 @@ class _TAO_Contained_ThruPOA_Proxy_Impl :
 public:
   _TAO_Contained_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void);
   
   virtual char * id   (
       CORBA_Object *_collocated_tao_target_,
@@ -1844,903 +1166,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_Container_lookup : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_lookup (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_Container_lookup (const TAO_ServerRequestInfo_IR_Container_lookup &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_lookup &);
-    
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * search_name_;
-      void result (IR::Contained_ptr      result);
-       // update the result 
-      IR_Contained_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_contents : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_contents (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        IR_DefinitionKind & limit_type,
-        const CORBA::Boolean & exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_contents (const TAO_ServerRequestInfo_IR_Container_contents &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_contents &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const IR_DefinitionKind & limit_type_;
-      const CORBA::Boolean & exclude_inherited_;
-      void result (IR::ContainedSeq *    result);
-      // update the result 
-      IR_ContainedSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_lookup_name : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_lookup_name (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * search_name,
-        const CORBA::Long & levels_to_search,
-        IR_DefinitionKind & limit_type,
-        const CORBA::Boolean & exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_lookup_name (const TAO_ServerRequestInfo_IR_Container_lookup_name &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_lookup_name &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * search_name_;
-      const CORBA::Long & levels_to_search_;
-      const IR_DefinitionKind & limit_type_;
-      const CORBA::Boolean & exclude_inherited_;
-      void result (IR::ContainedSeq *    result);
-      // update the result 
-      IR_ContainedSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_describe_contents : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_describe_contents (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        IR_DefinitionKind & limit_type,
-        const CORBA::Boolean & exclude_inherited,
-        const CORBA::Long & max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_describe_contents (const TAO_ServerRequestInfo_IR_Container_describe_contents &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_describe_contents &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const IR_DefinitionKind & limit_type_;
-      const CORBA::Boolean & exclude_inherited_;
-      const CORBA::Long & max_returned_objs_;
-      void result (IR::Container::DescriptionSeq *    result);
-      // update the result 
-      IR_Container::DescriptionSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_module : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_module (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_module (const TAO_ServerRequestInfo_IR_Container_create_module &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_module &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      void result (IR::ModuleDef_ptr    result);
-      // update the result 
-      IR_ModuleDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_constant : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_constant (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_constant (const TAO_ServerRequestInfo_IR_Container_create_constant &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_constant &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr type_;
-      const CORBA::Any & value_;
-      void result (IR::ConstantDef_ptr    result);
-      // update the result 
-      IR_ConstantDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_struct : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_struct (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_struct (const TAO_ServerRequestInfo_IR_Container_create_struct &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_struct &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      const IR_StructMemberSeq & members_;
-      void result (IR::StructDef_ptr    result);
-      // update the result 
-      IR_StructDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_union : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_union (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr discriminator_type,
-        const IR_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_union (const TAO_ServerRequestInfo_IR_Container_create_union &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_union &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr discriminator_type_;
-      const IR_UnionMemberSeq & members_;
-      void result (IR::UnionDef_ptr    result);
-      // update the result 
-      IR_UnionDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_enum : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_enum (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_enum (const TAO_ServerRequestInfo_IR_Container_create_enum &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_enum &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      const IR_EnumMemberSeq & members_;
-      void result (IR::EnumDef_ptr    result);
-      // update the result 
-      IR_EnumDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_alias : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_alias (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_alias (const TAO_ServerRequestInfo_IR_Container_create_alias &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_alias &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr original_type_;
-      void result (IR::AliasDef_ptr    result);
-      // update the result 
-      IR_AliasDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_interface : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_interface (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_InterfaceDefSeq & base_interfaces,
-        const CORBA::Boolean & is_abstract,
-        const CORBA::Boolean & is_local,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_interface (const TAO_ServerRequestInfo_IR_Container_create_interface &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_interface &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      const IR_InterfaceDefSeq & base_interfaces_;
-      const CORBA::Boolean & is_abstract_;
-      const CORBA::Boolean & is_local_;
-      void result (IR::InterfaceDef_ptr    result);
-      // update the result 
-      IR_InterfaceDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_value : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_value (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::Boolean & is_custom,
-        const CORBA::Boolean & is_abstract,
-        IR_ValueDef_ptr base_value,
-        const CORBA::Boolean & is_truncatable,
-        const IR_ValueDefSeq & abstract_base_values,
-        const IR_InterfaceDefSeq & supported_interfaces,
-        const IR_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_value (const TAO_ServerRequestInfo_IR_Container_create_value &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_value &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      const CORBA::Boolean & is_custom_;
-      const CORBA::Boolean & is_abstract_;
-      IR_ValueDef_ptr base_value_;
-      const CORBA::Boolean & is_truncatable_;
-      const IR_ValueDefSeq & abstract_base_values_;
-      const IR_InterfaceDefSeq & supported_interfaces_;
-      const IR_InitializerSeq & initializers_;
-      void result (IR::ValueDef_ptr    result);
-      // update the result 
-      IR_ValueDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_value_box : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_value_box (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_value_box (const TAO_ServerRequestInfo_IR_Container_create_value_box &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_value_box &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr original_type_def_;
-      void result (IR::ValueBoxDef_ptr    result);
-      // update the result 
-      IR_ValueBoxDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_exception : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_exception (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_exception (const TAO_ServerRequestInfo_IR_Container_create_exception &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_exception &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      const IR_StructMemberSeq & members_;
-      void result (IR::ExceptionDef_ptr    result);
-      // update the result 
-      IR_ExceptionDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Container_create_native : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Container;
-      TAO_ServerRequestInfo_IR_Container_create_native (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Container *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Container_create_native (const TAO_ServerRequestInfo_IR_Container_create_native &);
-      void operator= (const TAO_ServerRequestInfo_IR_Container_create_native &);
-  
-    private:
-      POA_IR::Container *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      void result (IR::NativeDef_ptr    result);
-      // update the result 
-      IR_NativeDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -2803,7 +1228,7 @@ class _TAO_Container_ThruPOA_Proxy_Impl :
 public:
   _TAO_Container_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void);
   
   virtual IR_Contained_ptr lookup   (
       CORBA_Object *_collocated_tao_target_,
@@ -3327,64 +1752,6 @@ private:
       );
 
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_IDLType_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::IDLType;
-      TAO_ServerRequestInfo_IR_IDLType_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::IDLType *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_IDLType_type_get (const TAO_ServerRequestInfo_IR_IDLType_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_IDLType_type_get &);
-    
-    private:
-      POA_IR::IDLType *_tao_impl;
-      void result (CORBA::TypeCode_ptr      result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -3447,7 +1814,7 @@ class _TAO_IDLType_ThruPOA_Proxy_Impl :
 public:
   _TAO_IDLType_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::TypeCode_ptr type   (
       CORBA_Object *_collocated_tao_target_,
@@ -3864,444 +2231,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_Repository_lookup_id : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_lookup_id (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_Repository_lookup_id (const TAO_ServerRequestInfo_IR_Repository_lookup_id &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_lookup_id &);
-    
-    private:
-      POA_IR::Repository *_tao_impl;
-      const char * search_id_;
-      void result (IR::Contained_ptr      result);
-      // update the result 
-      IR_Contained_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        CORBA::TypeCode_ptr tc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode (const TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode &);
-  
-    private:
-      POA_IR::Repository *_tao_impl;
-      CORBA::TypeCode_ptr tc_;
-      void result (CORBA::TypeCode_ptr    result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Repository_get_primitive : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_get_primitive (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        IR_PrimitiveKind & kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Repository_get_primitive (const TAO_ServerRequestInfo_IR_Repository_get_primitive &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_get_primitive &);
-  
-    private:
-      POA_IR::Repository *_tao_impl;
-      const IR_PrimitiveKind & kind_;
-      void result (IR::PrimitiveDef_ptr    result);
-      // update the result 
-      IR_PrimitiveDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Repository_create_string : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_create_string (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Repository_create_string (const TAO_ServerRequestInfo_IR_Repository_create_string &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_create_string &);
-  
-    private:
-      POA_IR::Repository *_tao_impl;
-      const CORBA::ULong & bound_;
-      void result (IR::StringDef_ptr    result);
-      // update the result 
-      IR_StringDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Repository_create_wstring : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_create_wstring (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Repository_create_wstring (const TAO_ServerRequestInfo_IR_Repository_create_wstring &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_create_wstring &);
-  
-    private:
-      POA_IR::Repository *_tao_impl;
-      const CORBA::ULong & bound_;
-      void result (IR::WstringDef_ptr    result);
-      // update the result 
-      IR_WstringDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Repository_create_sequence : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_create_sequence (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        const CORBA::ULong & bound,
-        IR_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Repository_create_sequence (const TAO_ServerRequestInfo_IR_Repository_create_sequence &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_create_sequence &);
-  
-    private:
-      POA_IR::Repository *_tao_impl;
-      const CORBA::ULong & bound_;
-      IR_IDLType_ptr element_type_;
-      void result (IR::SequenceDef_ptr    result);
-      // update the result 
-      IR_SequenceDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Repository_create_array : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_create_array (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        const CORBA::ULong & length,
-        IR_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Repository_create_array (const TAO_ServerRequestInfo_IR_Repository_create_array &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_create_array &);
-  
-    private:
-      POA_IR::Repository *_tao_impl;
-      const CORBA::ULong & length_;
-      IR_IDLType_ptr element_type_;
-      void result (IR::ArrayDef_ptr    result);
-      // update the result 
-      IR_ArrayDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_Repository_create_fixed : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::Repository;
-      TAO_ServerRequestInfo_IR_Repository_create_fixed (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::Repository *tao_impl
-        ,
-        const CORBA::UShort & digits,
-        const CORBA::Short & scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_Repository_create_fixed (const TAO_ServerRequestInfo_IR_Repository_create_fixed &);
-      void operator= (const TAO_ServerRequestInfo_IR_Repository_create_fixed &);
-  
-    private:
-      POA_IR::Repository *_tao_impl;
-      const CORBA::UShort & digits_;
-      const CORBA::Short & scale_;
-      void result (IR::FixedDef_ptr    result);
-      // update the result 
-      IR_FixedDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -4364,7 +2293,7 @@ class _TAO_Repository_ThruPOA_Proxy_Impl :
 public:
   _TAO_Repository_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void);
   
     virtual IR_Contained_ptr lookup_id   (
       CORBA_Object *_collocated_tao_target_,
@@ -5066,138 +2995,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ComponentRepository_create_component : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentRepository;
-      TAO_ServerRequestInfo_IR_ComponentRepository_create_component (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentRepository *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ComponentDef_ptr base_component,
-        const IR_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ComponentRepository_create_component (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_component &);
-    
-    private:
-      POA_IR::ComponentRepository *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_ComponentDef_ptr base_component_;
-      const IR_InterfaceDefSeq & supports_interfaces_;
-      void result (IR::ComponentDef_ptr      result);
-      // update the result 
-      IR_ComponentDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentRepository_create_home : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentRepository;
-      TAO_ServerRequestInfo_IR_ComponentRepository_create_home (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentRepository *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_HomeDef_ptr base_home,
-        IR_ComponentDef_ptr managed_component,
-        IR_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentRepository_create_home (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentRepository_create_home &);
-  
-    private:
-      POA_IR::ComponentRepository *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_HomeDef_ptr base_home_;
-      IR_ComponentDef_ptr managed_component_;
-      IR_ValueDef_ptr primary_key_;
-      void result (IR::HomeDef_ptr    result);
-      // update the result 
-      IR_HomeDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -5260,7 +3057,7 @@ class _TAO_ComponentRepository_ThruPOA_Proxy_Impl :
 public:
   _TAO_ComponentRepository_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void);
   
     virtual IR_ComponentDef_ptr create_component   (
       CORBA_Object *_collocated_tao_target_,
@@ -5923,14 +3720,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -5994,7 +3783,7 @@ class _TAO_ModuleDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ModuleDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -6582,267 +4371,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ConstantDef_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ConstantDef;
-      TAO_ServerRequestInfo_IR_ConstantDef_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ConstantDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ConstantDef_type_get (const TAO_ServerRequestInfo_IR_ConstantDef_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_get &);
-    
-    private:
-      POA_IR::ConstantDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ConstantDef_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ConstantDef;
-      TAO_ServerRequestInfo_IR_ConstantDef_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ConstantDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ConstantDef_type_def_get (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_get &);
-  
-    private:
-      POA_IR::ConstantDef *_tao_impl;
-      void result (IR::IDLType_ptr    result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ConstantDef_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ConstantDef;
-      TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ConstantDef *tao_impl
-        ,
-        IR_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_type_def_set &);
-  
-    private:
-      POA_IR::ConstantDef *_tao_impl;
-      IR_IDLType_ptr type_def_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ConstantDef_value_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ConstantDef;
-      TAO_ServerRequestInfo_IR_ConstantDef_value_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ConstantDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ConstantDef_value_get (const TAO_ServerRequestInfo_IR_ConstantDef_value_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_value_get &);
-  
-    private:
-      POA_IR::ConstantDef *_tao_impl;
-      void result (CORBA::Any *    result);
-      // update the result 
-      CORBA::Any *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ConstantDef_value_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ConstantDef;
-      TAO_ServerRequestInfo_IR_ConstantDef_value_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ConstantDef *tao_impl
-        ,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ConstantDef_value_set (const TAO_ServerRequestInfo_IR_ConstantDef_value_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ConstantDef_value_set &);
-  
-    private:
-      POA_IR::ConstantDef *_tao_impl;
-      const CORBA::Any & value_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -6905,7 +4433,7 @@ class _TAO_ConstantDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ConstantDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::TypeCode_ptr type   (
       CORBA_Object *_collocated_tao_target_,
@@ -7321,14 +4849,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -7392,7 +4912,7 @@ class _TAO_TypedefDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -7885,115 +5405,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_StructDef_members_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::StructDef;
-      TAO_ServerRequestInfo_IR_StructDef_members_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::StructDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_StructDef_members_get (const TAO_ServerRequestInfo_IR_StructDef_members_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_StructDef_members_get &);
-    
-    private:
-      POA_IR::StructDef *_tao_impl;
-      void result (IR::StructMemberSeq *      result);
-      // update the result 
-      IR_StructMemberSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_StructDef_members_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::StructDef;
-      TAO_ServerRequestInfo_IR_StructDef_members_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::StructDef *tao_impl
-        ,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_StructDef_members_set (const TAO_ServerRequestInfo_IR_StructDef_members_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_StructDef_members_set &);
-  
-    private:
-      POA_IR::StructDef *_tao_impl;
-      const IR_StructMemberSeq & members_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -8057,7 +5468,7 @@ class _TAO_StructDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_StructDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_StructMemberSeq * members   (
       CORBA_Object *_collocated_tao_target_,
@@ -8815,267 +6226,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::UnionDef;
-      TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::UnionDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get &);
-    
-    private:
-      POA_IR::UnionDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr      result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::UnionDef;
-      TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::UnionDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_get &);
-  
-    private:
-      POA_IR::UnionDef *_tao_impl;
-      void result (IR::IDLType_ptr    result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::UnionDef;
-      TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::UnionDef *tao_impl
-        ,
-        IR_IDLType_ptr discriminator_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set &);
-  
-    private:
-      POA_IR::UnionDef *_tao_impl;
-      IR_IDLType_ptr discriminator_type_def_;
-    };
-
-    class TAO_ServerRequestInfo_IR_UnionDef_members_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::UnionDef;
-      TAO_ServerRequestInfo_IR_UnionDef_members_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::UnionDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_UnionDef_members_get (const TAO_ServerRequestInfo_IR_UnionDef_members_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_UnionDef_members_get &);
-  
-    private:
-      POA_IR::UnionDef *_tao_impl;
-      void result (IR::UnionMemberSeq *    result);
-      // update the result 
-      IR_UnionMemberSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_UnionDef_members_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::UnionDef;
-      TAO_ServerRequestInfo_IR_UnionDef_members_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::UnionDef *tao_impl
-        ,
-        const IR_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_UnionDef_members_set (const TAO_ServerRequestInfo_IR_UnionDef_members_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_UnionDef_members_set &);
-  
-    private:
-      POA_IR::UnionDef *_tao_impl;
-      const IR_UnionMemberSeq & members_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -9139,7 +6289,7 @@ class _TAO_UnionDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_UnionDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_UnionDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_UnionDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::TypeCode_ptr discriminator_type   (
       CORBA_Object *_collocated_tao_target_,
@@ -9778,115 +6928,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_EnumDef_members_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::EnumDef;
-      TAO_ServerRequestInfo_IR_EnumDef_members_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::EnumDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_EnumDef_members_get (const TAO_ServerRequestInfo_IR_EnumDef_members_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_EnumDef_members_get &);
-    
-    private:
-      POA_IR::EnumDef *_tao_impl;
-      void result (IR::EnumMemberSeq *      result);
-      // update the result 
-      IR_EnumMemberSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_EnumDef_members_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::EnumDef;
-      TAO_ServerRequestInfo_IR_EnumDef_members_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::EnumDef *tao_impl
-        ,
-        const IR_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_EnumDef_members_set (const TAO_ServerRequestInfo_IR_EnumDef_members_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_EnumDef_members_set &);
-  
-    private:
-      POA_IR::EnumDef *_tao_impl;
-      const IR_EnumMemberSeq & members_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -9949,7 +6990,7 @@ class _TAO_EnumDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_EnumDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_EnumMemberSeq * members   (
       CORBA_Object *_collocated_tao_target_,
@@ -10356,115 +7397,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::AliasDef;
-      TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::AliasDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get &);
-    
-    private:
-      POA_IR::AliasDef *_tao_impl;
-      void result (IR::IDLType_ptr      result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::AliasDef;
-      TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::AliasDef *tao_impl
-        ,
-        IR_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set &);
-  
-    private:
-      POA_IR::AliasDef *_tao_impl;
-      IR_IDLType_ptr original_type_def_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -10527,7 +7459,7 @@ class _TAO_AliasDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_AliasDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_IDLType_ptr original_type_def   (
       CORBA_Object *_collocated_tao_target_,
@@ -10901,14 +7833,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -10971,7 +7895,7 @@ class _TAO_NativeDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_NativeDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_NativeDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_NativeDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -11239,65 +8163,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::PrimitiveDef;
-      TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::PrimitiveDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (const TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get &);
-    
-    private:
-      POA_IR::PrimitiveDef *_tao_impl;
-      void result (IR::PrimitiveKind      result);
-      // update the result 
-      IR_PrimitiveKind  _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -11360,7 +8225,7 @@ class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_PrimitiveKind kind   (
       CORBA_Object *_collocated_tao_target_,
@@ -11567,115 +8432,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_StringDef_bound_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::StringDef;
-      TAO_ServerRequestInfo_IR_StringDef_bound_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::StringDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_StringDef_bound_get (const TAO_ServerRequestInfo_IR_StringDef_bound_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_StringDef_bound_get &);
-    
-    private:
-      POA_IR::StringDef *_tao_impl;
-      void result (CORBA::ULong      result);
-      // update the result 
-      CORBA::ULong  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_StringDef_bound_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::StringDef;
-      TAO_ServerRequestInfo_IR_StringDef_bound_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::StringDef *tao_impl
-        ,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_StringDef_bound_set (const TAO_ServerRequestInfo_IR_StringDef_bound_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_StringDef_bound_set &);
-  
-    private:
-      POA_IR::StringDef *_tao_impl;
-      const CORBA::ULong & bound_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -11738,7 +8494,7 @@ class _TAO_StringDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_StringDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_StringDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_StringDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::ULong bound   (
       CORBA_Object *_collocated_tao_target_,
@@ -11963,115 +8719,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_WstringDef_bound_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::WstringDef;
-      TAO_ServerRequestInfo_IR_WstringDef_bound_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::WstringDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_WstringDef_bound_get (const TAO_ServerRequestInfo_IR_WstringDef_bound_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_WstringDef_bound_get &);
-    
-    private:
-      POA_IR::WstringDef *_tao_impl;
-      void result (CORBA::ULong      result);
-      // update the result 
-      CORBA::ULong  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_WstringDef_bound_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::WstringDef;
-      TAO_ServerRequestInfo_IR_WstringDef_bound_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::WstringDef *tao_impl
-        ,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_WstringDef_bound_set (const TAO_ServerRequestInfo_IR_WstringDef_bound_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_WstringDef_bound_set &);
-  
-    private:
-      POA_IR::WstringDef *_tao_impl;
-      const CORBA::ULong & bound_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -12134,7 +8781,7 @@ class _TAO_WstringDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_WstringDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_WstringDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_WstringDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::ULong bound   (
       CORBA_Object *_collocated_tao_target_,
@@ -12392,216 +9039,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_FixedDef_digits_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::FixedDef;
-      TAO_ServerRequestInfo_IR_FixedDef_digits_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::FixedDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_FixedDef_digits_get (const TAO_ServerRequestInfo_IR_FixedDef_digits_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_FixedDef_digits_get &);
-    
-    private:
-      POA_IR::FixedDef *_tao_impl;
-      void result (CORBA::UShort      result);
-      // update the result 
-      CORBA::UShort  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_FixedDef_digits_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::FixedDef;
-      TAO_ServerRequestInfo_IR_FixedDef_digits_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::FixedDef *tao_impl
-        ,
-        const CORBA::UShort & digits,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_FixedDef_digits_set (const TAO_ServerRequestInfo_IR_FixedDef_digits_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_FixedDef_digits_set &);
-  
-    private:
-      POA_IR::FixedDef *_tao_impl;
-      const CORBA::UShort & digits_;
-    };
-
-    class TAO_ServerRequestInfo_IR_FixedDef_scale_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::FixedDef;
-      TAO_ServerRequestInfo_IR_FixedDef_scale_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::FixedDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_FixedDef_scale_get (const TAO_ServerRequestInfo_IR_FixedDef_scale_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_FixedDef_scale_get &);
-  
-    private:
-      POA_IR::FixedDef *_tao_impl;
-      void result (CORBA::Short    result);
-      // update the result 
-      CORBA::Short  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_FixedDef_scale_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::FixedDef;
-      TAO_ServerRequestInfo_IR_FixedDef_scale_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::FixedDef *tao_impl
-        ,
-        const CORBA::Short & scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_FixedDef_scale_set (const TAO_ServerRequestInfo_IR_FixedDef_scale_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_FixedDef_scale_set &);
-  
-    private:
-      POA_IR::FixedDef *_tao_impl;
-      const CORBA::Short & scale_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -12664,7 +9101,7 @@ class _TAO_FixedDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_FixedDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_FixedDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_FixedDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::UShort digits   (
       CORBA_Object *_collocated_tao_target_,
@@ -12972,267 +9409,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_SequenceDef_bound_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::SequenceDef;
-      TAO_ServerRequestInfo_IR_SequenceDef_bound_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::SequenceDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_SequenceDef_bound_get (const TAO_ServerRequestInfo_IR_SequenceDef_bound_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_bound_get &);
-    
-    private:
-      POA_IR::SequenceDef *_tao_impl;
-      void result (CORBA::ULong      result);
-      // update the result 
-      CORBA::ULong  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_SequenceDef_bound_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::SequenceDef;
-      TAO_ServerRequestInfo_IR_SequenceDef_bound_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::SequenceDef *tao_impl
-        ,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_SequenceDef_bound_set (const TAO_ServerRequestInfo_IR_SequenceDef_bound_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_bound_set &);
-  
-    private:
-      POA_IR::SequenceDef *_tao_impl;
-      const CORBA::ULong & bound_;
-    };
-
-    class TAO_ServerRequestInfo_IR_SequenceDef_element_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::SequenceDef;
-      TAO_ServerRequestInfo_IR_SequenceDef_element_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::SequenceDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_SequenceDef_element_type_get (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_get &);
-  
-    private:
-      POA_IR::SequenceDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr    result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::SequenceDef;
-      TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::SequenceDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_get &);
-  
-    private:
-      POA_IR::SequenceDef *_tao_impl;
-      void result (IR::IDLType_ptr    result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::SequenceDef;
-      TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::SequenceDef *tao_impl
-        ,
-        IR_IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set &);
-  
-    private:
-      POA_IR::SequenceDef *_tao_impl;
-      IR_IDLType_ptr element_type_def_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -13295,7 +9471,7 @@ class _TAO_SequenceDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_SequenceDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::ULong bound   (
       CORBA_Object *_collocated_tao_target_,
@@ -13619,267 +9795,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ArrayDef_length_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ArrayDef;
-      TAO_ServerRequestInfo_IR_ArrayDef_length_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ArrayDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ArrayDef_length_get (const TAO_ServerRequestInfo_IR_ArrayDef_length_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_length_get &);
-    
-    private:
-      POA_IR::ArrayDef *_tao_impl;
-      void result (CORBA::ULong      result);
-      // update the result 
-      CORBA::ULong  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ArrayDef_length_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ArrayDef;
-      TAO_ServerRequestInfo_IR_ArrayDef_length_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ArrayDef *tao_impl
-        ,
-        const CORBA::ULong & length,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ArrayDef_length_set (const TAO_ServerRequestInfo_IR_ArrayDef_length_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_length_set &);
-  
-    private:
-      POA_IR::ArrayDef *_tao_impl;
-      const CORBA::ULong & length_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ArrayDef_element_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ArrayDef;
-      TAO_ServerRequestInfo_IR_ArrayDef_element_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ArrayDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ArrayDef_element_type_get (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_get &);
-  
-    private:
-      POA_IR::ArrayDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr    result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ArrayDef;
-      TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ArrayDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_get &);
-  
-    private:
-      POA_IR::ArrayDef *_tao_impl;
-      void result (IR::IDLType_ptr    result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ArrayDef;
-      TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ArrayDef *tao_impl
-        ,
-        IR_IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set &);
-  
-    private:
-      POA_IR::ArrayDef *_tao_impl;
-      IR_IDLType_ptr element_type_def_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -13942,7 +9857,7 @@ class _TAO_ArrayDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ArrayDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::ULong length   (
       CORBA_Object *_collocated_tao_target_,
@@ -14433,166 +10348,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ExceptionDef_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ExceptionDef;
-      TAO_ServerRequestInfo_IR_ExceptionDef_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ExceptionDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ExceptionDef_type_get (const TAO_ServerRequestInfo_IR_ExceptionDef_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_type_get &);
-    
-    private:
-      POA_IR::ExceptionDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr      result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ExceptionDef_members_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ExceptionDef;
-      TAO_ServerRequestInfo_IR_ExceptionDef_members_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ExceptionDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ExceptionDef_members_get (const TAO_ServerRequestInfo_IR_ExceptionDef_members_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_members_get &);
-  
-    private:
-      POA_IR::ExceptionDef *_tao_impl;
-      void result (IR::StructMemberSeq *    result);
-      // update the result 
-      IR_StructMemberSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ExceptionDef_members_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ExceptionDef;
-      TAO_ServerRequestInfo_IR_ExceptionDef_members_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ExceptionDef *tao_impl
-        ,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ExceptionDef_members_set (const TAO_ServerRequestInfo_IR_ExceptionDef_members_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ExceptionDef_members_set &);
-  
-    private:
-      POA_IR::ExceptionDef *_tao_impl;
-      const IR_StructMemberSeq & members_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -14656,7 +10411,7 @@ class _TAO_ExceptionDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ExceptionDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::TypeCode_ptr type   (
       CORBA_Object *_collocated_tao_target_,
@@ -15294,267 +11049,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_AttributeDef_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::AttributeDef;
-      TAO_ServerRequestInfo_IR_AttributeDef_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::AttributeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_AttributeDef_type_get (const TAO_ServerRequestInfo_IR_AttributeDef_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_get &);
-    
-    private:
-      POA_IR::AttributeDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr      result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_AttributeDef_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::AttributeDef;
-      TAO_ServerRequestInfo_IR_AttributeDef_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::AttributeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_AttributeDef_type_def_get (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_get &);
-  
-    private:
-      POA_IR::AttributeDef *_tao_impl;
-      void result (IR::IDLType_ptr    result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_AttributeDef_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::AttributeDef;
-      TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::AttributeDef *tao_impl
-        ,
-        IR_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_type_def_set &);
-  
-    private:
-      POA_IR::AttributeDef *_tao_impl;
-      IR_IDLType_ptr type_def_;
-    };
-
-    class TAO_ServerRequestInfo_IR_AttributeDef_mode_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::AttributeDef;
-      TAO_ServerRequestInfo_IR_AttributeDef_mode_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::AttributeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_AttributeDef_mode_get (const TAO_ServerRequestInfo_IR_AttributeDef_mode_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_mode_get &);
-  
-    private:
-      POA_IR::AttributeDef *_tao_impl;
-      void result (IR::AttributeMode    result);
-      // update the result 
-      IR_AttributeMode  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_AttributeDef_mode_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::AttributeDef;
-      TAO_ServerRequestInfo_IR_AttributeDef_mode_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::AttributeDef *tao_impl
-        ,
-        IR_AttributeMode & mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_AttributeDef_mode_set (const TAO_ServerRequestInfo_IR_AttributeDef_mode_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_AttributeDef_mode_set &);
-  
-    private:
-      POA_IR::AttributeDef *_tao_impl;
-      const IR_AttributeMode & mode_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -15617,7 +11111,7 @@ class _TAO_AttributeDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_AttributeDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::TypeCode_ptr type   (
       CORBA_Object *_collocated_tao_target_,
@@ -16206,570 +11700,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_OperationDef_result_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_result_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_result_get (const TAO_ServerRequestInfo_IR_OperationDef_result_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_get &);
-    
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr      result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_result_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_result_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_result_def_get (const TAO_ServerRequestInfo_IR_OperationDef_result_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_def_get &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      void result (IR::IDLType_ptr    result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_result_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_result_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        IR_IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_result_def_set (const TAO_ServerRequestInfo_IR_OperationDef_result_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_result_def_set &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      IR_IDLType_ptr result_def_;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_params_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_params_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_params_get (const TAO_ServerRequestInfo_IR_OperationDef_params_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_params_get &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      void result (IR::ParDescriptionSeq *    result);
-      // update the result 
-      IR_ParDescriptionSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_params_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_params_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        const IR_ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_params_set (const TAO_ServerRequestInfo_IR_OperationDef_params_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_params_set &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      const IR_ParDescriptionSeq & params_;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_mode_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_mode_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_mode_get (const TAO_ServerRequestInfo_IR_OperationDef_mode_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_mode_get &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      void result (IR::OperationMode    result);
-      // update the result 
-      IR_OperationMode  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_mode_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_mode_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        IR_OperationMode & mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_mode_set (const TAO_ServerRequestInfo_IR_OperationDef_mode_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_mode_set &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      const IR_OperationMode & mode_;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_contexts_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_contexts_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_contexts_get (const TAO_ServerRequestInfo_IR_OperationDef_contexts_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_contexts_get &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      void result (IR::ContextIdSeq *    result);
-      // update the result 
-      IR_ContextIdSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_contexts_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_contexts_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        const IR_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_contexts_set (const TAO_ServerRequestInfo_IR_OperationDef_contexts_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_contexts_set &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      const IR_ContextIdSeq & contexts_;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_exceptions_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_exceptions_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_exceptions_get (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_get &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      void result (IR::ExceptionDefSeq *    result);
-      // update the result 
-      IR_ExceptionDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_OperationDef_exceptions_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::OperationDef;
-      TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::OperationDef *tao_impl
-        ,
-        const IR_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_OperationDef_exceptions_set &);
-  
-    private:
-      POA_IR::OperationDef *_tao_impl;
-      const IR_ExceptionDefSeq & exceptions_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -16832,7 +11762,7 @@ class _TAO_OperationDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_OperationDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_OperationDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_OperationDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::TypeCode_ptr result   (
       CORBA_Object *_collocated_tao_target_,
@@ -17633,502 +12563,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get &);
-    
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      void result (IR::InterfaceDefSeq *      result);
-      // update the result 
-      IR_InterfaceDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        const IR_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      const IR_InterfaceDefSeq & base_interfaces_;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        const CORBA::Boolean & is_abstract,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_set &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      const CORBA::Boolean & is_abstract_;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_get &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        const CORBA::Boolean & is_local,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_local_set &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      const CORBA::Boolean & is_local_;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_is_a : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_a (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_is_a (const TAO_ServerRequestInfo_IR_InterfaceDef_is_a &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_is_a &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      const char * interface_id_;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        IR_AttributeMode & mode,
-        const IR_ExceptionDefSeq & get_exceptions,
-        const IR_ExceptionDefSeq & put_exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute (const TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_create_attribute &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr type_;
-      const IR_AttributeMode & mode_;
-      const IR_ExceptionDefSeq & get_exceptions_;
-      const IR_ExceptionDefSeq & put_exceptions_;
-      void result (IR::AttributeDef_ptr    result);
-      // update the result 
-      IR_AttributeDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_InterfaceDef_create_operation : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::InterfaceDef;
-      TAO_ServerRequestInfo_IR_InterfaceDef_create_operation (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::InterfaceDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr result,
-        IR_OperationMode & mode,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        const IR_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_InterfaceDef_create_operation (const TAO_ServerRequestInfo_IR_InterfaceDef_create_operation &);
-      void operator= (const TAO_ServerRequestInfo_IR_InterfaceDef_create_operation &);
-  
-    private:
-      POA_IR::InterfaceDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr result_;
-      const IR_OperationMode & mode_;
-      const IR_ParDescriptionSeq & params_;
-      const IR_ExceptionDefSeq & exceptions_;
-      const IR_ContextIdSeq & contexts_;
-      void result (IR::OperationDef_ptr    result);
-      // update the result 
-      IR_OperationDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -18193,7 +12627,7 @@ class _TAO_InterfaceDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_InterfaceDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_InterfaceDefSeq * base_interfaces   (
       CORBA_Object *_collocated_tao_target_,
@@ -18971,267 +13405,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ValueMemberDef_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueMemberDef;
-      TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueMemberDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_get &);
-    
-    private:
-      POA_IR::ValueMemberDef *_tao_impl;
-      void result (CORBA::TypeCode_ptr      result);
-      // update the result 
-      CORBA::TypeCode_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueMemberDef;
-      TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueMemberDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_get &);
-  
-    private:
-      POA_IR::ValueMemberDef *_tao_impl;
-      void result (IR::IDLType_ptr    result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueMemberDef;
-      TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueMemberDef *tao_impl
-        ,
-        IR_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set &);
-  
-    private:
-      POA_IR::ValueMemberDef *_tao_impl;
-      IR_IDLType_ptr type_def_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueMemberDef_access_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueMemberDef;
-      TAO_ServerRequestInfo_IR_ValueMemberDef_access_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueMemberDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ValueMemberDef_access_get (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_get &);
-  
-    private:
-      POA_IR::ValueMemberDef *_tao_impl;
-      void result (CORBA::Visibility    result);
-      // update the result 
-      CORBA::Visibility  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueMemberDef_access_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueMemberDef;
-      TAO_ServerRequestInfo_IR_ValueMemberDef_access_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueMemberDef *tao_impl
-        ,
-        const CORBA::Visibility & access,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ValueMemberDef_access_set (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueMemberDef_access_set &);
-  
-    private:
-      POA_IR::ValueMemberDef *_tao_impl;
-      const CORBA::Visibility & access_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -19294,7 +13467,7 @@ class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::TypeCode_ptr type   (
       CORBA_Object *_collocated_tao_target_,
@@ -20146,967 +14319,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get &);
-    
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      void result (IR::InterfaceDefSeq *      result);
-      // update the result 
-      IR_InterfaceDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const IR_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const IR_InterfaceDefSeq & supported_interfaces_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_initializers_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_initializers_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_initializers_get (const TAO_ServerRequestInfo_IR_ValueDef_initializers_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_initializers_get &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      void result (IR::InitializerSeq *    result);
-      // update the result 
-      IR_InitializerSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_initializers_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_initializers_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const IR_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_initializers_set (const TAO_ServerRequestInfo_IR_ValueDef_initializers_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_initializers_set &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const IR_InitializerSeq & initializers_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_base_value_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_base_value_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_base_value_get (const TAO_ServerRequestInfo_IR_ValueDef_base_value_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_base_value_get &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      void result (IR::ValueDef_ptr    result);
-      // update the result 
-      IR_ValueDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_base_value_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_base_value_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        IR_ValueDef_ptr base_value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_base_value_set (const TAO_ServerRequestInfo_IR_ValueDef_base_value_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_base_value_set &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      IR_ValueDef_ptr base_value_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      void result (IR::ValueDefSeq *    result);
-      // update the result 
-      IR_ValueDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const IR_ValueDefSeq & abstract_base_values,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const IR_ValueDefSeq & abstract_base_values_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const CORBA::Boolean & is_abstract,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_abstract_set &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const CORBA::Boolean & is_abstract_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_is_custom_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_is_custom_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_is_custom_get (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_get &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_is_custom_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_is_custom_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const CORBA::Boolean & is_custom,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_is_custom_set (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_custom_set &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const CORBA::Boolean & is_custom_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_get &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const CORBA::Boolean & is_truncatable,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_truncatable_set &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const CORBA::Boolean & is_truncatable_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_is_a : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_is_a (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_is_a (const TAO_ServerRequestInfo_IR_ValueDef_is_a &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_is_a &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const char * id_;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_create_value_member : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_create_value_member (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        const CORBA::Visibility & access,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_create_value_member (const TAO_ServerRequestInfo_IR_ValueDef_create_value_member &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_create_value_member &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr type_;
-      const CORBA::Visibility & access_;
-      void result (IR::ValueMemberDef_ptr    result);
-      // update the result 
-      IR_ValueMemberDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_create_attribute : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_create_attribute (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        IR_AttributeMode & mode,
-        const IR_ExceptionDefSeq & get_exceptions,
-        const IR_ExceptionDefSeq & put_exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_create_attribute (const TAO_ServerRequestInfo_IR_ValueDef_create_attribute &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_create_attribute &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr type_;
-      const IR_AttributeMode & mode_;
-      const IR_ExceptionDefSeq & get_exceptions_;
-      const IR_ExceptionDefSeq & put_exceptions_;
-      void result (IR::AttributeDef_ptr    result);
-      // update the result 
-      IR_AttributeDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueDef_create_operation : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueDef;
-      TAO_ServerRequestInfo_IR_ValueDef_create_operation (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr result,
-        IR_OperationMode & mode,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        const IR_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    private:
-      TAO_ServerRequestInfo_IR_ValueDef_create_operation (const TAO_ServerRequestInfo_IR_ValueDef_create_operation &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueDef_create_operation &);
-
-    private:
-      POA_IR::ValueDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_IDLType_ptr result_;
-      const IR_OperationMode & mode_;
-      const IR_ParDescriptionSeq & params_;
-      const IR_ExceptionDefSeq & exceptions_;
-      const IR_ContextIdSeq & contexts_;
-      void result (IR::OperationDef_ptr    result);
-      // update the result 
-      IR_OperationDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -21171,7 +14383,7 @@ class _TAO_ValueDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ValueDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_InterfaceDefSeq * supported_interfaces   (
       CORBA_Object *_collocated_tao_target_,
@@ -22070,115 +15282,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueBoxDef;
-      TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueBoxDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get &);
-    
-    private:
-      POA_IR::ValueBoxDef *_tao_impl;
-      void result (IR::IDLType_ptr      result);
-      // update the result 
-      IR_IDLType_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ValueBoxDef;
-      TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ValueBoxDef *tao_impl
-        ,
-        IR_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set &);
-  
-    private:
-      POA_IR::ValueBoxDef *_tao_impl;
-      IR_IDLType_ptr original_type_def_;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -22241,7 +15344,7 @@ class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_IDLType_ptr original_type_def   (
       CORBA_Object *_collocated_tao_target_,
@@ -22623,65 +15726,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ProvidesDef;
-      TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ProvidesDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &);
-    
-    private:
-      POA_IR::ProvidesDef *_tao_impl;
-      void result (IR::InterfaceDef_ptr      result);
-      // update the result 
-      IR_InterfaceDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -22744,7 +15788,7 @@ class _TAO_ProvidesDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ProvidesDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_InterfaceDef_ptr interface_type   (
       CORBA_Object *_collocated_tao_target_,
@@ -23116,116 +16160,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_UsesDef_interface_type_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::UsesDef;
-      TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::UsesDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &);
-    
-    private:
-      POA_IR::UsesDef *_tao_impl;
-      void result (IR::InterfaceDef_ptr      result);
-      // update the result 
-      IR_InterfaceDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::UsesDef;
-      TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::UsesDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get &);
-  
-    private:
-      POA_IR::UsesDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -23288,7 +16222,7 @@ class _TAO_UsesDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_UsesDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_InterfaceDef_ptr interface_type   (
       CORBA_Object *_collocated_tao_target_,
@@ -23677,118 +16611,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_EventDef_is_a : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::EventDef;
-      TAO_ServerRequestInfo_IR_EventDef_is_a (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::EventDef *tao_impl
-        ,
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_EventDef_is_a (const TAO_ServerRequestInfo_IR_EventDef_is_a &);
-      void operator= (const TAO_ServerRequestInfo_IR_EventDef_is_a &);
-    
-    private:
-      POA_IR::EventDef *_tao_impl;
-      const char * event_id_;
-      void result (CORBA::Boolean      result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_EventDef_event_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::EventDef;
-      TAO_ServerRequestInfo_IR_EventDef_event_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::EventDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_EventDef_event_get (const TAO_ServerRequestInfo_IR_EventDef_event_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_EventDef_event_get &);
-  
-    private:
-      POA_IR::EventDef *_tao_impl;
-      void result (IR::ValueDef_ptr    result);
-      // update the result 
-      IR_ValueDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -23851,7 +16673,7 @@ class _TAO_EventDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_EventDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_EventDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_EventDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::Boolean is_a   (
       CORBA_Object *_collocated_tao_target_,
@@ -24225,14 +17047,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -24295,7 +17109,7 @@ class _TAO_EmitsDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_EmitsDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -24652,14 +17466,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -24722,7 +17528,7 @@ class _TAO_PublishesDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_PublishesDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -25079,14 +17885,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -25149,7 +17947,7 @@ class _TAO_ConsumesDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ConsumesDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -25936,769 +18734,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &);
-    
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (IR::InterfaceDefSeq *      result);
-      // update the result 
-      IR_InterfaceDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        const IR_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      const IR_InterfaceDefSeq & supported_interfaces_;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_base_component_get &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (IR::ComponentDef_ptr    result);
-      // update the result 
-      IR_ComponentDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (IR::ProvidesDefSeq *    result);
-      // update the result 
-      IR_ProvidesDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (IR::UsesDefSeq *    result);
-      // update the result 
-      IR_UsesDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (IR::EmitsDefSeq *    result);
-      // update the result 
-      IR_EmitsDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (IR::PublishesDefSeq *    result);
-      // update the result 
-      IR_PublishesDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (IR::ConsumesDefSeq *    result);
-      // update the result 
-      IR_ConsumesDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_create_provides : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_create_provides (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_create_provides (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_provides &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_InterfaceDef_ptr interface_type_;
-      void result (IR::ProvidesDef_ptr    result);
-      // update the result 
-      IR_ProvidesDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_create_uses : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_create_uses (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_InterfaceDef_ptr interface_type,
-        const CORBA::Boolean & is_multiple,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_create_uses (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_uses &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_InterfaceDef_ptr interface_type_;
-      const CORBA::Boolean & is_multiple_;
-      void result (IR::UsesDef_ptr    result);
-      // update the result 
-      IR_UsesDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_create_emits : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_create_emits (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_create_emits (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_emits &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_ValueDef_ptr value_;
-      void result (IR::EmitsDef_ptr    result);
-      // update the result 
-      IR_EmitsDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_create_publishes : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_create_publishes (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_publishes &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_ValueDef_ptr value_;
-      void result (IR::PublishesDef_ptr    result);
-      // update the result 
-      IR_PublishesDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_ComponentDef_create_consumes : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::ComponentDef;
-      TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::ComponentDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_ComponentDef_create_consumes (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &);
-      void operator= (const TAO_ServerRequestInfo_IR_ComponentDef_create_consumes &);
-  
-    private:
-      POA_IR::ComponentDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_ValueDef_ptr value_;
-      void result (IR::ConsumesDef_ptr    result);
-      // update the result 
-      IR_ConsumesDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -26761,7 +18796,7 @@ class _TAO_ComponentDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_ComponentDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_InterfaceDefSeq * supported_interfaces   (
       CORBA_Object *_collocated_tao_target_,
@@ -27667,118 +19702,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::PrimaryKeyDef;
-      TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::PrimaryKeyDef *tao_impl
-        ,
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &);
-      void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a &);
-    
-    private:
-      POA_IR::PrimaryKeyDef *_tao_impl;
-      const char * primary_key_id_;
-      void result (CORBA::Boolean      result);
-      // update the result 
-      CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::PrimaryKeyDef;
-      TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::PrimaryKeyDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-  
-    private:
-      POA_IR::PrimaryKeyDef *_tao_impl;
-      void result (IR::ValueDef_ptr    result);
-      // update the result 
-      IR_ValueDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -27841,7 +19764,7 @@ class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void);
   
     virtual CORBA::Boolean is_a   (
       CORBA_Object *_collocated_tao_target_,
@@ -28287,14 +20210,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -28357,7 +20272,7 @@ class _TAO_FactoryDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_FactoryDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -28862,14 +20777,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -28932,7 +20839,7 @@ class _TAO_FinderDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_FinderDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void);
   
 };
 
@@ -29707,501 +21614,6 @@ private:
         CORBA::Environment &env =
           TAO_default_environment ()
       );
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ServerRequestInfo_IR_HomeDef_base_home_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_base_home_get (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_base_home_get &);
-    
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      void result (IR::HomeDef_ptr      result);
-      // update the result 
-      IR_HomeDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_managed_component_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_managed_component_get &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      void result (IR::ComponentDef_ptr    result);
-      // update the result 
-      IR_ComponentDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_primary_key_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_primary_key_get &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      void result (IR::PrimaryKeyDef_ptr    result);
-      // update the result 
-      IR_PrimaryKeyDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_factories_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_factories_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_factories_get (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_factories_get &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      void result (IR::FactoryDefSeq *    result);
-      // update the result 
-      IR_FactoryDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_finders_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_finders_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_finders_get (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_finders_get &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      void result (IR::FinderDefSeq *    result);
-      // update the result 
-      IR_FinderDefSeq *  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_is_basic_get : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_is_basic_get &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      void result (CORBA::Boolean    result);
-     // update the result 
-    CORBA::Boolean  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_create_primary_key : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_create_primary_key (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_primary_key &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      IR_ValueDef_ptr primary_key_;
-      void result (IR::PrimaryKeyDef_ptr    result);
-      // update the result 
-      IR_PrimaryKeyDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_create_factory : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_create_factory (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_create_factory (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_factory &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      const IR_ParDescriptionSeq & params_;
-      const IR_ExceptionDefSeq & exceptions_;
-      void result (IR::FactoryDef_ptr    result);
-      // update the result 
-      IR_FactoryDef_ptr  _result;
-    };
-
-    class TAO_ServerRequestInfo_IR_HomeDef_create_finder : public TAO_ServerRequestInfo
-    {
-    public:
-      friend class POA_IR::HomeDef;
-      TAO_ServerRequestInfo_IR_HomeDef_create_finder (
-        TAO_ServerRequest &_tao_server_request,
-        POA_IR::HomeDef *tao_impl
-        ,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV =
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual char * target_most_derived_interface (
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-      virtual CORBA::Boolean target_is_a (
-          const char * id,
-          CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-        ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  
-    private:
-      TAO_ServerRequestInfo_IR_HomeDef_create_finder (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &);
-      void operator= (const TAO_ServerRequestInfo_IR_HomeDef_create_finder &);
-  
-    private:
-      POA_IR::HomeDef *_tao_impl;
-      const char * id_;
-      const char * name_;
-      const char * version_;
-      const IR_ParDescriptionSeq & params_;
-      const IR_ExceptionDefSeq & exceptions_;
-      void result (IR::FinderDef_ptr    result);
-      // update the result 
-      IR_FinderDef_ptr  _result;
-    };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
   };
 
 ///////////////////////////////////////////////////////////////////////
@@ -30264,7 +21676,7 @@ class _TAO_HomeDef_ThruPOA_Proxy_Impl :
 public:
   _TAO_HomeDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void);
   
     virtual IR_HomeDef_ptr base_home   (
       CORBA_Object *_collocated_tao_target_,
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.BE b/TAO/orbsvcs/IFR_Service/Makefile.BE
index 228f231021f..f4faa48c355 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.BE
+++ b/TAO/orbsvcs/IFR_Service/Makefile.BE
@@ -12,8 +12,8 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS     += -lTAO_IDL_FE_DLL -lTAO_IFR_Client -lTAO
-ACE_SHLIBS += -lTAO_IDL_FE_DLL -lTAO_IFR_Client -lTAO -lACE
+LDLIBS += -lTAO_IFR_Client -lTAO_IDL_FE_DLL -lTAO
+ACE_SHLIBS += -lTAO_IDL_FE_DLL -lACE
 
 VPATH = .
 
@@ -53,7 +53,6 @@ include $(TAO_ROOT)/taoconfig.mk
 #----------------------------------------------------------------------------
 
 CPPFLAGS += -I../../TAO_IDL/include -I../../TAO_IDL/fe
-LDFLAGS += -I$(TAO_ROOT)/tao
 
 realclean: clean
 
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service
index a08699d242d..990123512e2 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service
+++ b/TAO/orbsvcs/IFR_Service/Makefile.IFR_Service
@@ -130,8 +130,8 @@ include $(TAO_ROOT)/taoconfig.mk
 #----------------------------------------------------------------------------
 
 
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -I$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
 
 IFR_Service: $(addprefix $(VDIR),$(IFR_SVR_OBJS))
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory b/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory
index 3af96111531..e18d6b7b71c 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory
+++ b/TAO/orbsvcs/IFR_Service/Makefile.TypeCodeFactory
@@ -13,7 +13,6 @@ ifndef TAO_ROOT
 endif # ! TAO_ROOT
 
 LDLIBS = -lTAO_IFR_Client -lTAO -lACE
-ACE_SHLIBS += -lTAO_IFR_Client -lTAO -lACE
 
 LIBNAME = libTypeCodeFactory_DLL
 LIB = $(LIBNAME).a
@@ -42,8 +41,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS += -I$(TAO_ROOT)/tao
-
 realclean: clean
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
diff --git a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor b/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor
index 16db779f639..528cd754f59 100644
--- a/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor
+++ b/TAO/orbsvcs/IFR_Service/TAO_IFR_BE_DLL.bor
@@ -24,7 +24,6 @@ TAO_IFR_BE_DLLFLAG=1
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_IFR_CLIENT_CFLAGS) \
 	$(TAO_IDL_FE_CFLAGS) \
 	-DTAO_IFR_BE_HAS_DLL=$(TAO_IFR_BE_DLLFLAG) \
 	-DTAO_IFR_BE_BUILD_DLL
@@ -34,7 +33,6 @@ CPPDIR = .
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_IFR_CLIENT_LIB) \
 	$(TAO_IDL_FE_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor
index 4443c5ac2a3..5166a8b3d1e 100644
--- a/TAO/orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor
+++ b/TAO/orbsvcs/IFR_Service/TypeCodeFactory_DLL.bor
@@ -19,7 +19,6 @@ CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
 	$(TAO_PORTABLESERVER_CFLAGS) \
-	$(TAO_IFR_CLIENT_CFLAGS) \
 	-DTCF_HAS_DLL=$(TCF_DLLFLAG) \
 	-DTCF_BUILD_DLL
 
@@ -28,7 +27,6 @@ CPPDIR = .
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB) \
-	$(TAO_IFR_CLIENT_LIB)
+	$(TAO_PORTABLESERVER_LIB)
 
 !include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
diff --git a/TAO/orbsvcs/IFR_Service/tao_ifr.bor b/TAO/orbsvcs/IFR_Service/tao_ifr.bor
index 764da5f2bd8..2ab73b9a6dc 100644
--- a/TAO/orbsvcs/IFR_Service/tao_ifr.bor
+++ b/TAO/orbsvcs/IFR_Service/tao_ifr.bor
@@ -20,14 +20,12 @@ TAO_IFR_BE_DLLFLAG=1
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
-	$(TAO_IFR_CLIENT_CFLAGS) \
 	$(TAO_IDL_FE_CFLAGS) \
 	-DTAO_IFR_BE_HAS_DLL=$(TAO_IFR_BE_DLLFLAG)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
-	$(TAO_IFR_CLIENT_LIB) \
 	$(TAO_IDL_FE_LIB) \
 	$(CORE_BINDIR)\TAO_IFR_BE_DLL$(LIB_DECORATOR).lib
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 4e68872836d..53f40394a6a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -69,55 +69,36 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
     ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest))
 {
   TAO_ENV_ARG_DEFN;
-
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
-  ACE_TString ior;
-  CORBA::Object_ptr forward_obj = CORBA::Object::_nil ();
+  // Activate.
 
-  ACE_TRY
-    {
-      // Activate.
-  
-      ior = this->imr_impl_->activate_server_i (poa->the_name (),
-                                                1,
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  ACE_TString ior;
 
-      // Add the key
+  ior = this->imr_impl_->activate_server_i (poa->the_name (),
+                                            1,
+                                            ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
 
-      char *key_str = 0;
+  // Add the key
 
-      // Unlike POA Current, this implementation cannot be cached.
-      TAO_POA_Current *tao_current = 
-        ACE_dynamic_cast(TAO_POA_Current*, this->poa_current_var_.in ());
-      TAO_POA_Current_Impl *impl = tao_current->implementation ();
-      TAO_ObjectKey::encode_sequence_to_string (key_str,
-                                                impl->object_key ());
+  char *key_str = 0;
 
-      ior += key_str;
-      CORBA::string_free (key_str);
+  // Unlike POA Current, this implementation cannot be cached.
+  TAO_POA_Current *tao_current = 
+    ACE_dynamic_cast(TAO_POA_Current*, this->poa_current_var_.in ());
+  TAO_POA_Current_Impl *impl = tao_current->implementation ();
+  TAO_ObjectKey::encode_sequence_to_string (key_str,
+                                            impl->object_key ());
 
-      if (OPTIONS::instance()->debug () >= 2)
-        ACE_DEBUG ((LM_DEBUG, "Forwarding to %s\n", ior.c_str ()));
+  ior += key_str;
+  CORBA::string_free (key_str);
 
-      forward_obj = orb->string_to_object (ior.c_str (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  if (OPTIONS::instance()->debug () >= 2)
+    ACE_DEBUG ((LM_DEBUG, "Forwarding to %s\n", ior.c_str ()));
 
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "Forwarder system exception");
-      ACE_RE_THROW;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Forwarder exception");
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-          CORBA_SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-          CORBA::COMPLETED_NO));
-    }
-  ACE_ENDTRY;
+  CORBA::Object_ptr forward_obj =
+    orb->string_to_object (ior.c_str (), ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   if (!CORBA::is_nil (forward_obj))
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
index 53aabcd739f..b069060f1db 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
@@ -5,7 +5,7 @@
 #include "ImplRepo_i.h"
 #include "NT_Service.h"
 
-int
+int 
 run_standalone (void)
 {
   ImplRepo_i server;
@@ -27,7 +27,7 @@ run_standalone (void)
 
           status = server.fini (ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
+          
           if (status == -1)
             return 1;
         }
@@ -48,7 +48,7 @@ run_standalone (void)
       return 1;
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
@@ -66,7 +66,7 @@ run_service (void)
   // being called from the service manager to start the service.
 
   ACE_NT_SERVICE_RUN (service, SERVICE::instance (), ret);
-
+  
   if (ret == 0)
     ACE_ERROR ((LM_ERROR, "%p\n", "Couldn't start service"));
 
@@ -80,7 +80,7 @@ int
 main (int argc, char *argv[])
 {
   int result = OPTIONS::instance ()->init (argc, argv);
-
+  
   if (result < 0)
     return 1;  // Error parsing args
   else if (result > 0)
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 88fe398bba8..2bee0a652ac 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -189,8 +189,8 @@ ImplRepo_i::activate_server_i (const char *server,
       // Make sure the activation allows us to start it up.
       if (activation == ImplementationRepository::MANUAL && check_startup)
         ACE_THROW_RETURN (CORBA::TRANSIENT (
-            CORBA_SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 
-                                                    0),
+            CORBA_SystemException::_tao_minor_code (
+              TAO_IMPLREPO_SERVER_MANUAL_ACTIVATION, 0),
             CORBA::COMPLETED_NO),
           "");
 
@@ -648,7 +648,7 @@ ImplRepo_i::server_is_running (const char *server,
     ACE_DEBUG ((LM_DEBUG, " at %s\n", location));
 
   // Get the stringified server_object_ior
-  ACE_TCHAR *server_object_ior = orb->object_to_string (server_object,
+  ACE_TCHAR *server_object_ior = orb->object_to_string (server_object, 
                                                         ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
@@ -986,13 +986,13 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
 {
   CORBA::ORB_var orb = OPTIONS::instance ()->orb ();
 
-  PortableServer::POAManager_var poa_manager =
+  PortableServer::POAManager_var poa_manager = 
     this->imr_poa_->the_POAManager (ACE_TRY_ENV);
   poa_manager->activate (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   // Get a new iterator
-  auto_ptr<Server_Repository::HASH_IMR_ITER>
+  auto_ptr<Server_Repository::HASH_IMR_ITER> 
     server_iter (this->repository_.new_iterator ());
 
   // Check for a memory error.
@@ -1010,7 +1010,7 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
       server_iter->advance ();
 
       ACE_TString logical, server, command_line, working_directory;
-      ImplementationRepository::ActivationMode activation
+      ImplementationRepository::ActivationMode activation 
         = ImplementationRepository::NORMAL;
       ImplementationRepository::EnvironmentList environment_vars ;
 
@@ -1042,9 +1042,13 @@ ImplRepo_i::run (CORBA::Environment &ACE_TRY_ENV)
     }
 
 
-  orb->run (0, ACE_TRY_ENV);
+  int status = orb->run (0, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  if (status == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error: In IMR_Server_i::run"),
+                      -1);
   return 0;
 }
 
@@ -1162,7 +1166,7 @@ ImplRepo_i::list (CORBA::ULong how_many,
       ACE_TString location, server_ior;
 
       ImplementationRepository::EnvironmentList environment_vars;
-      ImplementationRepository::ActivationMode activation =
+      ImplementationRepository::ActivationMode activation = 
         ImplementationRepository::NORMAL;
 
       server_entry->int_id_->get_running_info (location, server_ior);
@@ -1251,7 +1255,7 @@ ImplRepo_i::shutdown_server (const char *server,
           ACE_TRY_CHECK;
 
           ImplementationRepository::ServerObject_var server_object =
-            ImplementationRepository::ServerObject::_narrow (object.in (),
+            ImplementationRepository::ServerObject::_narrow (object.in (), 
                                                              ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
@@ -1288,6 +1292,6 @@ ImplRepo_i::shutdown_server (const char *server,
 template class auto_ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >;
 template class ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate auto_ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >
+#pragma instantiate auto_ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex> >;
+#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Hash_Map_Iterator_Ex<ACE_TString, Server_Info *,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/NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
index 80505d90f52..0c188c69d5c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
@@ -6,8 +6,8 @@
  *
  *  @author Darrell Brunsch <brunsch@cs.wustl.edu>
  *  @author Jeff Parsons <parsons@cs.wustl.edu>
- *  @author John Tucker <jtucker@infoglide.com>
- *  @author Mike Vitalo <mvitalo@infoglide.com>
+ *  @author John Tucker <jtucker@infoglide.com> 
+ *  @author Mike Vitalo <mvitalo@infoglide.com>   
  */
 //=============================================================================
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/README.txt b/TAO/orbsvcs/ImplRepo_Service/README.txt
index 684a2ccf9a2..3f718822210 100644
--- a/TAO/orbsvcs/ImplRepo_Service/README.txt
+++ b/TAO/orbsvcs/ImplRepo_Service/README.txt
@@ -30,8 +30,6 @@ as the specification for TAO's ImR.
 
 @ref ntservice - Running the ImR as a NT Service
 
-@ref imrandnaming - Using the Naming Service with the Implmentation Repository
-
 @section authors Authors
 
 The guy currently in charge of the ImR is Darrell Brunsch
@@ -354,34 +352,4 @@ a service) it will use these options.
 
 */
 
-/**
-@page imrandnaming Naming Service
-
-@subsection lowdown The Short Answer
-
-Register the Naming Service with an Implementation Repository using the
-POA name "NameService".  So for example:
-
-<CODE>tao_imr add NameService -c "Naming_Service -ORBUseIMR 1"</CODE>
-
-And then an IOR can be created by:
 
-<CODE>tao_imr ior NameService</CODE>
-
-The above commands depend on multicast (since the commands are shorter and
-easier put in documents).  You might need to add "-ORBInitRef 
-ImplRepoService=..." for a more robust solution.
-
-@subsection details Various Details
-
-The Naming Service in TAO contains one persistant POA named "NameService".  
-If -ORBUseIMR 1 is passed to it, it will communicate with the ImR as any 
-other persistent POA does.  Also, the Naming Service recognizes the INS
-object key "NameService".  This allows you to use the "tao_imr ior"
-command to create corbaloc IORS
-
-NameService was chosen because resolve_initial_references () uses that 
-name.  And that allows us to do interesting things with ORBDefaultInitRef
-(as shown in the @ref defaultinitref section).
-
-*/
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index cb26d5b25fe..96a638d5aa8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -732,9 +732,9 @@ TAO_IMR_Op_IOR::run (void)
           || !this->implrepo_->_stubobj ()->profile_in_use ())
         {
           ACE_ERROR_RETURN ((
-              LM_ERROR,
+              LM_ERROR, 
               ACE_TEXT ("Invalid Implementation Repository IOR\n")
-            ),
+            ), 
             -1
           );
         }
@@ -743,10 +743,10 @@ TAO_IMR_Op_IOR::run (void)
         this->implrepo_->_stubobj ()->profile_in_use ()->to_string (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      char *pos = ACE_OS::strstr (imr_str.inout (),
+      char *pos = ACE_OS::strstr (imr_str.inout (), 
                                   "://");
 
-      pos =
+      pos = 
         ACE_OS::strchr (
             pos + 3,
             this->implrepo_->_stubobj ()->profile_in_use ()->object_key_delimiter ()
@@ -758,8 +758,8 @@ TAO_IMR_Op_IOR::run (void)
         }
       else
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Could not parse IMR IOR\n"),
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             "Could not parse IMR IOR\n"), 
                             -1);
         }
 
@@ -768,25 +768,25 @@ TAO_IMR_Op_IOR::run (void)
       // Add the key
       ior += this->server_name_;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n",
+      ACE_DEBUG ((LM_DEBUG, 
+                  "%s\n", 
                   ior.c_str ()));
 
       if (this->filename_.length () > 0)
         {
-          FILE *file = ACE_OS::fopen (this->filename_.c_str (),
+          FILE *file = ACE_OS::fopen (this->filename_.c_str (), 
                                       "w");
 
           if (file == 0)
             {
               ACE_ERROR_RETURN ((LM_ERROR,
                                  "Error: Unable to open %s for writing: %p\n",
-                                 this->filename_.c_str ()),
+                                 this->filename_.c_str ()), 
                                 -1);
             }
 
-          ACE_OS::fprintf (file,
-                           "%s",
+          ACE_OS::fprintf (file, 
+                           "%s", 
                            ior.c_str ());
           ACE_OS::fclose (file);
         }
@@ -1104,10 +1104,10 @@ TAO_IMR_Op::display_server_information (const ImplementationRepository::ServerIn
     ACE_DEBUG ((LM_DEBUG, "Environment Variable: %s=%s \n",
                 info.startup.environment[i].name.in (),
                 info.startup.environment[i].value.in ()));
-
+ 
   // @@ add logical server once implemented
 
-
+ 
   if (info.startup.activation == ImplementationRepository::PER_CLIENT)
     ACE_DEBUG ((LM_DEBUG, "  No running info available for PER_CLIENT mode\n"));
   else if (ACE_OS::strlen (info.location) > 0)
@@ -1131,3 +1131,6 @@ TAO_IMR_Op_List::display_server_information (const ImplementationRepository::Ser
   else
     ACE_DEBUG ((LM_DEBUG, "<%s>\n", info.server.in ()));
 }
+
+
+
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 361f97ff360..34e3c9a5734 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -140,13 +140,17 @@ Life_Cycle_Service_Server::init (int argc,
 int
 Life_Cycle_Service_Server::run (CORBA::Environment &ACE_TRY_ENV)
 {
+  ACE_UNUSED_ARG (ACE_TRY_ENV);
+
   if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "\nLifeCycle Service: Life_Cycle_Service_Server is running\n"));
-
-  orb_manager_.orb()->run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  
+  if (orb_manager_.orb()->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "run"),
+                      -1);
   return 0;
 }
 
@@ -168,7 +172,7 @@ Life_Cycle_Service_Server::parse_args (void)
         break;
       default:
         exit_code = 1;
-        ACE_ERROR ((LM_ERROR,
+        ACE_ERROR ((LM_ERROR, 
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
       case '?':
@@ -214,3 +218,5 @@ main (int argc, char *argv [])
   ACE_ENDTRY;
   return 0;
 }
+
+
diff --git a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
index 348999b826d..a78aac121ae 100644
--- a/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Logging_Service.cpp
@@ -112,18 +112,8 @@ int
 Logging_Service::run (void)
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the Telecom Log Service\n", __FILE__));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
+  if (this->orb_->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile
index a6115c793d3..a35e0c2510e 100644
--- a/TAO/orbsvcs/Makefile
+++ b/TAO/orbsvcs/Makefile
@@ -40,11 +40,7 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU
 
 ifeq ($(minimum_corba),0)
   ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    ifneq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
-      ifeq ($(LYNXTARGET),)
-        DIRS += IFR_Service
-      endif # LYNXTARGET
-    endif # findstring Compilers 4.2
+    DIRS += IFR_Service
   endif # ACE_HAS_GNUG_PRE_2_8
 endif # minimum_corba
 
diff --git a/TAO/orbsvcs/Makefile.bor b/TAO/orbsvcs/Makefile.bor
index 287561e05b1..8d2cc296003 100644
--- a/TAO/orbsvcs/Makefile.bor
+++ b/TAO/orbsvcs/Makefile.bor
@@ -6,12 +6,10 @@ DIRS = \
 	orbsvcs \
 	CosEvent_Service \
 	Event_Service \
-	IFR_Service \
 	ImplRepo_Service \
 	LoadBalancer \
 	Naming_Service \
 	Notify_Service \
-	TAO_Service \
 	Time_Service \
 	Trading_Service
 
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index 17060ad4cc0..b256d5153ee 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -12,7 +12,7 @@
 //
 // = DESCRIPTION
 //    Driver program that runs the TAO Naming Service as a Windows NT
-//    Service.
+//    Service. 
 //
 // = AUTHORS
 //    John Tucker <jtucker@infoglide.com> and
@@ -99,7 +99,7 @@ void
 Options::parse_args (int argc, char *argv[])
 {
   ACE_Get_Opt get_opt (argc, argv, "i:rskt:d");
-  int c;
+  int c; 
 
   while ((c = get_opt ()) != -1)
     switch (c)
@@ -199,12 +199,13 @@ Options::run (int argc, char* argv[])
                     "%p\n",
                     "Couldn't start service"));
     }
-
+  
   return 0;
 }
 
 int
 main (int argc, char *argv[])
-{
+{	
   return OPTIONS::instance ()->run (argc, argv);
 }
+
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.dsp
index 0d3054c40eb..27ec80d241a 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.dsp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=NT_Naming_Service - Win32 Release

+CFG=NT_Naming_Service - Win32 Alpha Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,10 +14,12 @@ CFG=NT_Naming_Service - Win32 Release
 !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 "NT_Naming_Service.mak" CFG="NT_Naming_Service - Win32 Release"

+!MESSAGE NMAKE /f "NT_Naming_Service.mak" CFG="NT_Naming_Service - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

+!MESSAGE "NT_Naming_Service - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "NT_Naming_Service - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "NT_Naming_Service - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "NT_Naming_Service - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

@@ -25,10 +28,66 @@ CFG=NT_Naming_Service - Win32 Release
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Naming_0"

+# PROP BASE Intermediate_Dir "Naming_0"

+# PROP BASE Ignore_Export_Lib 0

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

 CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT CPP /YX

 RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 orbsvcs.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_CosNaming.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Naming_S"

+# PROP BASE Intermediate_Dir "Naming_S"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /MDd /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 TAOd.lib TAO_CosNamingd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib TAO_CosNamingd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

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

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -41,9 +100,11 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -66,9 +127,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -82,6 +145,8 @@ LINK32=link.exe
 

 # Begin Target

 

+# Name "NT_Naming_Service - Win32 Alpha Release"

+# Name "NT_Naming_Service - Win32 Alpha Debug"

 # Name "NT_Naming_Service - Win32 Release"

 # Name "NT_Naming_Service - Win32 Debug"

 # Begin Group "Source Files"

@@ -90,14 +155,47 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\Naming_Service.cpp

+

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

+

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

+

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

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Naming_Server.cpp

+

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

+

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

+

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

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Naming_Service.cpp

+

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

+

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

+

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

+

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

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 994984ed13c..175787dd765 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -91,7 +91,7 @@ TAO_Naming_Service::parse_args (int argc,
             for (i = count_argv; i != argc; ++i)
               argv [i] = argv [i+2];
           }
-
+          
           // Decrement the value of this->argc_ to reflect the removal
           // of '-t' option.
           argc = argc-2;
@@ -111,19 +111,21 @@ TAO_Naming_Service::parse_args (int argc,
 int
 TAO_Naming_Service::run (CORBA_Environment& ACE_TRY_ENV)
 {
+  int result;
+
   if (time_ == 0)
     {
-      this->orb_->run (ACE_TRY_ENV);
+      result = this->orb_->run (ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
     }
   else
     {
       ACE_Time_Value tv (time_);
-      this->orb_->run (tv, ACE_TRY_ENV);
+      result = this->orb_->run (tv, ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
     }
 
-  return 0;
+  return result;
 }
 
 // Destructor.
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
index 6fa48152d4b..a536640a79e 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
@@ -3,6 +3,7 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

 CFG=Naming_Service - Win32 Debug

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

@@ -17,6 +18,8 @@ CFG=Naming_Service - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

+!MESSAGE "Naming_Service - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "Naming_Service - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Naming_Service - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Naming_Service - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

@@ -25,10 +28,66 @@ CFG=Naming_Service - Win32 Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Naming_0"

+# PROP BASE Intermediate_Dir "Naming_0"

+# PROP BASE Ignore_Export_Lib 0

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

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 orbsvcs.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAO_CosNaming.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Naming_S"

+# PROP BASE Intermediate_Dir "Naming_S"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

 CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /MDd /c

+# SUBTRACT CPP /YX

 RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 TAOd.lib TAO_CosNamingd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib TAO_CosNamingd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

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

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -41,9 +100,11 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "..\.." /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -66,9 +127,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /I "..\.." /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -82,6 +145,8 @@ LINK32=link.exe
 

 # Begin Target

 

+# Name "Naming_Service - Win32 Alpha Release"

+# Name "Naming_Service - Win32 Alpha Debug"

 # Name "Naming_Service - Win32 Release"

 # Name "Naming_Service - Win32 Debug"

 # Begin Group "Source Files"

@@ -90,10 +155,32 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\Naming_Server.cpp

+

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

+

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

+

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

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming_Service.cpp

+

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

+

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

+

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

+

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

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/orbsvcs/Notify_Service/Makefile b/TAO/orbsvcs/Notify_Service/Makefile
index 953f6be0e5e..8925f95d63a 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile
+++ b/TAO/orbsvcs/Notify_Service/Makefile
@@ -6,7 +6,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosNotification  -lTAO_CosNaming -lTAO_DynamicAny -lTAO_IORTable -lTAO_PortableServer -lTAO
 
 LSRC = Notify_Service.cpp
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 45d7b741fa0..1422e94f302 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -60,6 +60,16 @@ Notify_Service::init_ORB  (int& argc, char *argv [],
   poa_manager->activate (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  if (this->nthreads_ > 0) // we have chosen to run in a thread pool.
+    {
+      ACE_DEBUG ((LM_DEBUG, "Running %d server threads\n", this->nthreads_));
+      worker_.orb (this->orb_.in ());
+
+      if (worker_.activate (THR_NEW_LWP | THR_JOINABLE,
+                            this->nthreads_) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot activate client threads\n"), -1);
+    }
   return 0;
 }
 
@@ -77,16 +87,6 @@ Notify_Service::startup (int argc, char *argv[],
   if (this->parse_args(argc, argv) != 0)
     return -1;
 
-  if (this->nthreads_ > 0) // we have chosen to run in a thread pool.
-    {
-      ACE_DEBUG ((LM_DEBUG, "Running %d server threads\n", this->nthreads_));
-      worker_.orb (this->orb_.in ());
-
-      if (worker_.activate (THR_NEW_LWP | THR_JOINABLE,
-                            this->nthreads_) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"), -1);
-    }
   // Check first if the naming service
   if (this->use_name_svc_)
     {
@@ -234,22 +234,9 @@ Notify_Service::run (void)
               __FILE__));
 
   if (this->nthreads_ > 0)
-    {
-      worker_.thr_mgr ()->wait ();
-      return 0;
-    }
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
-    }
-  ACE_ENDTRY;
+    worker_.thr_mgr ()->wait ();
+  else if (this->orb_->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
 
   return 0;
 }
@@ -362,8 +349,6 @@ Notify_Service::parse_args(int argc, char *argv[])
         }
       else
         {
-          /*ACE_DEBUG((LM_DEBUG, "Unrecognized command %s",
-            arg_shifter.get_current ()));*/
             arg_shifter.ignore_arg ();
         }
     }
@@ -385,16 +370,7 @@ Worker::orb (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  this->orb_->run ();
   return 0;
 }
 
diff --git a/TAO/orbsvcs/Notify_Service/README b/TAO/orbsvcs/Notify_Service/README
index d329b54cf54..3a32ca42431 100644
--- a/TAO/orbsvcs/Notify_Service/README
+++ b/TAO/orbsvcs/Notify_Service/README
@@ -42,7 +42,7 @@ Command line arguments:
 "-Notify_TPReactor [threads]": Tells the Notify Service that the ORB
                                will use a TP reactor and specifies the
                                number of worker threads to utilize.
-
+  
 
 Note that the svc.conf file must instruct the oRB to use a TP reactor
 e.g. static Resource_Factory "-ORBReactorType tp -ORBReactorMaskSignals 0"
@@ -80,70 +80,26 @@ The svc.conf options:
 
 The "Notify_Default_Event_Manager_Objects_Factory" service object accepts the following options:
 
-"-MTDispatching"                     : Enable MT dispatching
+"-MTDispatching"                     : Enable MT dispatching 
 "-DispatchingThreads [thread_count]" : How many threads for MT dispatching.
-"-MTSourceEval"                      : Enable MT proxy consumer(source) filter evaluation.
+"-MTSourceEval"                      : Enable MT proxy consumer(source) filter evaluation. 
 "-SourceThreads [thread_count]"      : How many threads for source filter evaluation.
 "-MTLookup"                          : Enable MT subscription table lookup.
 "-LookupThreads [thread_count]"      : How many lookup threads.
-"-MTListenerEval"                    : Enable MT proxy supplier (listener) filter evaluation.
+"-MTListenerEval"                    : Enable MT proxy supplier (listener) filter evaluation.  
 "-ListenerThreads"                   : How many threads for listener filter evaluation.
 "-Notify_TPReactor [threads]"        : Tells the service that the ORB
                                        is using a TP reactor and
                                        specifies the number of worker
-                                       threads to deploy.
+                                       threads to deploy.   
                                        Note that you might have to
-                                       specify  the TP reactor in the
+                                       specify  the TP reactor in the 
                                        svc.conf file.
                                        (see the ORB configutrations
                                        for details on this)
-
-"-AsynchUpdates"                     : Send subscription and
-                                       publication updates asynchronously.
-
-"-AllocateTaskperProxy"              : Allocate worker tasks per
-                                       proxy for the following
-                                       options:
-                                       "-MTDispatching",
-                                       "-MTSourceEval"
-                                       "-MTListenerEval"
-                                       *see footnote below for explaination*
-
 e.g. svc.conf
 static Notify_Default_Event_Manager_Objects_Factory "-MTSourceEval -MTDispatching -DispatchingThreads 2"
 
 This means that we want to enable MT proxy supplier filter evaluation
 (default 1 thread) and MT event dispatching with 2 threads.
 
-----------------------------------------------------------------
-What does the "-AllocateTaskperProxy" option do?
-
-A Task here implies a thread pool that performs a fixed work in the
-Notify.
-e.g. When you specify "-MTDispatching" and set "DispatchingThreads 1".
-It means that there is 1 thread to perform the event dispatching to
-consumers IRRESPECTIVE OF THE NUMBER OF PROXYSUPPLIERS.
-This is the default case.
-
-When you specify "-AllocateTaskperProxy" it asks notify to create a
-dispatching task (with the specified thread pool size) PER
-PROXYSUPPLIER. So if you use this option and connect 50 consumers with
-1 thread for the dispaching task you will have created 50 dispatching
-threads! so use this option with care and you might not need it in
-most cases.
-
-why have this feature in the first place?  The intent is to allow the
-software architect of a Notify based system, fine control over where
-and how much thread resources are deployed.  e.g. a channel could have
-2 proxy suppliers - the first one delivers an important event in huge
-quantities.  A dedicated thread pool to this proxy will ensure better
-throughput to it's consumers. (Eventually i want to be able to set the
-thread pool size via a QoS property)
-
-Similarly, the "-MTSourceEval" specifies a thread pool for the filter
-evauation at the proxyconsumer ("Source").
-and the "-MTListenerEval" specifies a thread pool for the filter
-evauation at the proxyconsumer ("Listener").
-
-thanks,
-Pradeep <pradeep@cs.wustl.edu>
diff --git a/TAO/orbsvcs/Notify_Service/svc.conf b/TAO/orbsvcs/Notify_Service/svc.conf
index 4e5403f39ac..fe67b17f840 100644
--- a/TAO/orbsvcs/Notify_Service/svc.conf
+++ b/TAO/orbsvcs/Notify_Service/svc.conf
@@ -1 +1,2 @@
-static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1"
+static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching"
+
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index 294b17669b9..d1f4d94cd4f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -9,7 +9,7 @@ LSRC =  $(SCHEDULE_SRCS)
 
 SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming  -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 BIN2 = Scheduling_Service
 
diff --git a/TAO/orbsvcs/TAO_Service/Makefile.bor b/TAO/orbsvcs/TAO_Service/Makefile.bor
deleted file mode 100644
index 6fa15ac550c..00000000000
--- a/TAO/orbsvcs/TAO_Service/Makefile.bor
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Makefile for building the TAO_Service executable
-#
-
-NAME = TAO_Service
-
-OBJFILES = \
-	$(OBJDIR)\TAO_Service.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB)
-
-CPPDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_exe.bor>
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index bb65dbab941..3bd28dcf4ab 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -334,3 +334,4 @@ Server_i::run (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (0);
   return 0;
 }
+
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index b0deec77fad..746c330ebb3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -239,17 +239,8 @@ int
 RtEC_Based_CosEC::run (void)
 {
   ACE_DEBUG ((LM_DEBUG, "%s: Running the CosEventService\n", __FILE__));
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
-    }
-  ACE_ENDTRY;
+  if (this->orb_->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 63f8931ea7e..839d6b7c10c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -128,17 +128,8 @@ Multiple::init_CosEC (void)
 int
 Multiple::runORB (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
-    }
-  ACE_ENDTRY;
+  if (this->orb_->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
index 6e98ae48afb..4f01508323f 100755
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test.pl
@@ -6,11 +6,16 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../../../../bin";
-use PerlACE::Run_Test;
+
+require ACEutils;
+use Cwd;
 
 #event count
 $ev_count = 20;
 $status = 0;
+$port = ACE::uniqueid () + 10001;  # This can't be 10000 on Chorus 4.0
+
+ACE::checkForTarget(getcwd());
 
 # setup CosEC params such that..
 # cos event service name = "cosec1"
@@ -24,155 +29,155 @@ $CosEC1_params = "-n cosec1 -e 21 -o 6 -p \"5 20\"";
 # for SupplierQOS: EventID = 21, SourceID = 6.
 $CosEC2_params = "-n cosec2 -e 20 -o 5 -p \"6 21\"";
 
-$nsior = PerlACE::LocalFile ("ns.ior");
-
-unlink $nsior;
-
-# Parse the arguments
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "usage: run_test.pl -e event_count -h help\n";
-        exit;
+sub cosec_multiple_test1
+{
+    # first start the Naming service..
+    $SV1 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."Naming_Service".$DIR_SEPARATOR
+			    ."Naming_Service".$EXE_EXT,
+                            "-o ns.ior");
+
+    sleep 10;
+
+    # now start the Rt EC..
+    $SV2 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."Event_Service".$DIR_SEPARATOR
+			    ."Event_Service".$EXE_EXT,
+			    "-t new -ORBInitRef NameService=file://ns.ior");
+
+    sleep 10;
+
+    # now start the CosEC1..
+    $SV3 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."bin".$DIR_SEPARATOR
+			    ."RtEC_Based_CosEC".$EXE_EXT,
+			    "-ORBInitRef NameService=file://ns.ior"
+			    ." $CosEC1_params");
+
+    sleep 10;
+
+    # now start the CosEC2..
+    $SV4 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."bin".$DIR_SEPARATOR
+			    ."RtEC_Based_CosEC".$EXE_EXT,
+			    "-ORBInitRef NameService=file://ns.ior"
+			    ." $CosEC2_params");
+
+    sleep 10;
+
+    #start 1 consumer that uses CosEC1 to receive events
+    $CONS = Process::Create ($EXEPREFIX."Consumer".$EXE_EXT,
+			     "-ORBInitRef NameService=file://ns.ior"
+                             ." -n cosec1 -c $ev_count");
+
+    sleep 10;
+
+    #start 1 supplier  that uses CosEC2 to send events
+    $SUPP = Process::Create ($EXEPREFIX."Supplier".$EXE_EXT,
+			     "-ORBInitRef NameService=file://ns.ior"
+                             ." -n cosec2 -c $ev_count");
+
+    sleep 10;
+
+    #wait for the supplier to finish
+    if ($SUPP->TimedWait (60) == -1) {
+      print STDERR "ERROR: supplier timedout\n";
+      $status = 1;
+      $SUPP->Kill (); $SUPP->TimedWait (1);
     }
-    elsif ($ARGV[$i] eq "-e") {
-        $ev_count = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$NS  = new PerlACE::Process ("../../../../../Naming_Service/Naming_Service", 
-                             "-o $nsior");
-                             
-$EC  = new PerlACE::Process ("../../../../../Event_Service/Event_Service", 
-                             "-t new -ORBInitRef NameService=file://$nsior");
-                             
-$CE1 = new PerlACE::Process ("../../bin/RtEC_Based_CosEC", 
-                             "-ORBInitRef NameService=file://$nsior $CosEC1_params");
-                             
-$CE2 = new PerlACE::Process ("../../bin/RtEC_Based_CosEC", 
-                             "-ORBInitRef NameService=file://$nsior $CosEC2_params");
-                             
-$CO1 = new PerlACE::Process ("Consumer", 
-                             "-ORBInitRef NameService=file://$nsior -n cosec1 -c $ev_count");
-                             
-$SU1 = new PerlACE::Process ("Supplier", 
-                             "-ORBInitRef NameService=file://$nsior -n cosec2 -c $ev_count");
-                             
-$CO2 = new PerlACE::Process ("Consumer", 
-                             "-ORBInitRef NameService=file://$nsior -n cosec2 -c $ev_count");
-                             
-$SU2 = new PerlACE::Process ("Supplier", 
-                             "-ORBInitRef NameService=file://$nsior -n cosec1 -c $ev_count");
-
-# first start the Naming service..
-$NS->Spawn ();
-
-sleep 10;
-
-# now start the Rt EC..
-$EC->Spawn ();
-
-sleep 10;
-
-# now start the CosEC1..
-$CE1->Spawn ();
-
-sleep 10;
-
-# now start the CosEC2..
-$CE2->Spawn ();
-
-sleep 10;
-
-# start 1 consumer that uses CosEC1 to receive events
-$CO1->Spawn ();
-
-sleep 10;
-
-# start 1 supplier  that uses CosEC2 to send events
-$SU1->Spawn ();
-
-sleep 10;
-
-# wait for the supplier to finish
-$supplier = $SU1->WaitKill (60);
-
-if ($supplier != 0) {
-    print STDERR "ERROR: supplier returned $supplier\n";
-    $status = 1;
-}
 
-# wait for the consumer to finish
-$consumer = $CO1->WaitKill (60);
 
-if ($consumer != 0) {
-    print STDERR "ERROR: consumer returned $consumer\n";
-    $status = 1;
-}
-
-#----------
-
-# start 1 consumer that uses CosEC1 to receive events
-$CO2->Spawn ();
-
-sleep 10;
-
-# start 1 supplier  that uses CosEC2 to send events
-$SU2->Spawn ();
-
-sleep 10;
-
-# wait for the supplier to finish
-$supplier = $SU2->WaitKill (60);
-
-if ($supplier != 0) {
-    print STDERR "ERROR: supplier returned $supplier\n";
-    $status = 1;
-}
-
-# wait for the consumer to finish
-
-$consumer = $CO2->WaitKill (60);
-
-if ($consumer != 0) {
-    print STDERR "ERROR: consumer returned $consumer\n";
-    $status = 1;
-}
+    #wait for the consumer to finish
+    if ($CONS->TimedWait (60) == -1) {
+      print STDERR "ERROR: consumer timedout\n";
+      $status = 1;
+      $CONS->Kill (); $CONS->TimedWait (1);
+    }
 
+    #----------
+    #start 1 consumer that uses CosEC1 to receive events
+    $CONS2 = Process::Create ($EXEPREFIX."Consumer".$EXE_EXT,
+			      "-ORBInitRef NameService=file://ns.ior"
+                              ." -n cosec2 -c $ev_count");
 
-#----------
+    sleep 10;
 
-# cleanup..
+    #start 1 supplier  that uses CosEC2 to send events
+    $SUPP2 = Process::Create ($EXEPREFIX."Supplier".$EXE_EXT,
+			      "-ORBInitRef NameService=file://ns.ior"
+                              ." -n cosec1 -c $ev_count");
 
-$server = $CE2->TerminateWaitKill (5);
+    sleep 10;
 
-if ($server != 0) {
-    print STDERR "ERROR: CosEC2 returned $server\n";
-    $status = 1;
-}
+    #wait for the supplier to finish
+    if ($SUPP2->TimedWait (60) == -1) {
+      print STDERR "ERROR: supplier2 timedout\n";
+      $status = 1;
+      $SUPP2->Kill (); $SUPP2->TimedWait (1);
+    }
 
-$CE1->TerminateWaitKill (5);
 
-if ($server != 0) {
-    print STDERR "ERROR: CosEC1 returned $server\n";
-    $status = 1;
-}
-
-$EC->TerminateWaitKill (5);
+    #wait for the consumer to finish
+    if ($CONS2->TimedWait (60) == -1) {
+      print STDERR "ERROR: consumer2 timedout\n";
+      $status = 1;
+      $CONS2->Kill (); $CONS2->TimedWait (1);
+    }
 
-if ($server != 0) {
-    print STDERR "ERROR: EC returned $server\n";
-    $status = 1;
+    #----------
+    # cleanup..
+    $SV1->Terminate ();
+    $SV2->Terminate ();
+    $SV3->Terminate ();
+    $SV4->Terminate ();
+
+    if ($SV1->TimedWait (5) == -1 ||
+        $SV2->TimedWait (5) == -1 ||
+        $SV3->TimedWait (5) == -1 ||
+        $SV4->TimedWait (5)) {
+      $SV1->Kill ();
+      $SV2->Kill ();
+      $SV3->Kill ();
+      $SV4->Kill ();
+      $SV1->TimedWait (1);
+      $SV2->TimedWait (1);
+      $SV3->TimedWait (1);
+      $SV4->TimedWait (1);
+      print STDERR "ERROR: couldn't terminate servers nicely\n";
+      $status = 1;
+    }
 }
 
-$NS->TerminateWaitKill (5);
+# Parse the arguments
 
-if ($server != 0) {
-    print STDERR "ERROR: NS returned $server\n";
-    $status = 1;
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+        print "usage: run_test.pl [-chorus <target>] -e event_count -h help\n";
+        exit;
+    }
+    if ($ARGV[$i] eq "-e")
+    {
+        $ev_count = $ARGV[$i + 1];
+        $i++;
+        last SWITCH;
+    }
+  }
 }
 
-unlink $nsior;
+cosec_multiple_test1 ();
 
 exit $status;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
index 90852c11c68..aace5ca57de 100755
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/run_test2.pl
@@ -6,128 +6,136 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../../../../bin";
-use PerlACE::Run_Test;
+
+require ACEutils;
+use Cwd;
 
 $con_count = 10;
 $sup_count = 10;
 $ev_count = 8;
 $status = 0;
+$port = ACE::uniqueid () + 10001;  # This can't be 10000 on Chorus 4.0
+
+ACE::checkForTarget(getcwd());
+
+sub cosec_multiple_test2
+{
+    # first start the Naming service..
+    $SV1 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."Naming_Service".$DIR_SEPARATOR
+			    ."Naming_Service".$EXE_EXT,
+                            "-o ns.ior");
 
-$nsior = PerlACE::LocalFile ("ns.ior");
-
-unlink $nsior;
-
-# Parse the arguments
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "usage: run_test2.pl -e event_count -c consumers -s suppliers -h help\n";
-        exit;
-    }
-    elsif ($ARGV[$i] eq "-e") {
-        $ev_count = $ARGV[$i + 1];
-        $i++;
-    }
-    elsif ($ARGV[$i] eq "-c") {
-        $con_count = $ARGV[$i + 1];
-        $i++;
-    }
-    elsif ($ARGV[$i] eq "-s") {
-        $sup_count = $ARGV[$i + 1];
-        $i++;
-    }
-}
-
-$NS  = new PerlACE::Process ("../../../../../Naming_Service/Naming_Service", 
-                             "-o $nsior");
-                             
-$EC  = new PerlACE::Process ("../../../../../Event_Service/Event_Service", 
-                             "-t new -ORBInitRef NameService=file://$nsior");
-                             
-$CE1 = new PerlACE::Process ("../../bin/RtEC_Based_CosEC", 
-                             "-ORBInitRef NameService=file://$nsior");
-
-for ($cntr1 = 0; $cntr1 < $con_count ; ++$cntr1) {
-    push @CONS, (new PerlACE::Process ("Consumer", "-ORBInitRef NameService=file://$nsior -c $ev_count"));
-}
-
-for ($cntr2 = 0; $cntr2 < $con_count ; ++$cntr2) {
-    push @SUPS, (new PerlACE::Process ("Supplier", "-ORBInitRef NameService=file://$nsior -c $ev_count"));
-}
-
-# first start the Naming service..
-$NS->Spawn ();
+    sleep 10;
 
-sleep 10;
+    # now start the Rt EC..
+    $SV2 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."Event_Service".$DIR_SEPARATOR
+			    ."Event_Service".$EXE_EXT,
+			    "-t new -ORBInitRef NameService=file://ns.ior");
 
-# now start the Rt EC..
-$EC->Spawn ();
+    sleep 10;
 
-sleep 10;
+    # now start the CosEC1..
+    $SV3 = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			    ."..".$DIR_SEPARATOR
+			    ."bin".$DIR_SEPARATOR
+			    ."RtEC_Based_CosEC".$EXE_EXT,
+			    "-ORBInitRef NameService=file://ns.ior"
+			    ." $CosEC1_params");
 
-# now start the CosEC1..
-$CE1->Spawn ();
+    sleep 10;
 
-sleep 10;
+    # now start the consumers
+    for ($cntr1 = 0; $cntr1 < $con_count ; $cntr1+=1)
+    {
+        print "creating consumer# $cntr1\n";
+        $CONS = Process::Create ($EXEPREFIX."Consumer".$EXE_EXT,
+                                 "-ORBInitRef NameService=file://ns.ior"
+				 ." -c $ev_count");
+        sleep 10;
+    }
 
-# now start the consumers
-foreach $co (@CONS) {
-    print "creating consumer# $cntr1\n";
-    $co->Spawn ();
-    sleep 10;
-}
 
-# now start the suppliers
-foreach $su (@SUPS) {
-    print "creating supplier# $cntr2\n";
-    $su->Spawn ();
-    sleep 10;
-}
+    # now start the suppliers
+    for ($cntr2 = 0; $cntr2 < $con_count ; $cntr2+=1)
+    {
+        print "creating supplier# $cntr2\n";
+        $SUPP = Process::Create ($EXEPREFIX."Supplier".$EXE_EXT,
+                                 "-ORBInitRef NameService=file://ns.ior"
+				 ." -c $ev_count");
+        sleep 10;
+    }
 
-print "waiting for the suppliers to finish\n";
-foreach $su (@SUPS) {
-    $supplier = $su->WaitKill (60);
-    
-    if ($supplier != 0) {
-        print STDERR "ERROR: A supplier returned $supplier\n";
-        $status = 1;
+    print "waiting for the last supplier to finish\n";
+    if ($SUPP->TimedWait (60) == -1) {
+      print STDERR "ERROR: supplier timedout\n";
+      $status = 1;
+      $SUPP->Kill (); $SUPP->TimedWait (1);
     }
-}
 
 
-print "waiting for the last consumer to finish\n";
-foreach $co (@CONS) {
-    $consumer = $co->WaitKill (60);
-    
-    if ($consumer != 0) {
-        print STDERR "ERROR: A consumer returned $consumer\n";
-        $status = 1;
+    print "waiting for the last consumer to finish\n";
+    if ($CONS->TimedWait (60) == -1) {
+      print STDERR "ERROR: consumer timedout\n";
+      $status = 1;
+      $CONS->Kill (); $CONS->TimedWait (1);
     }
-}
 
-print "cleanup...\n";
-$CE1->TerminateWaitKill (5);
 
-if ($server != 0) {
-    print STDERR "ERROR: CosEC1 returned $server\n";
-    $status = 1;
-}
+    print "cleanup...\n";
+    $SV1->Kill ();
+    $SV2->Kill ();
+    $SV3->Kill ();
 
-$EC->TerminateWaitKill (5);
+    $SV1->TimedWait (1);
+    $SV2->TimedWait (1);
+    $SV3->TimedWait (1);
 
-if ($server != 0) {
-    print STDERR "ERROR: EC returned $server\n";
-    $status = 1;
+    print "done!.\n";
 }
 
-$NS->TerminateWaitKill (5);
+# Parse the arguments
 
-if ($server != 0) {
-    print STDERR "ERROR: NS returned $server\n";
-    $status = 1;
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+        print "usage: run_test2.pl [-chorus <target>] -e event_count -c consumers -s suppliers -h help\n";
+        exit;
+    }
+    if ($ARGV[$i] eq "-e")
+    {
+        $ev_count = $ARGV[$i + 1];
+        $i++;
+        last SWITCH;
+    }
+    if ($ARGV[$i] eq "-c")
+    {
+        $con_count = $ARGV[$i + 1];
+        $i++;
+        last SWITCH;
+    }
+    if ($ARGV[$i] eq "-s")
+    {
+        $sup_count = $ARGV[$i + 1];
+        $i++;
+        last SWITCH;
+    }
+  }
 }
-print "done!.\n";
 
-unlink $nsior;
+
+cosec_multiple_test2 ();
 
 exit $status;
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/run_test.pl b/TAO/orbsvcs/examples/CosEC/Simple/run_test.pl
index 704c4dd8b3a..fd480895d18 100755
--- a/TAO/orbsvcs/examples/CosEC/Simple/run_test.pl
+++ b/TAO/orbsvcs/examples/CosEC/Simple/run_test.pl
@@ -5,52 +5,52 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require Process;
+require ACEutils;
 
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("ec.ior");
+$iorfile = "ec.ior";
 
 unlink $iorfile;
 
-$T = new PerlACE::Process ("Service",  "-o $iorfile");
-$C = new PerlACE::Process ("Consumer", "file://$iorfile");
-$S = new PerlACE::Process ("Supplier", "file://$iorfile");
-
-$T->Spawn ();
+$T = Process::Create ($EXEPREFIX."Service".$EXE_EXT,
+		      "-o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $T->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$C->Spawn ();
+$C = Process::Create ($EXEPREFIX."Consumer".$EXE_EXT,
+		      " file://$iorfile");
 
 sleep 5;
 
-$supplier = $S->SpawnWaitKill (120);
+$S = Process::Create ($EXEPREFIX."Supplier".$EXE_EXT,
+		      " file://$iorfile");
 
-if ($supplier != 0) {
-    print STDERR "ERROR: supplier returned $supplier\n";
-    $status = 1;
+if ($S->TimedWait (120) == -1) {
+  print STDERR "ERROR: supplier timedout\n";
+  $S->Kill (); $S->TimedWait (1);
+  $C->Kill (); $C->TimedWait (1);
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
-$consumer = $C->WaitKill (15);
-
-if ($consumer != 0) {
-    print STDERR "ERROR: consumer returned $consumer\n";
-    $status = 1;
+if ($C->TimedWait (15) == -1) {
+  print STDERR "ERROR: consumer timedout\n";
+  $C->Kill (); $C->TimedWait (1);
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
-$service = $T->TerminateWaitKill (5);
-
-if ($service != 0) {
-    print STDERR "ERROR: service returned $service\n";
-    $status = 1;
+$T->Terminate (); if ($T->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate service\n";
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
 unlink $iorfile;
 
-exit $status;
+exit 0;
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.dsp b/TAO/orbsvcs/examples/Notify/Filter/Filter.dsp
deleted file mode 100644
index 371fa0975fd..00000000000
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Filter" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Filter - 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 "Filter.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 "Filter.mak" CFG="Filter - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Filter - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Filter - 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)" == "Filter - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_CONSOLE" /Fo"" /Fd"" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_Svc_Utils.lib TAO_CosNotification.lib TAO_CosNaming.lib /nologo /subsystem:console /incremental:yes /pdb:"Filter.pdb" /map /debug /machine:I386 /out:"Filter.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Svc_Utilsd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Filter - Win32 Release"

-# Name "Filter - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.dsp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.dsp
deleted file mode 100644
index d5f2fdb42bf..00000000000
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.dsp
+++ /dev/null
@@ -1,108 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Subscribe" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Subscribe - 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 "Subscribe.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 "Subscribe.mak" CFG="Subscribe - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Subscribe - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Subscribe - 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)" == "Subscribe - 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 kernel32.lib user32.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 TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib /nologo /subsystem:console /incremental:yes /pdb:"Subscribe.pdb" /map:"Subscribe.map" /machine:I386 /out:"Subscribe.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD  /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Subscribe - Win32 Release"

-# Name "Subscribe - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Subscribe.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index 34786543733..db2b99272e9 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -22,11 +22,8 @@ ACE_RCSID(EC_Examples, Service, "$Id$")
 int config_run = 0;
 
 int parse_args (int argc, char *argv[]);
-#if (! defined (__GNUC__)) || (__GNUC__ > 2) || \
- (__GNUC__ == 2 && defined (__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
 
 typedef TAO_Reconfig_Scheduler<TAO_MUF_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE;
-#endif
 
 int
 main (int argc, char* argv[])
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl b/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl
index b9fdb3a3cac..5b00af5aab4 100755
--- a/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl
+++ b/TAO/orbsvcs/examples/RtEC/Simple/run_test.pl
@@ -5,60 +5,52 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require Process;
+require ACEutils;
 
-$status = 0;
-
-$iorfile  = PerlACE::LocalFile ("ec.ior");
-$conffile = PerlACE::LocalFile ("ec.conf");
+$iorfile = "ec.ior";
 
 unlink $iorfile;
 
-$T = new PerlACE::Process ("Service",
-                           "-ORBsvcconf $conffile -o $iorfile");
-
-$C = new PerlACE::Process ("Consumer",
-                           "file://$iorfile");
-
-$S = new PerlACE::Process ("Supplier",
-                           "file://$iorfile");
-
+$T = Process::Create ($EXEPREFIX."Service".$EXE_EXT,
+		      " -ORBsvcconf ec.conf -o $iorfile");
 
-
-$T->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $T->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$C->Spawn ();
+$C = Process::Create ($EXEPREFIX."Consumer".$EXE_EXT,
+		      " file://$iorfile");
 
 sleep 5;
 
-$supplier = $S->SpawnWaitKill (120);
+$S = Process::Create ($EXEPREFIX."Supplier".$EXE_EXT,
+		      " file://$iorfile");
 
-if ($supplier != 0) {
-    print STDERR "ERROR: supplier returned $supplier\n";
-    $status = 1;
+if ($S->TimedWait (120) == -1) {
+  print STDERR "ERROR: supplier timedout\n";
+  $S->Kill (); $S->TimedWait (1);
+  $C->Kill (); $C->TimedWait (1);
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
-$consumer = $C->WaitKill (15);
-
-if ($consumer != 0) {
-    print STDERR "ERROR: consumer returned $consumer\n";
-    $status = 1;
+if ($C->TimedWait (15) == -1) {
+  print STDERR "ERROR: consumer timedout\n";
+  $C->Kill (); $C->TimedWait (1);
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
-$service = $T->TerminateWaitKill (5);
-
-if ($service != 0) {
-    print STDERR "ERROR: service returned $service\n";
-    $status = 1;
+$T->Terminate (); if ($T->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate service\n";
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
 unlink $iorfile;
 
-exit $status;
+exit 0;
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 429696fa557..e8da4bb3aaf 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -87,9 +87,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 99a915a527f..be5c00316c3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -335,8 +335,7 @@ TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property &/*t
                                   CORBA::Environment & /* ACE_TRY_ENV */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) Recieved event \""));
+  ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) Recieved event \""));
 }
 
 // Sets the flow protocol status.
@@ -702,12 +701,11 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
       if (TAO_debug_level > 0)
         if (CORBA::is_nil (a_party) ||
             CORBA::is_nil (b_party))
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "(%P|%t) TAO_StreamCtrl::bind_devs: "
-                        "a_party or b_party is null"
-                        "Multicast mode\n"));
-      
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) TAO_StreamCtrl::bind_devs: "
+                      "a_party or b_party is null"
+                      "Multicast mode\n"));
+
       // Request a_party to create the endpoint and vdev
       CORBA::Boolean met_qos;
       CORBA::String_var named_vdev;
@@ -723,8 +721,7 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
               if (TAO_debug_level > 0)
                 {
                   // Already in the map.
-                  if (TAO_debug_level > 0)
-                    ACE_DEBUG ((LM_DEBUG, "mmdevice a_party is already bound\n"));
+                  ACE_DEBUG ((LM_DEBUG, "mmdevice a_party is already bound\n"));
                 }
               return 1;
             }
@@ -845,11 +842,8 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                     }
                   ACE_CATCHANY
                     {
-                      if (TAO_debug_level > 0) 
-                        ACE_DEBUG ((LM_DEBUG, " %s ", flows[i].in ()));
-                      
+                      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, " %s ", flows[i].in ()));
                       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "producer_check: not a producer");
-                          
                     }
                   ACE_ENDTRY;
                   ACE_CHECK_RETURN (0);
@@ -927,8 +921,6 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
           ACE_CHECK_RETURN (0);
           if (!connect_leaf_success)
             {
-	      if (TAO_debug_level > 0)
-		ACE_DEBUG ((LM_DEBUG,"TAO_StreamCtrl::bind_devs Multiconnect\n")); 
               AVStreams::flowSpec connect_flows = the_flows;
               this->sep_a_->multiconnect (the_qos, connect_flows, ACE_TRY_ENV);
               ACE_TRY_CHECK;
@@ -1004,8 +996,8 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                    AVStreams::noSuchFlow,
                    AVStreams::QoSRequestFailed))
 {
-  this->sep_a_ = AVStreams::StreamEndPoint_A::_duplicate(sep_a);
-  this->sep_b_ = AVStreams::StreamEndPoint_B::_duplicate(sep_b);
+  this->sep_a_ = sep_a;
+  this->sep_b_ = sep_b;
 
   int result = 0;
   ACE_TRY
@@ -1645,9 +1637,8 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void)
    flow_num_ (0),
    mcast_port_ (ACE_DEFAULT_MULTICAST_PORT+1)
 {
-  //is->mcast_addr_ = ACE_OS::inet_addr (ACE_DEFAULT_MULTICAST_ADDR);
-  this->mcast_addr_.set (ACE_DEFAULT_MULTICAST_ADDR);
-  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::TAO_StreamEndPoint::mcast_addr = %s", this->mcast_addr_.c_str ()));
+  this->mcast_addr_ = ACE_OS::inet_addr (ACE_DEFAULT_MULTICAST_ADDR);
+  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::TAO_StreamEndPoint::mcast_addr = %ud", this->mcast_addr_));
   //  this->handle_open ();
 }
 
@@ -1662,7 +1653,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
 {
-  if (TAO_debug_level > 0)
+  if (TAO_debug_level > 0) 
     ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect ()\n"));
   CORBA::Boolean retv = 0;
   this->peer_sep_ = AVStreams::StreamEndPoint::_duplicate (responder);
@@ -1682,8 +1673,8 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                                               ACE_TRY_ENV);
               ACE_TRY_CHECK_EX (negotiate);
               if (!result)
-                if (TAO_debug_level > 0)
-                  ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect (): negotiate failed\n"));
+                //if (TAO_debug_level > 0) 
+                ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect (): negotiate failed\n"));
             }
         }
     }
@@ -1732,12 +1723,12 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
         {
           int result = this->translate_qos (qos, network_qos);
           if (result != 0)
-            if (TAO_debug_level > 0)
+            if (TAO_debug_level > 0) 
               ACE_DEBUG ((LM_DEBUG, "QoS translation failed\n"));
         }
       AVStreams::flowSpec flow_spec (the_spec);
       this->handle_preconnect (flow_spec);
-      if (TAO_debug_level > 0)
+      if (TAO_debug_level > 0) 
         ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::connect: flow_spec_length = %d\n",
                     flow_spec.length ()));
       u_int i;
@@ -1749,7 +1740,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                           0);
           if (entry->parse (flow_spec[i]) == -1)
             return 0;
-          if (TAO_debug_level > 0)
+          if (TAO_debug_level > 0) 
             ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect: %s\n",  entry->entry_to_string ()));
           this->forward_flow_spec_set.insert (entry);
         }
@@ -1774,7 +1765,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                                             flow_spec,
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       if (retv == 0)
         return retv;
       for (i=0;i<flow_spec.length ();i++)
@@ -1785,7 +1776,7 @@ TAO_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
                           0);
           if (entry->parse (flow_spec[i].in ()) == -1)
             ACE_ERROR_RETURN ((LM_ERROR, "Reverse_Flow_Spec_Set::parse failed\n"), 0);
-          if (TAO_debug_level > 0)
+          if (TAO_debug_level > 0) 
             ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::Connect: Reverse Flow Spec %s\n",  entry->entry_to_string ()));
           this->reverse_flow_spec_set.insert (entry);
         }
@@ -1893,7 +1884,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
                 }
             }
 
-          end = this->reverse_flow_spec_set.end ();
+          end = this->forward_flow_spec_set.end ();
           for (TAO_AV_FlowSpecSetItor reverse_begin = this->reverse_flow_spec_set.begin ();
                reverse_begin != end; ++reverse_begin)
             {
@@ -1914,12 +1905,11 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
            forwardbegin != end; ++forwardbegin)
         {
           TAO_FlowSpec_Entry *entry = *forwardbegin;
+          //          entry->protocol_object ()->start ();
           if (entry->handler () != 0)
-            {
-              entry->handler ()->start (entry->role ());
-            }
+            entry->handler ()->start (entry->role ());
         }
-
+      
       end = this->reverse_flow_spec_set.end ();
       for (TAO_AV_FlowSpecSetItor reversebegin = this->reverse_flow_spec_set.begin ();
            reversebegin != end; ++reversebegin)
@@ -1927,10 +1917,7 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
           TAO_FlowSpec_Entry *entry = *reversebegin;
           //          entry->protocol_object ()->start ();
           if (entry->handler () != 0)
-            {
-              entry->handler ()->start (entry->role ());
-            }
-
+            entry->handler ()->start (entry->role ());
         }
 
     }
@@ -1998,9 +1985,9 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
   int result = 0;
   ACE_TRY
     {
-      if (TAO_debug_level > 0)
+      if (TAO_debug_level > 0) 
         ACE_DEBUG ((LM_DEBUG, "\n(%P|%t) TAO_StreamEndPoint::request_connection called"));
-      if (TAO_debug_level > 0)
+      if (TAO_debug_level > 0) 
         ACE_DEBUG ((LM_DEBUG,
                     "\n(%P|%t) TAO_StreamEndPoint::request_connection: "
                     "flowspec has length = %d"
@@ -2016,7 +2003,7 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr /*initiato
                           0);
           if (entry->parse (flow_spec[i]) == -1)
             return 0;
-          if (TAO_debug_level > 0)
+          if (TAO_debug_level > 0) 
             ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::request_connection Flow Spec %s", entry->entry_to_string ()));
           this->forward_flow_spec_set.insert (entry);
         }
@@ -2340,8 +2327,6 @@ TAO_StreamEndPoint::multiconnect (AVStreams::streamQoS &/*the_qos*/,
                                   AVStreams::flowSpec &/*flow_spec*/,
                                   CORBA::Environment &/*ACE_TRY_ENV*/)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n"));
   return 0;
 }
 
@@ -2394,7 +2379,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                    AVStreams::QoSRequestFailed,
                    AVStreams::streamOpFailed))
 {
-  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPointA::multiconnect\n"));
+  if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint::multiconnect\n"));
   ACE_TRY
     {
       int result = 0;
@@ -2507,7 +2492,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                   char str_addr [BUFSIZ];
                   result = mcast_addr->addr_to_string (str_addr, BUFSIZ);
                   if (result < 0)
-                    ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPointA::multiconnect ::addr_to_string failed\n"), 0);
+                    ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPoint::multiconnect ::addr_to_string failed\n"), 0);
                   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_StreamEndPoint_A::multiconnect:%s\n", str_addr));
                   TAO_Forward_FlowSpec_Entry new_entry (entry->flowname (),
                                                         entry->direction_str (),
@@ -2527,7 +2512,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                         ACE_NEW_RETURN (mcast_addr,
                                         ACE_INET_Addr,
                                         0);
-                        mcast_addr->set (this->mcast_port_, this->mcast_addr_.c_str ());
+                        mcast_addr->set (this->mcast_port_, this->mcast_addr_);
                         this->mcast_port_++;
                         char buf[BUFSIZ];
                         mcast_addr->addr_to_string (buf, BUFSIZ);
@@ -2542,7 +2527,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                                                                     mcast_addr),
                                         0);
                         flow_spec[i] = CORBA::string_dup (new_entry->entry_to_string ());
-			//new_entry->is_multicast (1);
+
                         this->forward_flow_spec_set.insert (new_entry);
                         TAO_AV_Acceptor_Registry *acceptor_registry = TAO_AV_CORE::instance ()->acceptor_registry ();
                         result = acceptor_registry->open (this,
@@ -2617,7 +2602,7 @@ TAO_StreamEndPoint_A::~TAO_StreamEndPoint_A (void)
 TAO_StreamEndPoint_B::TAO_StreamEndPoint_B (void)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
-                                       "\n(%P|%t) TAO_StreamEndPoint_B::TAO_StreamEndPoint_B: created"));
+              "\n(%P|%t) TAO_StreamEndPoint_B::TAO_StreamEndPoint_B: created"));
 }
 
 CORBA::Boolean
@@ -2787,8 +2772,8 @@ TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
   CORBA::Boolean result = 0;
   ACE_TRY
     {
-      if (TAO_debug_level > 0) 
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) TAO_VDev::set_peer: called"));
+      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) TAO_VDev::set_peer: called"));
 
       CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev,
                                                                                   ACE_TRY_ENV);
@@ -3109,8 +3094,7 @@ TAO_MMDevice::create_A_B (MMDevice_Type type,
                 }
               ACE_CATCHANY
                 {
-                  if (TAO_debug_level > 0)
-                    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_a::get_flow_connection");
+                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_a::get_flow_connection");
                 }
               ACE_ENDTRY;
               ACE_CHECK_RETURN (0);
@@ -3232,6 +3216,7 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr streamctrl,
 {
   CORBA::String_var str_ctrl_ior =
        TAO_ORB_Core_instance ()->orb ()->object_to_string (streamctrl, ACE_TRY_ENV);
+  //ACE_DEBUG ((LM_DEBUG, "The StreamCtrl IOR is %s\n", str_ctrl_ior.in ()));
   AVStreams::StreamEndPoint_A_ptr sep_a = 0;
   AVStreams::StreamEndPoint_ptr sep = 0;
   ACE_TRY
@@ -3278,7 +3263,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr streamctrl,
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_B");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_MMDevice::create_A");
       return sep_b;
     }
   ACE_ENDTRY;
@@ -3482,16 +3467,8 @@ TAO_FlowConnection::TAO_FlowConnection (void)
 {
 }
 
-// int
-// TAO_FlowConnection::set_mcast_addr (ACE_UINT32 mcast_addr, u_short mcast_port)
-// {
-//   this->mcast_addr_ = mcast_addr;
-//   this->mcast_port_ = mcast_port;
-//   return 0;
-// }
-
 int
-TAO_FlowConnection::set_mcast_addr (ACE_CString mcast_addr, u_short mcast_port)
+TAO_FlowConnection::set_mcast_addr (ACE_UINT32 mcast_addr, u_short mcast_port)
 {
   this->mcast_addr_ = mcast_addr;
   this->mcast_port_ = mcast_port;
@@ -3842,20 +3819,14 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
           char mcast_address[BUFSIZ];
           if (this->producer_address_.in () == 0)
             {
-              ACE_INET_Addr mcast_addr;
-              mcast_addr.set (this->mcast_port_,
-                              this->mcast_addr_.c_str ()
-                              );
-
+              ACE_INET_Addr mcast_addr (this->mcast_port_,
+                                        this->mcast_addr_);
               char buf [BUFSIZ];
               mcast_addr.addr_to_string (buf, BUFSIZ);
               ACE_OS::sprintf (mcast_address, "%s=%s", this->protocol_.in (), buf);
-	    
             }
           else
-            {
-              ACE_OS::strcpy (mcast_address, this->producer_address_.in ());
-            }
+            ACE_OS::strcpy (mcast_address, this->producer_address_.in ());
           char *address = flow_producer->connect_mcast (the_qos,
                                                         met_qos,
                                                         mcast_address,
@@ -3961,7 +3932,7 @@ TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr consumer,
                                         ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-       else
+      else
         {
           // The spec says go_to_listen is called with the multicast
           // address returned from the connect_mcast call called
@@ -4490,7 +4461,7 @@ TAO_FlowEndPoint::go_to_listen_i (TAO_FlowSpec_Entry::Role role,
         TAO_AV_Acceptor_Registry *acceptor_registry = TAO_AV_CORE::instance ()->acceptor_registry ();
         this->flow_spec_set_.insert (entry);
         int result = acceptor_registry->open (this,
-					      TAO_AV_CORE::instance (),
+                                                  TAO_AV_CORE::instance (),
                                               this->flow_spec_set_);
         if (result < 0)
           return 0;
@@ -4661,10 +4632,6 @@ TAO_FlowProducer::connect_mcast (AVStreams::QoS & /* the_qos */,
     {
       // choose the protocol which supports multicast.
     }
-  
-  if (address == 0)
-    if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG, "TAO_FlowProducer::connect_mcast address is 0\n"));
   TAO_Forward_FlowSpec_Entry  *entry;
   ACE_NEW_RETURN (entry,
                   TAO_Forward_FlowSpec_Entry(this->flowname_.in (),
@@ -5032,8 +4999,8 @@ template class ACE_Unbounded_Set_Iterator<AVStreams::FlowConsumer *>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash<TAO_String_Hash_Key>
-#pragma instantiate ACE_Equal_To<TAO_String_Hash_Key>
+#pragma instantiate ACE_Hash<TAO_String_Hash_Key>;
+#pragma instantiate ACE_Equal_To<TAO_String_Hash_Key>;
 
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,AVStreams::FDev_ptr>
 #pragma instantaite ACE_Hash_Map_Entry<TAO_String_Hash_Key, TAO_FlowSpec_Entry *>
@@ -5128,8 +5095,8 @@ template class ACE_Unbounded_Set_Iterator<AVStreams::FlowConsumer *>;
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key,TAO_FlowSpec_Entry *,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_FlowSpec_Entry *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 
-#pragma instantiate ACE_Equal_To<MMDevice_Map_Hash_Key>
-#pragma instantiate ACE_Hash<MMDevice_Map_Hash_Key>
+#pragma instantiate ACE_Equal_To<MMDevice_Map_Hash_Key>;
+#pragma instantiate ACE_Hash<MMDevice_Map_Hash_Key>;
 #pragma instantiate ACE_Array<char*>
 #pragma instantiate ACE_DLList<TAO_MCastConfigIf::Peer_Info>
 #pragma instantiate ACE_DLList_Iterator<TAO_MCastConfigIf::Peer_Info>
@@ -5160,4 +5127,3 @@ template class ACE_Unbounded_Set_Iterator<AVStreams::FlowConsumer *>;
 
 
 #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 05b61228495..695f079237a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -706,7 +706,7 @@ protected:
   // Key used for encryption.
 
   u_short mcast_port_;
-  ACE_CString mcast_addr_;
+  ACE_UINT32 mcast_addr_;
   ACE_Hash_Map_Manager <TAO_String_Hash_Key, TAO_FlowSpec_Entry*,ACE_Null_Mutex> mcast_entry_map_;
   TAO_AV_FlowSpecSet forward_flow_spec_set;
   TAO_AV_FlowSpecSet reverse_flow_spec_set;
@@ -1115,7 +1115,7 @@ public:
                      AVStreams::notConnected));
   // drops a flow endpoint from the flow.
 
-  int set_mcast_addr (ACE_CString addr,u_short port);
+  int set_mcast_addr (ACE_UINT32 addr,u_short port);
   void set_protocol (const char *protocol);
 protected:
   typedef ACE_Unbounded_Set<AVStreams::FlowProducer_ptr> FlowProducer_Set;
@@ -1135,7 +1135,7 @@ protected:
   TAO_MCastConfigIf *mcastconfigif_i_;
   AVStreams::MCastConfigIf_var mcastconfigif_;
   u_short mcast_port_;
-  ACE_CString mcast_addr_;
+  ACE_UINT32 mcast_addr_;
   CORBA::String_var protocol_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
index e736a6d3b93..af9354c1287 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -316,6 +316,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
             local_addr = (*connect)->get_local_addr ();
             if (result == 0)
               {
+                ACE_DEBUG ((LM_DEBUG, "Reverse Flow Spec is Created First\n"));
                 TAO_Reverse_FlowSpec_Entry entry ((*connect)->flowname (),
                                                   (*connect)->direction_str (),
                                                   (*connect)->format (),
@@ -327,8 +328,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
                 if (i == len)
                   new_flowspec.length (len+1);
                 new_flowspec [i++] = entry.entry_to_string ();
-                if (TAO_debug_level > 0)
-                  ACE_DEBUG ((LM_DEBUG, "reverse Flow Spec Is %s\n", entry.entry_to_string ()));
+                ACE_DEBUG ((LM_DEBUG, "reverse Flow Spec Is %s\n", entry.entry_to_string ()));
               }
           }
         connect_end = flow_set.end ();
@@ -340,6 +340,7 @@ TAO_AV_Core::init_forward_flows (TAO_Base_StreamEndPoint *endpoint,
             if (result == 0)
               {
 
+                ACE_DEBUG ((LM_DEBUG, "Reverse Flow Spec is Created Second\n"));
                 TAO_Reverse_FlowSpec_Entry entry ((*connect)->flowname (),
                                                   (*connect)->direction_str (),
                                                   (*connect)->format (),
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 42b4ba4bf6e..0c84e037f94 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -12,7 +12,9 @@
 
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy (void)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
+  : orb_ (orb),
+    poa_ (poa)
 {
 }
 
@@ -55,12 +57,12 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV)
 {
-
+  
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant,
                                  ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Object_var obj =
     this->poa_->id_to_reference (id.in (),
                                  ACE_TRY_ENV);
@@ -70,7 +72,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
     this->orb_->object_to_string (obj.in (),
                                   ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return str._retn ();
 }
 
@@ -137,7 +139,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ
       anyval <<= this->orb_->object_to_string (media_ctrl->_this (ACE_TRY_ENV),
                                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       this->vdev_->define_property ("Related_MediaCtrl",
                                     anyval,
                                     ACE_TRY_ENV);
@@ -195,7 +197,8 @@ TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_m
 
 //Constructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_A (void)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_A (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
+  : TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl> (orb, poa)
 {
 }
 
@@ -206,16 +209,6 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TA
 {
 }
 
-
-template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-  this->poa_ = PortableServer::POA::_duplicate (poa);
-  return 0;
-}
-
 // Creates an "A" type streamendpoint, and a vdev and returns the
 // object references
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
@@ -276,7 +269,8 @@ TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
 
 // Constructor
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_B (void)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Endpoint_Reactive_Strategy_B (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
+  : TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl> (orb, poa)
 {
 }
 
@@ -286,16 +280,6 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TA
 {
 }
 
-
-template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-  this->poa_ = PortableServer::POA::_duplicate (poa);
-  return 0;
-}
-
 // Activate stream_endpoint
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
@@ -311,7 +295,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act
                                                                        ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
-
+      
       this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
       stream_endpoint_b->_remove_ref (ACE_TRY_ENV);
@@ -365,7 +349,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::TAO_AV_Child_Pro
 // Initializes the ORB, activates the objects, and release the semaphore
 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,
+TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, 
                                                                        char **argv,
                                                                        CORBA::ORB_ptr orb,
                                                                        PortableServer::POA_ptr poa)
@@ -376,7 +360,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
       this->orb_ = orb;
 
       this->poa_ = poa;
-
+      
       // create the objects and activate them in the poa
       this->activate_objects (argc,
                               argv,
@@ -413,15 +397,15 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc,
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 char *
-TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant,
+TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, 
                                                                                  CORBA::Environment &ACE_TRY_ENV)
 {
-
+  
   PortableServer::ObjectId_var id =
     this->poa_->activate_object (servant,
                                  ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Object_var obj =
     this->poa_->id_to_reference (id.in (),
                                  ACE_TRY_ENV);
@@ -431,7 +415,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa
     this->orb_->object_to_string (obj.in (),
                                   ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return str._retn ();
 }
 
@@ -595,10 +579,11 @@ template <class T_StreamEndpoint_B, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_Value *tv)
 {
+  int result = -1;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->orb_->run (tv, ACE_TRY_ENV);
+      result = this->orb_->run (tv, ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -607,7 +592,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V
       return -1;
     }
   ACE_ENDTRY;
-  return 0;
+  return result;
 }
 
 // release the semaphore the parent is waiting on
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index aba7bf15931..72310f7e91e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -34,7 +34,7 @@ class TAO_AV_Export TAO_AV_Endpoint_Reactive_Strategy
 protected:
   // Constructor
 
-  TAO_AV_Endpoint_Reactive_Strategy (void);
+  TAO_AV_Endpoint_Reactive_Strategy (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
   // Constructor
 
   virtual ~TAO_AV_Endpoint_Reactive_Strategy (void);
@@ -69,7 +69,7 @@ protected:
 
   char* activate_with_poa (PortableServer::Servant servant, CORBA::Environment &env);
   
-  CORBA::ORB_var orb_;
+  CORBA::ORB_ptr orb_;
   
   PortableServer::POA_var poa_;
 
@@ -85,9 +85,7 @@ class TAO_AV_Export TAO_AV_Endpoint_Reactive_Strategy_A
 
 public:
 
-  TAO_AV_Endpoint_Reactive_Strategy_A (void);
-
-  int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
+  TAO_AV_Endpoint_Reactive_Strategy_A (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
   // Constructor
 
   virtual ~TAO_AV_Endpoint_Reactive_Strategy_A (void);
@@ -113,14 +111,12 @@ class TAO_AV_Export TAO_AV_Endpoint_Reactive_Strategy_B
   //    Reactive strategy
 public:
 
-  TAO_AV_Endpoint_Reactive_Strategy_B (void);
+  TAO_AV_Endpoint_Reactive_Strategy_B (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
   // Constructor
 
   virtual ~TAO_AV_Endpoint_Reactive_Strategy_B (void);
   // Destructor.
 
-  int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
-
   virtual int activate_stream_endpoint (CORBA::Environment &env);
   // Overrides the base class stream_endpoint activator, to activate
   // a "B" type endpoint
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 73794084f70..5f279b1c8e0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -3,7 +3,6 @@
 //------------------------------------------------------------
 // TAO_FlowSpec_Entry
 //------------------------------------------------------------
-
 #include "FlowSpec_Entry.h"
 #include "tao/PortableServer/ORB_Manager.h"
 
@@ -141,20 +140,14 @@ TAO_FlowSpec_Entry::set_protocol (void)
           return -1;
         }
     }
-
   if (this->address_ != 0)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n"));
       ACE_INET_Addr *inet_addr = ACE_dynamic_cast (ACE_INET_Addr*,this->address_);
       char buf[BUFSIZ];
       inet_addr->addr_to_string (buf,BUFSIZ);
-      if (TAO_debug_level > 0) 
-        ACE_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s %x\n",buf, inet_addr->get_ip_address ()));
+      if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s\n",buf));
       if (IN_CLASSD (inet_addr->get_ip_address ()))
         {
-
-
           this->is_multicast_ = 1;
           switch (this->protocol_)
             {
@@ -178,7 +171,6 @@ TAO_FlowSpec_Entry::set_protocol (void)
 int
 TAO_FlowSpec_Entry::parse_address (char *address)
 {
-	
   if (address == 0)
     return 0;
   if (ACE_OS::strcmp (address,"") == 0)
@@ -209,14 +201,8 @@ TAO_FlowSpec_Entry::parse_address (char *address)
                             ACE_INET_Addr (addr),
                             -1);
             this->address_ = inet_addr;
-            if (TAO_debug_level > 0)
-              ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address %s %x\n", address,inet_addr->get_ip_address () ));
-	      
             if (IN_CLASSD (inet_addr->get_ip_address ()))
               {
-                if (TAO_debug_level > 0)
-                  ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::parse_address is multicast\n"));
-			    
                 this->is_multicast_ = 1;
                 switch (this->protocol_)
                   {
diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
index c8ef51bcd50..5e71c51fd1e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -112,8 +112,7 @@ int
 TAO_AV_Protocol_Object::handle_control_input (ACE_Message_Block *,
                                               const ACE_Addr &)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n"));
+  ACE_DEBUG ((LM_DEBUG,"TAO_AV_Protocol_Object::handle_control_input\n"));
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl b/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
deleted file mode 100644
index 2f04c91261e..00000000000
--- a/TAO/orbsvcs/orbsvcs/AVStreams_Full.idl
+++ /dev/null
@@ -1,252 +0,0 @@
-// $Id$ 
-
-// IDL for Control and Management of Audio/Video Streams
-// Revised Submission
-
-// Additional IDL for full profile
-#include "AVStreams.idl"
-
-#pragma prefix "omg.org"
-
-module AVStreams_Full
-{
-  exception protocolNotSupported{};
-  exception formatNotSupported{};
-  exception formatMismatch{};
-  exception FEPMismatch{};
-  exception alreadyConnected{};
-  exception invalidSettings{string settings;};
-  exception notConnected{};
-  exception deviceQosMismatch{};
-  exception failedToConnect{string reason;};
-  exception failedToListen{string reason;};
-
-
-  interface FlowProducer;
-  interface FlowConsumer;
-  interface FlowEndPoint;
-  interface FDev;
-
-  interface FlowConnection : PropertyService::PropertySet
-    {
-      void stop();
-      void start();
-      void destroy();
-
-      boolean modify_QoS(
-		
-                         inout AVStreams::QoS new_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-      boolean use_flow_protocol(
-                                in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      oneway void push_event(in AVStreams::streamEvent the_event);
-
-      boolean connect_devs(in FDev a_party, in FDev b_party,
-                           inout AVStreams::QoS the_qos)
-        raises (AVStreams::streamOpFailed, 
-                AVStreams::streamOpDenied, 
-                AVStreams::QoSRequestFailed);
-
-      boolean connect(
-                      in FlowProducer flow_producer,
-                      in FlowConsumer flow_consumer,
-                      inout AVStreams::QoS the_qos)
-        raises (formatMismatch, FEPMismatch, alreadyConnected);
-
-      boolean disconnect();
-
-      // The notSupported exception is raised where
-      // flow cannot have multiple producers
-      boolean add_producer(in FlowProducer flow_producer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected, AVStreams::notSupported);
-
-      boolean add_consumer(in FlowConsumer flow_consumer,
-                           inout AVStreams::QoS the_qos)
-        raises (alreadyConnected);
-
-      boolean drop(in FlowEndPoint target)
-        raises (notConnected);
-    };
-
-  interface FlowEndPoint : PropertyService::PropertySet
-    {
-      boolean lock();
-      void unlock();
-
-      void stop();
-      void start();
-      void destroy();
-
-      // Default is a nil object reference
-      attribute AVStreams::StreamEndPoint related_sep;
-      attribute FlowConnection related_flow_connection;
-
-      FlowEndPoint get_connected_fep()
-        raises (notConnected,
-                AVStreams::notSupported);
-
-      // syntax of fp_name is <flowProtocol>
-      boolean use_flow_protocol(in string fp_name,
-                                in any fp_settings)
-        raises (AVStreams::FPError, AVStreams::notSupported);
-
-      // set_format() initializes 'format' 
-      // as current media format e.g. MPEG.
-      void set_format(in string format)
-        raises (AVStreams::notSupported);
-
-      void set_dev_params(
-                          in PropertyService::Properties new_settings)
-        raises (PropertyService::PropertyException, 
-                AVStreams::streamOpFailed);
-
-      void set_protocol_restriction(in AVStreams::protocolSpec 
-                                    the_spec)
-        raises (AVStreams::notSupported);
-
-      boolean is_fep_compatible(in FlowEndPoint fep) 
-        raises (formatMismatch, deviceQosMismatch);
-
-      boolean set_peer(
-                       in FlowConnection the_fc,
-		
-                       in FlowEndPoint the_peer_fep,
-                       inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed,
-                AVStreams::streamOpFailed);
-
-      boolean set_Mcast_peer(
-                             in FlowConnection the_fc,
-                             in AVStreams::MCastConfigIf a_mcastconfigif,
-                             inout AVStreams::QoS the_qos)
-        raises (AVStreams::QoSRequestFailed);
-
-    };
-
-  interface FlowProducer : FlowEndPoint
-    {
-      boolean connect_to_peer(inout AVStreams::QoS the_qos,
-                              in string address,
-
-                              in string use_flow_protocol) // syntax <flowProtocol>
-        raises(failedToConnect,
-               AVStreams::FPError, AVStreams::QoSRequestFailed);
-
-      string connect_mcast(inout AVStreams::QoS the_qos,
-                           out boolean is_met,
-                           in string address,
-                           in string use_flow_protocol)
-        raises (failedToConnect,
-                AVStreams::notSupported,
-                AVStreams::FPError,
-                AVStreams::QoSRequestFailed);
-
-      string get_rev_channel(in string pcol_name);
-
-      void set_key(in AVStreams::key the_key);
-      void set_source_id(in long source_id);
-    };
-
-  interface FlowConsumer : FlowEndPoint
-    {
-
-
-      // Needs to know its peer to choose its protocol correctly
-      // Also to ask for a reverse channel for credit-based flow
-      // control, if one is required
-      string go_to_listen(
-                          inout AVStreams::QoS the_qos,
-                          in boolean is_mcast,
-                          in FlowProducer peer,
-                          inout string flowProtocol)// syntax <flowProtocol>
-        raises(failedToListen, AVStreams::FPError, 
-               AVStreams::QoSRequestFailed);
-    };
-
-  interface FDev : PropertyService::PropertySet {
-    FlowProducer create_producer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConsumer create_consumer(
-                                 in FlowConnection the_requester,
-                                 inout AVStreams::QoS the_qos,
-                                 out boolean met_qos,
-                                 inout string named_fdev)
-      raises(AVStreams::streamOpFailed,
-             AVStreams::streamOpDenied,
-             AVStreams::notSupported,
-             AVStreams::QoSRequestFailed);
-
-    FlowConnection bind(in FDev peer_device,
-                        inout AVStreams::QoS the_qos,
-                        out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    FlowConnection bind_mcast(in FDev first_peer,
-                              inout AVStreams::QoS the_qos,
-                              out boolean is_met)
-      raises (AVStreams::streamOpFailed,
-              AVStreams::QoSRequestFailed);
-
-    void destroy(in FlowEndPoint the_ep, in string fdev_name)
-      // ie FDev not found
-      raises (AVStreams::notSupported);
-  };
-
-  enum PositionOrigin {
-    AbsolutePosition, RelativePosition, ModuloPosition
-  };
-
-  enum PositionKey {
-    ByteCount, SampleCount, MediaTime
-  };
-
-  struct Position {
-    PositionOrigin origin;
-    PositionKey key;
-    long value;
-  };
-
-  exception PostionKeyNotSupported { PositionKey key;};
-  exception InvalidPosition { PositionKey key;};
-
-  // MediaControl interface is similar to
-  // ControlledStream interface in MSS.
-  // It can be inherited by flow endpoints or
-  // FlowConnection interfaces.
-  interface MediaControl{
-
-    exception PostionKeyNotSupported { PositionKey key;};
-
-    Position get_media_position(
-                                in PositionOrigin an_origin,
-                                in PositionKey a_key)
-      raises (PostionKeyNotSupported);
-
-    void set_media_position(in Position a_position)
-      raises (PostionKeyNotSupported, InvalidPosition);
-
-    void start(in Position a_position)
-      raises(InvalidPosition);
-    void pause(in Position a_position)
-      raises(InvalidPosition);
-    void resume(in Position a_position)
-      raises(InvalidPosition);
-    void stop(in Position a_position)
-      raises(InvalidPosition);
-  };
-};
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
index a1067d7b6bc..263fd674ba7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -29,7 +29,6 @@ void
 TAO_EC_Reactive_Timeout_Generator::shutdown (void)
 {
   this->reactor_->cancel_timer (&this->event_handler_);
-  this->event_handler_.reactor (0);
 }
 
 int
diff --git a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
index 12fc7c0ece8..9828cdae2ff 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -112,13 +112,13 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::B
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Hash_Map_Entry<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var>
-#pragma instantiate ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var>;
+#pragma instantiate ACE_Hash_Map_Manager<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Manager_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<DsLogAdmin::LogId,DsLogAdmin::BasicLog_var,TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<DsLogAdmin::LogId, DsLogAdmin::BasicLog_var, ACE_Hash<DsLogAdmin::LogId>, ACE_Equal_To<DsLogAdmin::LogId>, TAO_SYNCH_MUTEX>;
 
 #endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
index ce20b14bc53..53675ab9e5c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -87,7 +87,7 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (CosNaming::Binding_out b
   else
     {
       // Return a binding.
-      TABLE_ENTRY *hash_entry = 0;
+      TABLE_ENTRY *hash_entry;
       hash_iter_->next (hash_entry);
 
       if (populate_binding (hash_entry, *binding) == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index e3b532684c2..2bbfa8e7149 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -374,96 +374,92 @@ TAO_Naming_Context::to_name (const char *sn,
   return new CosNaming::Name (n);
 }
 
-int
-TAO_Naming_Context::to_url_is_alnum_or_punctuation (char c)
+char *
+TAO_Naming_Context::to_url (const char * addr,
+                            const char * sn,
+                            CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   CosNaming::NamingContextExt::InvalidAddress,
+                   CosNaming::NamingContext::InvalidName))
 {
-  if (isalnum (c))
-    return 1;
+  // Returns a fully formed URL string.
 
   // NON US-ASCII charcters excluding those in this array are the
   // characters that need to be escaped
-  static char non_escaped_punctuation[] =
-    { ';', '/', ':', '?', '@', '=', '+', '$', ',', '-',
-      '_', '.', '!', '~', '*', '\'', '(', ')' };
-  const size_t non_escaped_punctuation_count =
-    sizeof(non_escaped_punctuation)/sizeof(non_escaped_punctuation[0]);
-  for (const char *j = non_escaped_punctuation;
-       j != non_escaped_punctuation + non_escaped_punctuation_count;
-       ++j)
-    {
-      // But if the character is one of the 18 non US-ASCII characters
-      // and hence need not be escaped, then don't increment the
-      // count.
-      if (*j == c)
-        return 1;
-    }
-  return 0;
-}
+  //
+  char non_escaped_punctuation[]= {';', '/', ':', '?', '@',
+                                     '=', '+', '$', ',', '-',
+                                     '_', '.', '!', '~', '*',
+                                     '\'', '(', ')' };
 
-size_t
-TAO_Naming_Context::to_url_validate_and_compute_size (
-    const char *addr,
-    const char *sn,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  size_t addr_len = ACE_OS_String::strlen (addr);
+  // Variable to keep track of the number of characters
+  //
+  CORBA::ULong no_char = ACE_OS::strlen (addr);
 
   // Check for invalid address
-  if (addr_len == 0)
+  if (no_char == 0)
     ACE_THROW_RETURN (CosNaming::NamingContextExt::InvalidAddress (),
                       0);
 
-  // Make a pass through the in string name to count the number of
-  // characters and if the character
-  // is to be escaped, increment the number of characters by 3.
-  size_t sn_len = 0;
-  for (const char *i = sn; *i != '\0'; ++i)
-    {
-      ++sn_len;
-
-      if (TAO_Naming_Context::to_url_is_alnum_or_punctuation (*i))
-        continue;
-      sn_len += 3;
-    }
+  // Assign the length of address to another variable
+  CORBA::ULong no_char_addr = no_char;
 
-  if (sn_len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContextExt::InvalidName (), 0);
+  const char *sn_ptr = sn;
+  for (; *sn_ptr != '\0'; ++sn_ptr)
+    {
+      // Make a pass through the in string name to count the number of
+      // characters and if the character
+      // is to be escaped, increment the number of characters by 3.
+      //
+      if ( !isalnum (*sn_ptr))
+        {
+          no_char = no_char + 3;
 
-  return addr_len + sn_len;
-}
+          for (const char *i = non_escaped_punctuation; *i != '\0'; ++i)
+            {
+              // But if the character is one of the 18 non US-ASCII characters
+              // and hence neednot be escaped, decrement the count by
+              // the 3.
+              //
+              if (*sn_ptr == *i)
+                {
+                  no_char = no_char - 3;
+                }
+            }
+        }
 
-char *
-TAO_Naming_Context::to_url (const char * addr,
-                            const char * sn,
-                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CosNaming::NamingContextExt::InvalidAddress,
-                   CosNaming::NamingContext::InvalidName))
-{
-  /// Compute how many characters will be required for the URL
-  CORBA::ULong no_char =
-    TAO_Naming_Context::to_url_validate_and_compute_size (addr, sn,
-                                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+      ++no_char;
+    }
 
+  // Check for invalid name
+  //
+  if (no_char == no_char_addr)
+    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
+                      0);
 
-  // The 'corbaloc:' tag is to be prepended at the starting of the
+  // The 'iiopname://' tag is to be prepended at the starting of the
   // return parameter.
   //
-  char prefix []= "corbaloc:";
+  char prefix []= "iiopname://1.1@";
 
   // Allocate dynamic memory
   //
   char *str_url = CORBA::string_alloc (no_char + sizeof (prefix));
+  char *str_url_ptr = str_url;
+
 
   // Copy 'prefix' to the return parameter.
-  char *dest = ACE_OS::strcpy (str_url , prefix);
+  str_url_ptr  = ACE_OS::strcpy (str_url_ptr , prefix);
 
   // Concatenate the address
-  dest = ACE_OS::strcat (dest, addr);
+  str_url_ptr = ACE_OS::strcat (str_url_ptr, addr);
 
   // Concatenate the seperator between the addr and Name
-  dest = ACE_OS::strcat (dest, "/");
+  str_url_ptr = ACE_OS::strcat (str_url_ptr, "/");
+
+  // Allocate temporary dynamic memory
+  CORBA::String_var temp_ptr = CORBA::string_alloc (no_char);
+  char *tempptr_ptr = temp_ptr;
 
   // Now append the stringified object name to the return variable.
   // The percent '%' character is used as an escape. If a character
@@ -472,30 +468,82 @@ TAO_Naming_Context::to_url (const char * addr,
   // represent the octet. The first hexadecimal character represents
   // the low-order nibble of the octet and the second hexadecimal
   // character represents the low order nibble.
-
-  for (const char *i = sn; *i != '\0'; ++i)
+  //
+  for (sn_ptr = sn; *sn_ptr != '\0'; ++sn_ptr)
     {
-      if (TAO_Naming_Context::to_url_is_alnum_or_punctuation (*i))
+
+      if ( !isalnum (*sn_ptr))
         {
-          // If the character is a US-ASCII Alphanumeric value...
-          *dest = *i; ++dest;
-          continue;
-        }
-      // this must be an escaped character
+          CORBA::ULong i = 0;
+
+          // This boolean keeps track if the character is to be
+          // escaped. If the character is a non US-ASCII Alphanumeric
+          // but is in the set of characters that need not be escaped,
+          // the boolean becomes TRUE '0'
+          //
+          CORBA::Boolean found = 1;
+
+          while (found == 1 && i < 18)
+            {
+              if (*sn_ptr == non_escaped_punctuation [i])
+                {
+                  // If it is in the set, change the boolean value
+                  //
+                  found = 0;
+                }
+
+              // Still not found ..but may be one of the remaining
+              // characters: so continue to check
+              //
+              ++i;
+            }
+
+          if (found == 1)
+            {
+              // The character needs to be escaped
+              //
+              *tempptr_ptr = '%';
+              ++tempptr_ptr;
 
-      *dest = '%'; ++dest;
+              // Append the hexadecimal representation of the
+              // character.
+              const char *bytes = sn_ptr;
 
-      // Append the hexadecimal representation of the character.
-      *dest = ACE::nibble2hex ((*i) >> 4); ++dest;
-      *dest = ACE::nibble2hex (*i); ++dest;
+              *tempptr_ptr = ACE::nibble2hex ((*bytes) >> 4);
+              ++tempptr_ptr;
+              *tempptr_ptr++ = ACE::nibble2hex (*bytes);
+
+            }
+          else
+            {
+              // The character neednot be escaped
+              *tempptr_ptr = *sn_ptr;
+              ++tempptr_ptr;
+            }
+
+        }
+      else
+        {
+          // If the character is a US-ASCII Alphanumeric value...
+          *tempptr_ptr = *sn_ptr;
+          ++tempptr_ptr;
+        }
     }
 
   // Terminate the string
-  *dest = '\0';
+  *tempptr_ptr = '\0';
+
+
+  str_url_ptr = ACE_OS::strcat (str_url_ptr,
+                                temp_ptr.in ());
+
+  //  CORBA::string_free (temp_ptr);
 
   return str_url;
+
 }
 
+
 CORBA::Object_ptr
 TAO_Naming_Context::resolve_str (const char * n,
                                  CORBA::Environment &ACE_TRY_ENV)
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index afe36fc0d1a..33950a1730d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -253,6 +253,7 @@ private:
   // character read is '.' or '/' or '\', an escape character '\' is
   // prepended before the character.
 
+
   void to_string_helper_length (CORBA::ULong &len, const char * &src);
   // This method helps count the number of characters in 'src' so
   // that memory can be allocated for the return parameter. For
@@ -261,16 +262,6 @@ private:
   // added. Seperators between 'id' and 'kind' as well as seperators
   // between the name components are also counted.
 
-  static int to_url_is_alnum_or_punctuation (char c);
-  // Return 1 if the character is alphanumeric or a non-scaped
-  // punctuation.
-
-  static size_t to_url_validate_and_compute_size (const char *add,
-                                                  const char *sn,
-                                                  CORBA::Environment &ACE_TRY_ENV);
-  // Validate the to_url() method input, and compute the size of the
-  // returned URL address.
-
 protected:
 
   TAO_Naming_Context_Impl *impl_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
index 0870b9ec9d4..4c7da8c40a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Buffering_Strategy.cpp
@@ -61,8 +61,7 @@ TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue,
     }
   else if (this->order_policy_ == CosNotification::PriorityOrder)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "enqueue in priority order\n"));
+      ACE_DEBUG ((LM_DEBUG, "enqueue in priority order\n"));
       result = msg_queue->enqueue_prio (mb, tv);
     }
   else  // CosNotification::DeadlineOrder
@@ -73,10 +72,7 @@ TAO_Notify_Buffering_Strategy::execute (ACE_Message_Queue<ACE_SYNCH>* msg_queue,
     }
 
   if (result == -1) // we could not enqueue successfully
-    {
-      ACE_DEBUG ((LM_DEBUG, "Panic! failed to enqueue event"));
-      return; // behave as if we discarded this event.
-    }
+    return; // behave as if we discarded this event.
 
   // increment the global count of events.
   (*queue_length_)++;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index eb168e6ec0b..3f5d2a69711 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -61,13 +61,13 @@ template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, TAO
 template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, const CORBA::Any*>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Entry <ACE_CString, const CORBA::Any*>;
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, const CORBA::Any*, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, const CORBA::Any *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, TAO_SYNCH_MUTEX>;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
index 5de28a7c64f..5fb3ab0dd23 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
@@ -35,6 +35,7 @@ TAO_Notify_ConsumerAdmin_i::TAO_Notify_ConsumerAdmin_i (TAO_Notify_EventChannel_
    // arguments.
    channel_objects_factory_ (TAO_Notify_Factory::get_channel_objects_factory ()),
    poa_factory_ (TAO_Notify_Factory::get_poa_factory ()),
+   event_manager_objects_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()),
    collection_factory_ (TAO_Notify_Factory::get_collection_factory ()),
    event_manager_ (event_channel->get_event_manager ()),
    event_listener_list_ (0),
@@ -42,15 +43,13 @@ TAO_Notify_ConsumerAdmin_i::TAO_Notify_ConsumerAdmin_i (TAO_Notify_EventChannel_
    filter_eval_task_ (0)
 {
   // @@ Pradeep: don't forget the this-> stuff for local variables.
-  this->event_manager_objects_factory_ = this->event_manager_->resource_factory ();
   this->event_channel_->_add_ref (); // we don't want our parent to go away!
 }
 
 // Implementation skeleton destructor
 TAO_Notify_ConsumerAdmin_i::~TAO_Notify_ConsumerAdmin_i (void)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,"in CA %d dtor\n", this->my_id_));
+   ACE_DEBUG ((LM_DEBUG,"in CA %d dtor\n", this->my_id_));
 
    ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -179,8 +178,6 @@ TAO_Notify_ConsumerAdmin_i::init (CosNotifyChannelAdmin::AdminID my_id,
   ACE_CHECK;
 
   // Create the task to forward filtering/dispatching commands to:
-  // @@ think about how get rid of these 2 allocations per consumer admin.
-  // add a "get_singleton_reactive_task" to the event manager factory interface.
   this->dispatching_task_ =
     new TAO_Notify_Worker_Task ();
   /*this->event_manager_objects_factory_->create_dispatching_task (ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index c9c165527f1..7a8c23d97fc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -35,6 +35,7 @@ TAO_Notify_Default_Collection_Factory::init (int /*argc*/, char* /*argv*/[])
 int
 TAO_Notify_Default_Collection_Factory::fini (void)
 {
+  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_Collection_Factory::fini\n"));
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
index 490a1ce7968..2231bb97ff3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -13,26 +13,6 @@
 
 ACE_RCSID(Notify, Notify_Default_EMO_Factory, "$Id$")
 
-#define ASYNCH_UPDATES_THREADS 1
-  // The number of threads to send subscription/publication updates.
-  // As this is a relatively adminstrative function. let's just use 1
-  // thread to send the updates asynchronously.
-
-
-  TAO_EMO_Options::TAO_EMO_Options (void)
-    : mt_dispatching_ (0),
-      mt_source_eval_ (0),
-      mt_lookup_ (0),
-      mt_listener_eval_ (0),
-      asynch_updates_ (0),
-      alloc_task_per_proxy_ (0),
-      dispatching_threads_ (1),
-      source_threads_ (1),
-      lookup_threads_ (1),
-      listener_threads_ (1)
-{
-}
-
 int
 TAO_Notify_Default_EMO_Factory::init_svc (void)
 {
@@ -41,23 +21,25 @@ TAO_Notify_Default_EMO_Factory::init_svc (void)
 }
 
 TAO_Notify_Default_EMO_Factory::TAO_Notify_Default_EMO_Factory (void)
-  :prealloc_source_eval_task_ (0),
-   prealloc_listener_eval_task_ (0),
-   prealloc_dispatching_task_ (0)
+  : mt_dispatching_ (0),
+    mt_source_eval_ (0),
+    mt_lookup_ (0),
+    mt_listener_eval_ (0),
+    dispatching_threads_ (1),
+    source_threads_ (1),
+    lookup_threads_ (1),
+    listener_threads_ (1)
 {
 }
 
 TAO_Notify_Default_EMO_Factory::~TAO_Notify_Default_EMO_Factory ()
 {
-  delete prealloc_source_eval_task_;
-  delete prealloc_listener_eval_task_;
-  delete prealloc_dispatching_task_;
 }
 
 int
 TAO_Notify_Default_EMO_Factory::init (int argc, char* argv[])
 {
-  // ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_EMO_Factory::init\n"));
+  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_EMO_Factory::init\n"));
 
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
@@ -68,126 +50,56 @@ TAO_Notify_Default_EMO_Factory::init (int argc, char* argv[])
 
       if (ACE_OS::strcasecmp (arg, "-MTDispatching") == 0)
         {
-          EMO_OPTIONS::instance ()->mt_dispatching_ = 1;
+          this->mt_dispatching_ = 1;
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter ("-DispatchingThreads")))
         {
-          EMO_OPTIONS::instance ()->dispatching_threads_ = ACE_OS::atoi (current_arg);
+          this->dispatching_threads_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else if (ACE_OS::strcasecmp (arg, "-MTSourceEval") == 0)
         {
-          EMO_OPTIONS::instance ()->mt_source_eval_ = 1;
+          this->mt_source_eval_ = 1;
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter ("-SourceThreads")))
         {
-          EMO_OPTIONS::instance ()->source_threads_ = ACE_OS::atoi (current_arg);
+          this->source_threads_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else if (ACE_OS::strcasecmp (arg, "-MTLookup") == 0)
         {
-          EMO_OPTIONS::instance ()->mt_lookup_ = 1;
+          this->mt_lookup_ = 1;
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter ("-LookupThreads")))
         {
-          EMO_OPTIONS::instance ()->lookup_threads_ = ACE_OS::atoi (current_arg);
+          this->lookup_threads_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else if (ACE_OS::strcasecmp (arg, "-MTListenerEval") == 0)
         {
-          EMO_OPTIONS::instance ()->mt_listener_eval_ = 1;
+          this->mt_listener_eval_ = 1;
           arg_shifter.consume_arg ();
         }
       else if ((current_arg = arg_shifter.get_the_parameter ("-ListenerThreads")))
         {
-          EMO_OPTIONS::instance ()->listener_threads_ = ACE_OS::atoi (current_arg);
-          arg_shifter.consume_arg ();
-        }
-      else if (ACE_OS::strcasecmp (arg, "-AsynchUpdates") == 0)
-        {
-          EMO_OPTIONS::instance ()->asynch_updates_ = 1;
-          arg_shifter.consume_arg ();
-        }
-      else if (ACE_OS::strcasecmp (arg, "-AllocateTaskperProxy") == 0)
-        {
-          EMO_OPTIONS::instance ()->alloc_task_per_proxy_ = 1;
+          this->listener_threads_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else
         {
-          ACE_DEBUG ((LM_DEBUG,"EMO Factory did not understand %s",arg));
-          arg_shifter.ignore_arg ();
+            arg_shifter.ignore_arg ();
         }
     }
-
-  return 0;
-}
-
-TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_task (int mt, int tp_size,CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Notify_Worker_Task* task;
-
-  int threads_flags =
-    THR_SCHED_DEFAULT|THR_BOUND|THR_NEW_LWP;
-
-  //  int dispatching_threads_priority
-
-  // Later: give the user options to specify threads flags and thread priority for each task.
-
-  if (mt == 1)
-    ACE_NEW_THROW_EX (task, TAO_Notify_MT_Worker_Task (tp_size,
-                                                       threads_flags,
-                                                       0),
-                      CORBA::NO_MEMORY ());
-  else
-    ACE_NEW_THROW_EX (task,
-                      TAO_Notify_Worker_Task (),
-                      CORBA::NO_MEMORY ());
-  return task;
-}
-
-
-int
-TAO_Notify_Default_EMO_Factory::init_instance (void)
-{
-  if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 0) // preallocate all tasks.
-    {
-      return this->preallocate_tasks ();
-    }
-  return 0;
-}
-
-int
-TAO_Notify_Default_EMO_Factory::preallocate_tasks (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  this->prealloc_source_eval_task_ =
-    create_task (EMO_OPTIONS::instance ()->mt_source_eval_, EMO_OPTIONS::instance ()->source_threads_,
-                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->prealloc_listener_eval_task_ =
-    create_task (EMO_OPTIONS::instance ()->mt_listener_eval_, EMO_OPTIONS::instance ()->listener_threads_,
-                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->prealloc_dispatching_task_ =
-    create_task (EMO_OPTIONS::instance ()->mt_dispatching_, EMO_OPTIONS::instance ()->dispatching_threads_,
-                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
   return 0;
 }
 
 int
 TAO_Notify_Default_EMO_Factory::fini (void)
 {
-  //  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_EMO_Factory::fini\n"));
+  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_EMO_Factory::fini\n"));
   return 0;
 }
 
@@ -196,7 +108,7 @@ TAO_Notify_Default_EMO_Factory::create_event_manager (TAO_Notify_EventChannel_i*
 {
   TAO_Notify_Event_Manager* event_manager;
   ACE_NEW_THROW_EX (event_manager,
-                    TAO_Notify_Event_Manager (channel, this),
+                    TAO_Notify_Event_Manager (channel),
                     CORBA::NO_MEMORY ());
   return event_manager;
 }
@@ -206,7 +118,7 @@ TAO_Notify_Default_EMO_Factory::create_event_map (CORBA::Environment &ACE_TRY_EN
 {
   TAO_Notify_Event_Map* event_map;
   ACE_NEW_THROW_EX (event_map,
-                    TAO_Notify_Event_Map (this),
+                    TAO_Notify_Event_Map (),
                     CORBA::NO_MEMORY ());
   return event_map;
 }
@@ -225,109 +137,96 @@ TAO_Notify_Default_EMO_Factory::create_event_processor (TAO_Notify_Event_Manager
 TAO_Notify_Worker_Task*
 TAO_Notify_Default_EMO_Factory::create_source_eval_task (CORBA::Environment &ACE_TRY_ENV)
 {
-  if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
-    return create_task (EMO_OPTIONS::instance ()->mt_source_eval_,
-                        EMO_OPTIONS::instance ()->source_threads_,
-                        ACE_TRY_ENV);
+  // @@ pass the correct option to initialize this as passive/active object.
+  TAO_Notify_Worker_Task* task;
+
+  if (this->mt_source_eval_ == 1)
+    ACE_NEW_THROW_EX (task, TAO_Notify_MT_Worker_Task (this->source_threads_),
+                      CORBA::NO_MEMORY ());
   else
-    return prealloc_source_eval_task_;
+    ACE_NEW_THROW_EX (task,
+                      TAO_Notify_Worker_Task (),
+                      CORBA::NO_MEMORY ());
+  return task;
 }
 
 TAO_Notify_Worker_Task*
 TAO_Notify_Default_EMO_Factory::create_lookup_task (CORBA::Environment &ACE_TRY_ENV)
 {
-  return create_task (EMO_OPTIONS::instance ()->mt_lookup_,
-                      EMO_OPTIONS::instance ()->lookup_threads_, ACE_TRY_ENV);
-}
+  // @@ pass the correct option to initialize this as passive/active object.
+  TAO_Notify_Worker_Task* task;
 
-TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_listener_eval_task (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
-    return create_task (EMO_OPTIONS::instance ()->mt_listener_eval_,
-                        EMO_OPTIONS::instance ()->listener_threads_,
-                        ACE_TRY_ENV);
+  if (this->mt_lookup_ == 1)
+    ACE_NEW_THROW_EX (task, TAO_Notify_MT_Worker_Task (this->lookup_threads_),
+                      CORBA::NO_MEMORY ());
   else
-    return prealloc_listener_eval_task_;
+    ACE_NEW_THROW_EX (task,
+                      TAO_Notify_Worker_Task (),
+                      CORBA::NO_MEMORY ());
+  return task;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_dispatching_task (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Default_EMO_Factory::create_listener_eval_task (CORBA::Environment &ACE_TRY_ENV)
 {
-  if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
-    return create_task (EMO_OPTIONS::instance ()->mt_dispatching_,
-                        EMO_OPTIONS::instance ()->dispatching_threads_,
-                        ACE_TRY_ENV);
+  // @@ pass the correct option to initialize this as passive/active object.
+  TAO_Notify_Worker_Task* task;
+
+  if (this->mt_listener_eval_ == 1)
+    ACE_NEW_THROW_EX (task, TAO_Notify_MT_Worker_Task (this->listener_threads_),
+                      CORBA::NO_MEMORY ());
   else
-    return prealloc_dispatching_task_;
+    ACE_NEW_THROW_EX (task,
+                      TAO_Notify_Worker_Task (),
+                      CORBA::NO_MEMORY ());
+  return task;
 }
 
 TAO_Notify_Worker_Task*
-TAO_Notify_Default_EMO_Factory::create_updates_task (CORBA::Environment &ACE_TRY_ENV)
-{
-  return create_task (EMO_OPTIONS::instance ()->asynch_updates_, ASYNCH_UPDATES_THREADS, ACE_TRY_ENV);
-}
-
-void
-TAO_Notify_Default_EMO_Factory::destroy_source_eval_task (TAO_Notify_Worker_Task* task)
+TAO_Notify_Default_EMO_Factory::create_dispatching_task (CORBA::Environment &ACE_TRY_ENV)
 {
-  if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
-    delete task;
-}
+  TAO_Notify_Worker_Task* task;
 
-void
-TAO_Notify_Default_EMO_Factory::destroy_listener_eval_task (TAO_Notify_Worker_Task* task)
-{
-  if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
-    delete task;
-}
+  int dispatching_threads_flags =
+    THR_SCHED_DEFAULT|THR_BOUND|THR_NEW_LWP;
 
-void
-TAO_Notify_Default_EMO_Factory::destroy_dispatching_task (TAO_Notify_Worker_Task* task)
-{
-  if (EMO_OPTIONS::instance ()->alloc_task_per_proxy_ == 1)
-    delete task;
-}
+  //  int dispatching_threads_priority
 
-void
-TAO_Notify_Default_EMO_Factory::destroy_lookup_task (TAO_Notify_Worker_Task* task)
-{
-  delete task;
-}
+  // Later: give the user options to specify threads flags and thread priority for each task.
 
-void
-TAO_Notify_Default_EMO_Factory::destroy_updates_task (TAO_Notify_Worker_Task* task)
-{
-  delete task;
+  if (this->mt_dispatching_ == 1)
+    ACE_NEW_THROW_EX (task, TAO_Notify_MT_Worker_Task (this->dispatching_threads_,
+                                                       dispatching_threads_flags,
+                                                       0),
+                      CORBA::NO_MEMORY ());
+  else
+    ACE_NEW_THROW_EX (task,
+                      TAO_Notify_Worker_Task (),
+                      CORBA::NO_MEMORY ());
+  return task;
 }
 
-
 void
 TAO_Notify_Default_EMO_Factory::print_values (void)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "EMO Factory = "
-                "mt_dispatching %d "
-                "mt_source_eval %d "
-                " mt_lookup %d "
-                " mt_listener_eval %d"
-                " dispatching_threads %d "
-                " source_threads %d "
-                " lookup_threads %d "
-                " listener_threads_ %d ",
-                " AsynchUpdates %d",
-                " AllocateTaskperProxy %d",
-                EMO_OPTIONS::instance ()->mt_dispatching_,
-                EMO_OPTIONS::instance ()->mt_source_eval_,
-                EMO_OPTIONS::instance ()->mt_lookup_,
-                EMO_OPTIONS::instance ()->mt_listener_eval_,
-                EMO_OPTIONS::instance ()->dispatching_threads_,
-                EMO_OPTIONS::instance ()->source_threads_,
-                EMO_OPTIONS::instance ()->lookup_threads_,
-                EMO_OPTIONS::instance ()->listener_threads_,
-                EMO_OPTIONS::instance ()->asynch_updates_,
-                EMO_OPTIONS::instance ()->alloc_task_per_proxy_
+  ACE_DEBUG ((LM_DEBUG,
+              "EMO Factory = "
+              "mt_dispatching %d "
+              "mt_source_eval %d "
+              " mt_lookup %d "
+              " mt_listener_eval %d"
+              " dispatching_threads %d "
+              " source_threads %d "
+              " lookup_threads %d "
+              " listener_threads_ %d  \n",
+              mt_dispatching_,
+              mt_source_eval_,
+              mt_lookup_,
+              mt_listener_eval_,
+              dispatching_threads_,
+              source_threads_,
+              lookup_threads_,
+              listener_threads_
               ));
 }
 
@@ -342,9 +241,3 @@ ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_EMO_Factory,
 ACE_FACTORY_DEFINE (TAO_Notify, TAO_Notify_Default_EMO_Factory)
 
 // ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<TAO_EMO_Options, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<TAO_EMO_Options, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
index ee33d3d7633..9d47b7fe2b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -35,25 +35,6 @@
 // purpose of an Abstract Factory is to have a single object that
 // returns consistently configured objects....
 
-class TAO_EMO_Options // Options read by service conf.
-{
-public:
-  TAO_EMO_Options (void);
-
-  // Params read via the svc.conf
-  CORBA::Boolean mt_dispatching_;
-  CORBA::Boolean mt_source_eval_;
-  CORBA::Boolean mt_lookup_;
-  CORBA::Boolean mt_listener_eval_;
-  CORBA::Boolean asynch_updates_;
-  CORBA::Boolean alloc_task_per_proxy_;
-
-  int dispatching_threads_;
-  int source_threads_;
-  int lookup_threads_;
-  int listener_threads_;
-};
-
 class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_Factory
 {
  public:
@@ -82,33 +63,20 @@ class TAO_Notify_Export TAO_Notify_Default_EMO_Factory : public TAO_Notify_EMO_F
   virtual TAO_Notify_Worker_Task* create_lookup_task (CORBA::Environment &ACE_TRY_ENV);
   virtual TAO_Notify_Worker_Task* create_listener_eval_task ( CORBA::Environment &ACE_TRY_ENV);
   virtual TAO_Notify_Worker_Task* create_dispatching_task (CORBA::Environment &ACE_TRY_ENV);
-  virtual TAO_Notify_Worker_Task* create_updates_task (CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void destroy_source_eval_task (TAO_Notify_Worker_Task* task);
-  virtual void destroy_lookup_task (TAO_Notify_Worker_Task* task);
-  virtual void destroy_listener_eval_task (TAO_Notify_Worker_Task* task);
-  virtual void destroy_dispatching_task (TAO_Notify_Worker_Task* task);
-  virtual void destroy_updates_task (TAO_Notify_Worker_Task* task);
-
   virtual void print_values (void);
-  int init_instance ();
-
 protected:
-  //= Protected Methods
-  TAO_Notify_Worker_Task* create_task (int mt, int tp_size,CORBA::Environment &ACE_TRY_ENV);
-  // Create a worker task, mt => is this a MT task, if so, tp_size is thread pool size.
-
-  int preallocate_tasks (void);
+  // = Params read via the svc.conf
+  CORBA::Boolean mt_dispatching_;
+  CORBA::Boolean mt_source_eval_;
+  CORBA::Boolean mt_lookup_;
+  CORBA::Boolean mt_listener_eval_;
 
-  //= Data Members
-  TAO_Notify_Worker_Task* prealloc_source_eval_task_;
-  TAO_Notify_Worker_Task* prealloc_listener_eval_task_;
-  TAO_Notify_Worker_Task* prealloc_dispatching_task_;
+  int dispatching_threads_;
+  int source_threads_;
+  int lookup_threads_;
+  int listener_threads_;
 };
 
-// Typedef an Options Singleton.
-typedef ACE_Singleton <TAO_EMO_Options, ACE_Null_Mutex> EMO_OPTIONS;
-
 ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory)
 ACE_FACTORY_DECLARE (TAO_Notify,TAO_Notify_Default_EMO_Factory)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
index 3f16e410f11..ba4d7fcb357 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -32,6 +32,7 @@ TAO_Notify_Default_POA_Factory::init (int /*argc*/, char* /*argv*/[])
 int
 TAO_Notify_Default_POA_Factory::fini (void)
 {
+  ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Default_POA_Factory::fini\n"));
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 987efbe7cde..2fb9e4fddba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -206,6 +206,6 @@ TAO_Notify_EventChannelFactory_i::get_default_filter_factory (void)
 template class TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ChannelID, CosNotifyChannelAdmin::ChannelIDSeq>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ChannelID, CosNotifyChannelAdmin::ChannelIDSeq>
+#pragma instantiate TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ChannelID, CosNotifyChannelAdmin::ChannelIDSeq>;
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
index 8f9700a04c3..a4459325de7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -44,9 +44,7 @@ class TAO_Notify_POA_Factory;
 // portably.  I don't mean that you should do that right now, but
 // consider it in your design.
 
-class TAO_Notify_Export TAO_Notify_EventChannelFactory_i
-  : public virtual POA_CosNotifyChannelAdmin::EventChannelFactory
-  , public virtual PortableServer::RefCountServantBase
+class TAO_Notify_Export TAO_Notify_EventChannelFactory_i : public virtual POA_CosNotifyChannelAdmin::EventChannelFactory, public virtual PortableServer::RefCountServantBase
 {
   // = TITLE
   //   TAO_Notify_EventChannelFactory_i
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
index 91744f49a2c..c78f36407bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
@@ -19,10 +19,9 @@ TAO_Notify_EventChannel_i::TAO_Notify_EventChannel_i (TAO_Notify_EventChannelFac
   :lock_ (0),
    destory_child_POAs_ (0),
    channel_factory_ (my_factory),
-   channel_objects_factory_ (TAO_Notify_Factory::
-                             get_channel_objects_factory ()),
+   channel_objects_factory_ (TAO_Notify_Factory::get_channel_objects_factory ()),
    poa_factory_ (TAO_Notify_Factory::get_poa_factory ()),
-   event_manager_objects_factory_ (TAO_Notify_Factory::create_event_manager_objects_factory ()),
+   event_manager_objects_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()),
    default_op_ (CosNotifyChannelAdmin::OR_OP),
    default_id_ (0),
    event_listener_list_ (0)
@@ -33,8 +32,7 @@ TAO_Notify_EventChannel_i::TAO_Notify_EventChannel_i (TAO_Notify_EventChannelFac
 // Implementation skeleton destructor
 TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,"in EC dtor\n"));
+  ACE_DEBUG ((LM_DEBUG,"in EC dtor\n"));
   // Cleanup all resources..
 
   delete this->event_manager_;
@@ -43,8 +41,6 @@ TAO_Notify_EventChannel_i::~TAO_Notify_EventChannel_i (void)
 
   this->channel_factory_->event_channel_destroyed (this->channel_id_);
   channel_factory_->_remove_ref ();
-
-  delete event_manager_objects_factory_;
 }
 
 void
@@ -417,7 +413,7 @@ template class ACE_Unbounded_Set_Iterator<CosNotifyChannelAdmin::AdminID>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::AdminID, CosNotifyChannelAdmin::AdminIDSeq>
+#pragma instantiate TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::AdminID, CosNotifyChannelAdmin::AdminIDSeq>;
 #pragma instantiate TAO_Notify_ID_Pool<CosNotifyChannelAdmin::AdminID>
 
 #pragma instantiate ACE_Unbounded_Set<CosNotifyChannelAdmin::AdminID>
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
index 17d5970b0ad..35cdd5e100a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
@@ -14,12 +14,12 @@
 
 ACE_RCSID(Notify, Notify_Event_Manager, "$Id$")
 
-TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (TAO_Notify_EventChannel_i* event_channel, TAO_Notify_EMO_Factory* emo_factory)
+TAO_Notify_Event_Manager::TAO_Notify_Event_Manager (TAO_Notify_EventChannel_i* event_channel)
   :event_channel_ (event_channel),
    event_map_ (0),
    event_processor_ (0),
    updates_dispatching_task_ (0),
-   emo_factory_ (emo_factory),
+   emo_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()),
    admin_properties_ (0)
 {
 }
@@ -28,10 +28,9 @@ TAO_Notify_Event_Manager::~TAO_Notify_Event_Manager ()
 {
   delete this->event_map_;
   delete this->event_processor_;
+  delete this->updates_dispatching_task_;
   delete this->lock_;
   delete this->admin_properties_;
-
-  emo_factory_->destroy_updates_task (this->updates_dispatching_task_);
 }
 
 void
@@ -54,7 +53,8 @@ TAO_Notify_Event_Manager::init (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK;
 
   this->updates_dispatching_task_ =
-    this->emo_factory_->create_updates_task (ACE_TRY_ENV);
+    // @@ add another method to RM
+    this->emo_factory_->create_dispatching_task (ACE_TRY_ENV);
   ACE_CHECK;
 
   // Init the objects
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
index a72162954e5..10e97a06903 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
@@ -52,8 +52,7 @@ class TAO_Notify_Export TAO_Notify_Event_Manager
 
  public:
   // = Initialization and termination code.
-  TAO_Notify_Event_Manager (TAO_Notify_EventChannel_i* parent,
-                            TAO_Notify_EMO_Factory* emo_factory);
+  TAO_Notify_Event_Manager (TAO_Notify_EventChannel_i* parent);
   // Constructor.
 
   ~TAO_Notify_Event_Manager ();
@@ -105,22 +104,14 @@ class TAO_Notify_Export TAO_Notify_Event_Manager
   TAO_Notify_AdminProperties* admin_properties (void);
   // Get the Admin Properties.
 
-  TAO_Notify_EMO_Factory* resource_factory (void);
-  // Get the Resource Factory.
-
   // = Event forwarding methods.
-  void process_event (TAO_Notify_Event* event,
-                      TAO_Notify_EventSource* event_source,
-                      CORBA::Environment &ACE_TRY_ENV);
+  void process_event (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV);
   // Delivers the event to listeners subscribed for <event>
   // <event_source> is the <event> source to the Event Manager.
 
-protected:
+ protected:
   // = Event dispatching methods.
-  void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list,
-                           TAO_Notify_EventType_List& added,
-                           TAO_Notify_EventType_List& removed,
-                           CORBA::Environment &ACE_TRY_ENV);
+  void dispatch_updates_i (TAO_Notify_UpdateListener_List* update_listener_list, TAO_Notify_EventType_List& added, TAO_Notify_EventType_List& removed, CORBA::Environment &ACE_TRY_ENV);
   // Dispatch the updates to the <update_listener_list>
 
   // = Data members.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
index 374b1f2b47d..27cccc42fb4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
@@ -6,17 +6,13 @@
 #include "tao/corba.h"
 
 ACE_INLINE void
-TAO_Notify_Event_Manager::process_event  (TAO_Notify_Event* event,
-                                          TAO_Notify_EventSource* event_source,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Manager::process_event  (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV)
 {
   if (admin_properties_->reject_new_events () == 1
       && admin_properties_->queue_full ())
     ACE_THROW (CORBA::IMP_LIMIT ());
 
-  this->event_processor_->evaluate_source_filter (event,
-                                                  event_source,
-                                                  ACE_TRY_ENV);
+  this->event_processor_->evaluate_source_filter (event, event_source, ACE_TRY_ENV);
   // Start by checking if the event passes through the Source's filter.
 }
 
@@ -77,9 +73,3 @@ TAO_Notify_Event_Manager::admin_properties (void)
 {
   return this->admin_properties_;
 }
-
-ACE_INLINE TAO_Notify_EMO_Factory*
-TAO_Notify_Event_Manager::resource_factory (void)
-{
-  return this->emo_factory_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
index 2403e2a0d63..0a9cc46af7d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
@@ -45,8 +45,6 @@ class TAO_Notify_Export TAO_Notify_EMO_Factory : public ACE_Service_Object
   //   Factory interface for event manager and friends.
   //
  public:
-  virtual ~TAO_Notify_EMO_Factory (){};
-
   virtual TAO_Notify_Event_Manager* create_event_manager (TAO_Notify_EventChannel_i* channel, CORBA::Environment &ACE_TRY_ENV)= 0;
   // Create an event manager.
 
@@ -60,21 +58,9 @@ class TAO_Notify_Export TAO_Notify_EMO_Factory : public ACE_Service_Object
   virtual TAO_Notify_Worker_Task* create_source_eval_task (CORBA::Environment &ACE_TRY_ENV)= 0;
   virtual TAO_Notify_Worker_Task* create_lookup_task (CORBA::Environment &ACE_TRY_ENV)= 0;
   virtual TAO_Notify_Worker_Task* create_listener_eval_task (CORBA::Environment &ACE_TRY_ENV)= 0;
-
   virtual TAO_Notify_Worker_Task* create_dispatching_task (CORBA::Environment &ACE_TRY_ENV)= 0;
-  // Task that dispatches events.
-  virtual TAO_Notify_Worker_Task* create_updates_task (CORBA::Environment &ACE_TRY_ENV)= 0;
-  // Task that dispatches updates.
-
-  // Destroy processing tasks.
-  virtual void destroy_source_eval_task (TAO_Notify_Worker_Task* task) = 0;
-  virtual void destroy_lookup_task (TAO_Notify_Worker_Task* task) = 0;
-  virtual void destroy_listener_eval_task (TAO_Notify_Worker_Task* task) = 0;
-  virtual void destroy_dispatching_task (TAO_Notify_Worker_Task* task) = 0;
-  virtual void destroy_updates_task (TAO_Notify_Worker_Task* task) = 0;
 
   virtual void print_values (void) = 0;
-  // bad hack. why is this here?!
 };
 
 #include "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
index 71fa748a634..c4eedaf9431 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
@@ -14,11 +14,11 @@
 
 ACE_RCSID(Notify, Notify_Event_Map, "$Id$")
 
-TAO_Notify_Event_Map::TAO_Notify_Event_Map (TAO_Notify_EMO_Factory* emo_factory)
+TAO_Notify_Event_Map::TAO_Notify_Event_Map (void)
   :default_subscription_list_ (0),
    subscription_change_listeners_ (0),
    publication_change_listeners_ (0),
-   emo_factory_ (emo_factory),
+   emo_factory_ (TAO_Notify_Factory::get_event_manager_objects_factory ()),
    collection_factory_ (TAO_Notify_Factory::get_collection_factory ())
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
index be7769774e8..d8098afb16a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
@@ -49,7 +49,7 @@ class TAO_Notify_Export TAO_Notify_Event_Map
   //   - Lists of subscriptions, publications update listeners.
   //
 public:
-  TAO_Notify_Event_Map (TAO_Notify_EMO_Factory* emo_factory);
+  TAO_Notify_Event_Map (void);
   // Constructor.
 
   virtual ~TAO_Notify_Event_Map ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
index 616daab0ece..2483595a0be 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
@@ -18,7 +18,6 @@ TAO_Notify_Event_Processor::TAO_Notify_Event_Processor (TAO_Notify_Event_Manager
    lookup_task_ (0),
    emo_factory_ (0)
 {
-  this->emo_factory_ = event_manager_->resource_factory ();
 }
 
 TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor ()
@@ -29,6 +28,9 @@ TAO_Notify_Event_Processor::~TAO_Notify_Event_Processor ()
 void
 TAO_Notify_Event_Processor::init (CORBA::Environment& ACE_TRY_ENV)
 {
+  this->emo_factory_ =
+    TAO_Notify_Factory::get_event_manager_objects_factory ();
+
   this->lookup_task_ = this->emo_factory_->create_lookup_task (ACE_TRY_ENV);
   ACE_CHECK;
 
@@ -46,14 +48,9 @@ TAO_Notify_Event_Processor::shutdown (CORBA::Environment & ACE_TRY_ENV)
 }
 
 void
-TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event,
-                                                    TAO_Notify_EventSource* event_source,
-                                                    CORBA::Environment& ACE_TRY_ENV)
+TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment& ACE_TRY_ENV)
 {
   // TODO: use cache allocator here.
-  // @@ Pradeep: you shouldn't be allocating at all!  If this must go
-  // into a queue then the processing queue should make the
-  // allocation, that way the single threaded case works just fine.
   TAO_Notify_Source_Filter_Eval_Command* mb =
     new TAO_Notify_Source_Filter_Eval_Command (this, event, event_source);
 
@@ -61,9 +58,7 @@ TAO_Notify_Event_Processor::evaluate_source_filter (TAO_Notify_Event* event,
 }
 
 void
-TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event,
-                                                  TAO_Notify_EventSource* /*event_source*/,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Event_Processor::lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* /*event_source*/, CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_Notify_Lookup_Command* lookup =
     new TAO_Notify_Lookup_Command (this, event, this->event_manager_->event_map ());
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
index d42fa98db99..22688b5ff46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
@@ -62,30 +62,19 @@ class TAO_Notify_Export TAO_Notify_Event_Processor
   void shutdown (CORBA::Environment &ACE_TRY_ENV);
   // Shutdown operations.
 
-  void evaluate_source_filter (TAO_Notify_Event* event,
-                               TAO_Notify_EventSource* event_source,
-                               CORBA::Environment& ACE_TRY_ENV);
+  void evaluate_source_filter(TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment& ACE_TRY_ENV);
   // Event processing entry point.
 
   // = Callbacks for Source/Event Listeners.
-  void lookup_subscriptions (TAO_Notify_Event* event,
-                             TAO_Notify_EventSource* event_source,
-                             CORBA::Environment &ACE_TRY_ENV);
-  // This method is called by an Event_Source after it has
-  // successfully evaluated its filter. 
-
-  void evaluate_listener_filter (TAO_Notify_Event* event,
-                                 TAO_Notify_EventListener* event_listener,
-                                 CORBA::Boolean eval_parent,
-                                 CORBA::Environment &ACE_TRY_ENV);
-  // This method is called by the subscription lookup command asking
-  // that <event> be delivered to <event_listener>.
-
-  void dispatch_event (TAO_Notify_Event* event,
-                       TAO_Notify_EventListener* event_listener,
-                       CORBA::Environment &ACE_TRY_ENV);
-  // This method is called by an Event_Listener after it has
-  // successfully evaluated its filter. 
+  void lookup_subscriptions (TAO_Notify_Event* event, TAO_Notify_EventSource* event_source, CORBA::Environment &ACE_TRY_ENV);
+  // This method is called by an Event_Source after it has successfully evaluated its filter.
+
+  void evaluate_listener_filter (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Boolean eval_parent, CORBA::Environment &ACE_TRY_ENV);
+  // This method is called by the subscription lookup command asking that <event> be delivered
+  // to <event_listener>.
+
+  void dispatch_event (TAO_Notify_Event* event, TAO_Notify_EventListener* event_listener, CORBA::Environment &ACE_TRY_ENV);
+  // This method is called by an Event_Listener after it has successfully evaluated its filter.
 
 protected:
   // = Data Members
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
index 575f62c7fec..7423fa632d1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
@@ -52,12 +52,14 @@ TAO_Notify_Factory::init (CORBA::Environment &ACE_TRY_ENV)
     ACE_Dynamic_Service <TAO_Notify_EMO_Factory>::instance (TAO_NOTIFY_DEF_EMO_FACTORY_NAME);
 
   if (emo_factory_ == 0)
-    ACE_DEBUG ((LM_DEBUG, "Unable to load Event Manager factory...\n"));
-  else
     {
-      ACE_DEBUG ((LM_DEBUG, "Loaded Event Manager factory...\n"));
-      emo_factory_->print_values ();
+      ACE_NEW_THROW_EX (emo_factory_,
+                        TAO_Notify_Default_EMO_Factory (),
+                        CORBA::NO_MEMORY ());
     }
+  else
+    ACE_DEBUG ((LM_DEBUG, "Loaded EMO factory\n"));
+  emo_factory_->print_values ();
 }
 
 void
@@ -85,17 +87,9 @@ TAO_Notify_Factory::get_collection_factory (void)
 }
 
 TAO_Notify_EMO_Factory*
-TAO_Notify_Factory::create_event_manager_objects_factory (void)
+TAO_Notify_Factory::get_event_manager_objects_factory (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  TAO_Notify_Default_EMO_Factory* local_emo_fact;
-  ACE_NEW_THROW_EX (local_emo_fact,
-                    TAO_Notify_Default_EMO_Factory (),
-                    CORBA::NO_MEMORY ());
-
-  local_emo_fact->init_instance ();
-  // @@ check return value
-  return local_emo_fact;
+  return TAO_Notify_Factory::emo_factory_;
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
index bc430df663d..0dd144d8406 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
@@ -56,7 +56,7 @@ class TAO_Notify_Export TAO_Notify_Factory
   static TAO_Notify_Collection_Factory* get_collection_factory (void);
   // Factory for all collections in the notify service.
 
-  static TAO_Notify_EMO_Factory* create_event_manager_objects_factory (void);
+  static TAO_Notify_EMO_Factory* get_event_manager_objects_factory (void);
   // The event manager objects.
 
  protected:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
index 4c773d6fc03..72beefedd0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
@@ -131,7 +131,7 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<CosNotifyFilter::FilterID,CosNot
 template class TAO_Notify_ID_Pool_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::FilterIDSeq>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>
+#pragma instantiate ACE_Hash_Map_Entry<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var>;
 #pragma instantiate ACE_Hash_Map_Manager<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,ACE_Hash<CosNotifyFilter::FilterID>, ACE_Equal_To<CosNotifyFilter::FilterID>,TAO_SYNCH_MUTEX>
 #pragma instantiate ACE_Hash_Map_Iterator<CosNotifyFilter::FilterID,CosNotifyFilter::Filter_var,TAO_SYNCH_MUTEX>
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
index f08f321d130..096fd3152ef 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
@@ -112,8 +112,8 @@ TAO_Notify_Filter_i::add_constraints (
   ))
 {
   int constraint_length = constraint_list.length ();
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "constraint_length = %d\n", constraint_length));
+
+  ACE_DEBUG ((LM_DEBUG, "constraint_length = %d\n", constraint_length));
   // create the list that goes out.
   CosNotifyFilter::ConstraintInfoSeq* infoseq;
   ACE_NEW_THROW_EX (infoseq,
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
index a141753fc3f..8c9ce78ab3b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_MT_Worker_Task.cpp
@@ -98,8 +98,7 @@ TAO_Notify_MT_Worker_Task::svc (void)
           // Decrement the global event count.
           (*this->queue_length_)--;
 
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG, "removing from queue\n"));
+          ACE_DEBUG ((LM_DEBUG, "removing from queue\n"));
           TAO_Notify_Command *command =
             ACE_dynamic_cast(TAO_Notify_Command*, mb);
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
index 2b0c390dbf7..806cc2b5620 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
@@ -35,7 +35,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
   // Create the task to forward filtering commands to:
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
-    event_manager_->resource_factory ();
+    TAO_Notify_Factory::get_event_manager_objects_factory ();
 
   this->filter_eval_task_ =
     event_manager_objects_factory->create_source_eval_task (ACE_TRY_ENV);
@@ -68,10 +68,7 @@ TAO_Notify_ProxyConsumer<SERVANT_TYPE>::~TAO_Notify_ProxyConsumer (void)
   this->filter_eval_task_->shutdown (ACE_TRY_ENV);
   ACE_CHECK;
 
-  TAO_Notify_EMO_Factory* event_manager_objects_factory =
-    event_manager_->resource_factory ();
-
-  event_manager_objects_factory->destroy_listener_eval_task (this->filter_eval_task_);
+  delete this->filter_eval_task_;
 }
 
 template <class SERVANT_TYPE> CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
index ceb0cce022b..85c6a1ad099 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
@@ -223,6 +223,6 @@ template class ACE_Unbounded_Queue_Iterator <TAO_Notify_Event*>;
 
 #pragma instantiate ACE_Unbounded_Queue<TAO_Notify_Event*>
 #pragma instantiate ACE_Node<TAO_Notify_Event*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator <TAO_Notify_Event*>
+#pragma instantiate ACE_Unbounded_Queue_Iterator <TAO_Notify_Event*>;
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
index 15e6a791eac..8271f4e3faa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
@@ -37,7 +37,7 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::init (CosNotifyChannelAdmin::ProxyID pro
   this->lock_ = cof->create_proxy_supplier_lock (ACE_TRY_ENV);
 
   TAO_Notify_EMO_Factory* event_manager_objects_factory =
-    event_manager_->resource_factory ();
+    TAO_Notify_Factory::get_event_manager_objects_factory ();
 
   // Create the task to forward filtering/dispatching commands to:
   this->dispatching_task_ =
@@ -80,11 +80,8 @@ TAO_Notify_ProxySupplier<SERVANT_TYPE>::~TAO_Notify_ProxySupplier (void)
   this->consumer_admin_->proxy_pushsupplier_destroyed (this->proxy_id_);
   consumer_admin_->_remove_ref (ACE_TRY_ENV);
 
-  TAO_Notify_EMO_Factory* event_manager_objects_factory =
-    event_manager_->resource_factory ();
-
-  event_manager_objects_factory->destroy_dispatching_task (this->dispatching_task_);
-  event_manager_objects_factory->destroy_source_eval_task (this->filter_eval_task_);
+  delete this->dispatching_task_;
+  delete this->filter_eval_task_;
 }
 
 template <class SERVANT_TYPE> CORBA::Boolean
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
index c2c53c39848..d853fac682d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
@@ -22,8 +22,7 @@ TAO_Notify_Proxy<SERVANT_TYPE>::TAO_Notify_Proxy (void)
 template <class SERVANT_TYPE>
 TAO_Notify_Proxy<SERVANT_TYPE>::~TAO_Notify_Proxy (void)
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "in ~TAO_Notify_Proxy\n"));
+  ACE_DEBUG ((LM_DEBUG, "in ~TAO_Notify_Proxy\n"));
 }
 
 template <class SERVANT_TYPE> CORBA::ULong
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
index cd0f506d31d..696285c0801 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
@@ -27,8 +27,7 @@ TAO_Notify_SupplierAdmin_i::TAO_Notify_SupplierAdmin_i (TAO_Notify_EventChannel_
 // Implementation skeleton destructor
 TAO_Notify_SupplierAdmin_i::~TAO_Notify_SupplierAdmin_i ()
 {
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,"in SA dtor\n"));
+  ACE_DEBUG ((LM_DEBUG,"in SA dtor\n"));
   // Cleanup all resources..
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -444,6 +443,6 @@ TAO_Notify_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &ACE_TRY_EN
 template class TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ProxyID, CosNotifyChannelAdmin::ProxyIDSeq>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ProxyID, CosNotifyChannelAdmin::ProxyIDSeq>
+#pragma instantiate TAO_Notify_ID_Pool_Ex<CosNotifyChannelAdmin::ProxyID, CosNotifyChannelAdmin::ProxyIDSeq>;
 
 #endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
index fc73ea9ab10..f255d8d8fcb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -16,43 +16,6 @@
 ACE_RCSID(TAO_SSLIOP, IIOP_SSL_Connector, "$Id$")
 
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>;
-
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*>;
-template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_Connector>
-#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>
-
-
-#pragma instantiate ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_Connector>
-#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>
-#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*>
-#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 TAO_IIOP_SSL_Connector::TAO_IIOP_SSL_Connector (CORBA::Boolean flag)
   : TAO_IIOP_Connector (flag),
     connect_strategy_ (),
@@ -248,3 +211,40 @@ TAO_IIOP_SSL_Connector::preconnect (const char *)
 
   ACE_NOTSUP_RETURN (0);
 }
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler>;
+template class TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>;
+template class ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>;
+
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*>;
+template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_SSL_Connection_Handler>
+#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>
+#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_Connector>
+#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>
+
+
+#pragma instantiate ACE_Connector<TAO_IIOP_SSL_Connection_Handler, ACE_SOCK_Connector>
+#pragma instantiate ACE_Creation_Strategy<TAO_IIOP_SSL_Connection_Handler>
+#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>
+#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*>
+#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_SSL_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index d97a502da03..02b660a077d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -64,21 +64,8 @@ TAO_SSLIOP_Connection_Handler::TAO_SSLIOP_Connection_Handler (
 TAO_SSLIOP_Connection_Handler::
     ~TAO_SSLIOP_Connection_Handler (void)
 {
-  // If the socket has not already been closed.
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      // Cannot deal with errors, and therefore they are ignored.
-      this->transport_.send_buffered_messages ();
-    }
-  else
-    {
-      // Dequeue messages and delete message blocks.
-      this->transport_.dequeue_all ();
-    }
 }
 
-
-
 int
 TAO_SSLIOP_Connection_Handler::open (void*)
 {
@@ -198,18 +185,6 @@ TAO_SSLIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
       // passed to the reactor on ORB destruction.
       this->is_registered (0);
 
-      // Close the handle..
-      if (this->get_handle () != ACE_INVALID_HANDLE)
-        {
-          // Send the buffered messages first
-          this->transport_.send_buffered_messages ();
-
-          this->peer ().close ();
-
-          // Purge the entry too
-          this->mark_invalid ();
-        }
-
       // Decrement the reference count
       this->decr_ref_count ();
     }
@@ -229,18 +204,9 @@ int
 TAO_SSLIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
                                                const void *)
 {
-  // This method is called when buffering timer expires.
-  //
-  ACE_Time_Value *max_wait_time = 0;
-
-  TAO_Stub *stub = 0;
-  int has_timeout;
-  this->orb_core ()->call_timeout_hook (stub,
-                                        has_timeout,
-                                        *max_wait_time);
-
   // Cannot deal with errors, and therefore they are ignored.
-  this->transport ()->send_buffered_messages (max_wait_time);
+  if (this->transport ()->handle_output () == -1)
+    return -1;
 
   return 0;
 }
@@ -253,7 +219,6 @@ TAO_SSLIOP_Connection_Handler::close (u_long)
   return 0;
 }
 
-
 int
 TAO_SSLIOP_Connection_Handler::add_handler_to_cache (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 9c4381a2b7e..3d2ab57182e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -13,47 +13,6 @@
 
 ACE_RCSID(TAO_SSLIOP, SSLIOP_Connector, "$Id$")
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-
-template class TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>;
-template class ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>;
-template class ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>;
-
-
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*>;
-template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>
-
-#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Connection_Handler>
-#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*>
-#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 TAO_SSLIOP_Connector::TAO_SSLIOP_Connector (int no_protection)
   : TAO_IIOP_SSL_Connector (),
     no_protection_ (no_protection),
@@ -327,3 +286,44 @@ TAO_SSLIOP_Connector::make_profile (const char *endpoint,
 
   ACE_CHECK;
 }
+
+
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+
+template class TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>;
+template class TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler>;
+template class ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>;
+template class ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>;
+template class ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>;
+template class ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>;
+
+
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*>;
+template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SSLIOP_Connection_Handler>
+#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SSLIOP_Connection_Handler>
+#pragma instantiate ACE_Strategy_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connect_Strategy<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SSL_SOCK_CONNECTOR>
+#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>
+
+#pragma instantiate ACE_Connector<TAO_SSLIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Creation_Strategy<TAO_SSLIOP_Connection_Handler>
+#pragma instantiate ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>
+#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*>
+#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SSLIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SSLIOP_Connection_Handler*>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
index da317e0054a..d80e310251d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -30,14 +30,6 @@ TAO_SSLIOP_Server_Invocation_Interceptor::name (
 }
 
 void
-TAO_SSLIOP_Server_Invocation_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-
-void
 TAO_SSLIOP_Server_Invocation_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
     TAO_ENV_ARG_DECL)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
index 039734cbbff..1431b796b31 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h
@@ -61,9 +61,6 @@ public:
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri
       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index 8bb50c58bad..a229204805b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -4,9 +4,7 @@
 
 #include "SSLIOP_ORBInitializer.h"
 
-ACE_RCSID (TAO_SSLIOP,
-           SSLIOP_ORBInitializer,
-           "$Id$")
+ACE_RCSID (TAO_SSLIOP, SSLIOP_ORBInitializer, "$Id$")
 
 #include "SSLIOP_Current.h"
 #include "SSLIOP_Invocation_Interceptor.h"
@@ -21,6 +19,14 @@ TAO_SSLIOP_ORBInitializer::TAO_SSLIOP_ORBInitializer (int no_protection)
 
 void
 TAO_SSLIOP_ORBInitializer::pre_init (
+    PortableInterceptor::ORBInitInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+}
+
+void
+TAO_SSLIOP_ORBInitializer::post_init (
     PortableInterceptor::ORBInitInfo_ptr info
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -37,7 +43,7 @@ TAO_SSLIOP_ORBInitializer::pre_init (
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) SSLIOP_ORBInitializer::pre_init:\n"
+                    "(%P|%t) SSLIOP_ORBInitializer::post_init:\n"
                     "(%P|%t)    Unable to narrow "
                     "\"PortableInterceptor::ORBInitInfo_ptr\" to\n"
                     "(%P|%t)   \"TAO_ORBInitInfo *.\"\n"));
@@ -55,10 +61,6 @@ TAO_SSLIOP_ORBInitializer::pre_init (
   ACE_CHECK;
 
   // Create the SSLIOP::Current object.
-  // Note that a new SSLIOP::Current object is created for each ORB.
-  // It wouldn't be very used to share security context information
-  // with another ORB that isn't configured with security, for
-  // example.
   SSLIOP::Current_ptr current = SSLIOP::Current::_nil ();
   ACE_NEW_THROW_EX (current,
                     TAO_SSLIOP_Current (tss_slot, orb_id.in ()),
@@ -76,33 +78,6 @@ TAO_SSLIOP_ORBInitializer::pre_init (
                                     ssliop_current.in (),
                                     ACE_TRY_ENV);
   ACE_CHECK;
-}
-
-void
-TAO_SSLIOP_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ENV_ARG_DEFN;
-
-  // Note we do not store the SSLIOP::Current as a class member since
-  // we need to avoid potential problems where the same
-  // SSLIOP::Current object is shared between ORBs.  Each ORB should
-  // have its own unique SSLIOP::Current object.  By obtaining the
-  // SSLIOP::Current object from the resolve_initial_references()
-  // mechanism, we are guaranteed that the SSLIOP::Current object is
-  // specific to the ORB being initialized since a new SSLIOP::Current
-  // object is registered for each ORB in this ORBInitializer's
-  // pre_init() method.
-
-  CORBA::Object_var obj =
-    info->resolve_initial_references ("SSLIOPCurrent", ACE_TRY_ENV);
-  ACE_CHECK;
-
-  SSLIOP::Current_var ssliop_current =
-    SSLIOP::Current::_narrow (obj.in (), ACE_TRY_ENV);
-  ACE_CHECK;
 
   // Create the SSLIOP secure invocation server request interceptor.
   PortableInterceptor::ServerRequestInterceptor_ptr si =
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
index 1c612c1e3d3..bbf60203a7f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -4,9 +4,7 @@
 
 #include "SSLIOP_Transport.h"
 
-ACE_RCSID (TAO_SSLIOP,
-           SSLIOP_Transport,
-           "$Id$")
+ACE_RCSID (TAO_SSLIOP, SSLIOP_Transport, "$Id$")
 
 #include "SSLIOP_Connection_Handler.h"
 #include "SSLIOP_Profile.h"
@@ -23,11 +21,11 @@ ACE_RCSID (TAO_SSLIOP,
 #include "tao/Acceptor_Registry.h"
 
 
-TAO_SSLIOP_Transport::TAO_SSLIOP_Transport (
-  TAO_SSLIOP_Connection_Handler *handler,
-  TAO_ORB_Core *orb_core,
-  CORBA::Boolean /*flag*/)
-  : TAO_Transport (TAO_TAG_IIOP_PROFILE, orb_core),
+TAO_SSLIOP_Transport::TAO_SSLIOP_Transport (TAO_SSLIOP_Connection_Handler *handler,
+                                            TAO_ORB_Core *orb_core,
+                                            CORBA::Boolean /*flag*/)
+  : TAO_Transport (TAO_TAG_IIOP_PROFILE,
+                   orb_core),
     connection_handler_ (handler),
     messaging_object_ (0)
 {
@@ -66,7 +64,7 @@ TAO_SSLIOP_Transport::close_connection (void)
   // First close the handle
   this->connection_handler_->handle_close ();
 
-  // Purge the entry
+  // Now, purge the entry
   this->connection_handler_->purge_entry ();
 }
 
@@ -77,74 +75,16 @@ TAO_SSLIOP_Transport::idle (void)
 }
 
 ssize_t
-TAO_SSLIOP_Transport::send (const ACE_Message_Block *message_block,
-                            const ACE_Time_Value *max_wait_time,
-                            size_t *bt)
+TAO_SSLIOP_Transport::send (iovec *iov, int iovcnt,
+                            size_t &bytes_transferred,
+                            const ACE_Time_Value *max_wait_time)
 {
-  // @@ This code should be refactored into ACE.cpp or something
-  // similar!
+  ssize_t retval = this->service_handler ()->peer ().send (iov, iovcnt,
+                                                           max_wait_time);
+  if (retval > 0)
+    bytes_transferred = retval;
 
-  // For the most part this was copied from GIOP::send_request and
-  // friends.
-
-  size_t temp;
-  size_t &bytes_transferred = bt == 0 ? temp : *bt;
-
-  iovec iov[IOV_MAX];
-  int iovcnt = 0;
-  ssize_t n = 0;
-
-  for (const ACE_Message_Block *i = message_block;
-       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)
-            {
-              if (max_wait_time == 0)
-                n = this->service_handler ()->peer ().sendv_n (iov,
-                                                               iovcnt);
-              else
-                // @@ No timeouts!!!
-                n = this->service_handler ()->peer ().sendv_n (iov,
-                                                               iovcnt /*,
-                                                     max_wait_time */);
-
-              if (n == 0 ||
-                  n == -1)
-                return n;
-
-              bytes_transferred += n;
-              iovcnt = 0;
-            }
-        }
-    }
-
-  // Check for remaining buffers to be sent!
-  if (iovcnt != 0)
-    {
-      n = this->service_handler ()->peer ().sendv_n (iov,
-                                                     iovcnt);
-      if (n == 0 ||
-          n == -1)
-        return n;
-
-      bytes_transferred += n;
-    }
-
-  return bytes_transferred;
+  return retval;
 }
 
 ssize_t
@@ -253,7 +193,7 @@ TAO_SSLIOP_Transport::send_message (TAO_OutputCDR &stream,
   // versions seem to need it though.  Leaving it costs little.
 
   // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_or_buffer (stub,
+  ssize_t n = this->send_message_i (stub,
                                     twoway,
                                     stream.begin (),
                                     max_wait_time);
@@ -269,17 +209,6 @@ TAO_SSLIOP_Transport::send_message (TAO_OutputCDR &stream,
       return -1;
     }
 
-  // EOF.
-  if (n == 0)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n")
-                    ACE_TEXT ("EOF, closing conn %d\n"),
-                    this->handle()));
-      return -1;
-    }
-
   return 1;
 }
 
@@ -456,14 +385,11 @@ TAO_SSLIOP_Transport::process_message (void)
 
       if (result == -1)
         {
-          // Something really critical happened, we will forget about
-          // every reply on this connection.
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
-                        ACE_TEXT ("TAO (%P|%t) : SSLIOP_Transport::")
-                        ACE_TEXT ("process_message - ")
+                        ACE_TEXT ("TAO (%P|%t) : SSLIOP_Client_Transport::")
+                        ACE_TEXT ("handle_client_input - ")
                         ACE_TEXT ("dispatch reply failed\n")));
-
           this->messaging_object_->reset ();
           this->tms_->connection_closed ();
           return -1;
@@ -472,16 +398,7 @@ TAO_SSLIOP_Transport::process_message (void)
       if (result == 0)
         {
           this->messaging_object_->reset ();
-
-          // The reply dispatcher was no longer registered.
-          // This can happened when the request/reply
-          // times out.
-          // To throw away all registered reply handlers is
-          // not the right thing, as there might be just one
-          // old reply coming in and several valid new ones
-          // pending. If we would invoke <connection_closed>
-          // we would throw away also the valid ones.
-          //return 0;
+          return 0;
         }
 
 
@@ -529,7 +446,7 @@ TAO_SSLIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
   TAO_OutputCDR cdr;
 
   // Marshall the information into the stream
-  if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0)
+  if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)== 0)
       || (cdr << listen_point_list) == 0)
     return;
 
@@ -548,7 +465,7 @@ TAO_SSLIOP_Transport::get_listen_point (
 {
   TAO_SSLIOP_Acceptor *iiop_acceptor =
     ACE_dynamic_cast (TAO_SSLIOP_Acceptor *,
-                      acceptor);
+                      acceptor );
 
   // Get the array of endpoints serviced by <iiop_acceptor>
   const ACE_INET_Addr *endpoint_addr =
@@ -565,8 +482,8 @@ TAO_SSLIOP_Transport::get_listen_point (
       == -1)
     {
        ACE_ERROR_RETURN ((LM_ERROR,
-                          ACE_TEXT ("(%P|%t) Could not resolve local host")
-                          ACE_TEXT (" address in set_bidir_context_info()\n")),
+                         ACE_TEXT ("(%P|%t) Could not resolve local host")
+                         ACE_TEXT (" address in set_bidir_context_info () \n")),
                         -1);
     }
 
@@ -582,16 +499,16 @@ TAO_SSLIOP_Transport::get_listen_point (
       // Note: Looks like there is no point in sending the list of
       // endpoints on interfaces on which this connection has not
       // been established. If this is wrong, please correct me.
-      char local_interface[MAXHOSTNAMELEN + 1];
-      char acceptor_interface[MAXHOSTNAMELEN + 1];
+      char local_interface[MAXHOSTNAMELEN];
+      char acceptor_interface[MAXHOSTNAMELEN];
 
       if (endpoint_addr[index].get_host_name (acceptor_interface,
-                                              sizeof (acceptor_interface)) ==
+                                              MAXHOSTNAMELEN) ==
           -1)
         continue;
 
       if (local_addr.get_host_name (local_interface,
-                                    sizeof (local_interface)) == -1)
+                                    MAXHOSTNAMELEN) == -1)
         continue;
 
       // @@ This is very bad for performance, but it is a one time
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
index 84b3c86cfaa..75ce458eaf1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.h
@@ -76,9 +76,9 @@ public:
   virtual int idle (void);
 
   /// Write the complete Message_Block chain to the connection.
-  virtual ssize_t send (const ACE_Message_Block *mblk,
-                        const ACE_Time_Value *s = 0,
-                        size_t *bytes_transferred = 0);
+  virtual ssize_t send (iovec *iov, int iovcnt,
+                        size_t &bytes_transferred,
+                        const ACE_Time_Value *timeout = 0);
 
   /// Read len bytes from into buf.
   virtual ssize_t recv (char *buf,
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
index ce4318fd183..5810f2fec64 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -28,7 +28,7 @@
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
 
-class TAO_Trading_Export TAO_Constraint_Interpreter : public TAO_Interpreter
+class TAO_Constraint_Interpreter : public TAO_Interpreter
 {
   //
   // = TITLE
@@ -74,7 +74,7 @@ public:
   // tree was constructed. This method is thread safe (hopefully).
 };
 
-class TAO_Trading_Export TAO_Preference_Interpreter : public TAO_Interpreter
+class TAO_Preference_Interpreter : public TAO_Interpreter
 {
   // = TITLE
   //   The TAO_Preference_Interpreter will, given a valid preference
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
index e7e4b89ccb4..f8226a995f9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -58,7 +58,7 @@ public:
   virtual ~TAO_Constraint (void) {}
 };
 
-class TAO_Trading_Export TAO_Noop_Constraint : public TAO_Constraint
+class TAO_Noop_Constraint : public TAO_Constraint
 // = TITLE
 //   A node that represents an operation with no operands.
 {
@@ -77,7 +77,7 @@ private:
   TAO_Expression_Type type_;
 };
 
-class TAO_Trading_Export TAO_Binary_Constraint : public TAO_Constraint
+class TAO_Binary_Constraint : public TAO_Constraint
 //
 // = TITLE
 //      TAO_Binary_Constraint represents an operation with left
@@ -134,7 +134,7 @@ private:
   // The operands of the expression
 };
 
-class TAO_Trading_Export TAO_Unary_Constraint : public TAO_Constraint
+class TAO_Unary_Constraint : public TAO_Constraint
 //
 // = TITLE
 //      TAO_Unary_Constraint represents an operation with only
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
index e0413137d29..d0a3aafc808 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -298,7 +298,7 @@ public:
 
 private:
 
-  class TAO_Trading_Export Operand_Queue :
+  class Operand_Queue :
     public ACE_Unbounded_Queue <TAO_Literal_Constraint>
   // = TITLE
   // A queue adapter with methods to setting and getting operands
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
index ae60c1d7c53..3f694dc35e7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -113,8 +113,8 @@ template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,int>;
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode *, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,CORBA_TypeCode*>
 
-#pragma instantiate ACE_Hash<TAO_String_Hash_Key>
-#pragma instantiate ACE_Equal_To<TAO_String_Hash_Key>
+#pragma instantiate ACE_Hash<TAO_String_Hash_Key>;
+#pragma instantiate ACE_Equal_To<TAO_String_Hash_Key>;
 
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
index f99948d6443..d8712a72802 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
@@ -22,7 +22,7 @@
 #include "Trader_Utils.h"
 #include "orbsvcs/CosTradingC.h"
 
-class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator
+class TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator
 {
  public:
   TAO_Trader_Constraint_Validator (const CosTradingRepos::ServiceTypeRepository::TypeStruct&
@@ -39,7 +39,7 @@ class TAO_Trading_Export TAO_Trader_Constraint_Validator : public TAO_Constraint
 
 };
 
-class TAO_Trading_Export TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator
+class TAO_Trader_Constraint_Evaluator : public TAO_Constraint_Evaluator
 {
  public:
   TAO_Trader_Constraint_Evaluator (CosTrading::Offer* offer,
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index f825ab457a5..0a3097e33f5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -51,7 +51,7 @@ FTP_Client_Callback::handle_timeout (void *)
                   AVStreams::flowSpec stop_spec (1);
                   CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
                   ACE_TRY_CHECK;
-                  //CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+                  CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   ACE_TRY_CHECK;
                   return 0;
@@ -176,7 +176,8 @@ Client::streamctrl (void)
 }
 
 Client::Client (void)
-  : client_mmdevice_ (&endpoint_strategy_),
+  : endpoint_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()),
+    client_mmdevice_ (&endpoint_strategy_),
     fdev_ (0),
     address_ (ACE_OS::strdup ("224.9.9.2:12345")),
     fp_ (0),
@@ -184,8 +185,6 @@ Client::Client (void)
     orb_ (TAO_AV_CORE::instance ()->orb ()),
     poa_ (TAO_AV_CORE::instance ()->poa ())
 {
-  endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (),
-                           TAO_AV_CORE::instance ()->poa ());
 }
 
 
@@ -342,11 +341,11 @@ Client::run (void)
 
       // Schedule a timer for the for the flow handler.
       ACE_Time_Value tv (10000,0);
-      this->orb_->run (tv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (this->orb_->run (tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
+      ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n"));
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
deleted file mode 100755
index 9c507bb244c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
+++ /dev/null
@@ -1,68 +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';
-use PerlACE::Run_Test;
-
-# amount of delay between running the servers
-
-$sleeptime = 6;
-$status = 0;
-
-$nsior = PerlACE::LocalFile ("ns.ior");
-$testfile = PerlACE::LocalFile ("test");
-$makefile = PerlACE::LocalFile ("Makefile");
-
-unlink $nsior;
-
-$NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
-$SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $testfile");
-$CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $makefile");
-
-print STDERR "Starting Naming Service\n";
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Server\n";
-
-$SV->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Client\n";
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: Naming Service returned $nserver\n";
-    $status = 1;
-}
-
-unlink $nsior;
-unlink $testfile;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 9dfe9cd9959..4a49a9a6dcf 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -44,7 +44,6 @@ FTP_Server_Callback::handle_stop (void)
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
-  TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
 }
 
@@ -76,11 +75,10 @@ FTP_Server_Callback::handle_end_stream (void)
 }
 
 Server::Server (void)
-  :orb_ (TAO_AV_CORE::instance ()->orb ()),
+  :reactive_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()),
+   orb_ (TAO_AV_CORE::instance ()->orb ()),
    poa_ (TAO_AV_CORE::instance ()->poa ())
 {
-  reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (), 
-                           TAO_AV_CORE::instance ()->poa ());
 }
 
 AVStreams::protocolSpec
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index d2e6873614b..a9ab12e439d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -8,18 +8,18 @@
 
 ACE_RCSID(Latency, ping, "$Id$")
 
-const char *ping_ior = CORBA::string_dup ("file://ping.ior");
-const char *pong_ior = CORBA::string_dup ("file://pong.ior");
-const char *ping_address = CORBA::string_dup ("224.9.9.2:12345");
-const char *pong_address = CORBA::string_dup ("224.9.9.2:23456");
-const char *protocol = CORBA::string_dup ("UDP");
+const char *ping_ior = "file://ping.ior";
+const char *pong_ior = "file://pong.ior";
+const char *ping_address = "224.9.9.2:12345";
+const char *pong_address = "224.9.9.2:23456";
+const char *protocol = "UDP";
 
 int milliseconds = 30000;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:g:s:r:t:p:d");
+  ACE_Get_Opt get_opts (argc, argv, "f:g:s:r:t:p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -49,10 +49,6 @@ parse_args (int argc, char *argv[])
         protocol = get_opts.optarg;
         break;
 
-      case 'd':
-        TAO_debug_level++;
-        break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -79,25 +75,25 @@ int main (int argc, char *argv[])
     {
 
       parse_args (argc, argv);
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
                                             argv);
-
+      
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA");
-
+      
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
-
+      
       PortableServer::POAManager_var mgr
         = poa->the_POAManager ();
-
+      
       mgr->activate ();
-
+      
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Connect the two streams and run them...
       AVStreams::flowSpec flow_spec (2);
       flow_spec.length (2);
@@ -154,14 +150,13 @@ int main (int argc, char *argv[])
       stream_control->start (flow_spec, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_Time_Value tv (100, 0);
-      orb->run (tv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      ACE_Time_Value tv (0, milliseconds * 1000);
+      if (orb->run (tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-     // flow_spec.length (0);
-     // stream_control->stop (flow_spec, ACE_TRY_ENV);
+      flow_spec.length (0);
+      stream_control->stop (flow_spec, ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 5ca2dde38c1..a5a9aed1c4d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -21,7 +21,6 @@ Pong_Send_Callback pong_callback;
 ACE_hrtime_t recv_base = 0;
 ACE_Throughput_Stats recv_latency;
 
-
 int
 parse_args (int argc, char *argv[])
 {
@@ -95,32 +94,31 @@ int main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       parse_args (argc, argv);
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+      
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
                                             argv);
-
+      
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA");
-
+      
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
-
+      
       PortableServer::POAManager_var mgr
         = poa->the_POAManager ();
-
+      
       mgr->activate ();
-
+      
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Register the video mmdevice object with the ORB
       Reactive_Strategy *reactive_strategy;
       ACE_NEW_RETURN (reactive_strategy,
-                      Reactive_Strategy,
+                      Reactive_Strategy (orb.in (), poa.in ()),
                       1);
-      reactive_strategy->init (orb.in (), poa.in ());
       TAO_MMDevice *mmdevice_impl;
       ACE_NEW_RETURN (mmdevice_impl,
                       TAO_MMDevice (reactive_strategy),
@@ -174,9 +172,10 @@ int main (int argc, char *argv[])
           ACE_TRY_CHECK;
         }
 
-      orb->run ();
-      ACE_TRY_CHECK;
-
+      ACE_Time_Value tv (120, 0);
+      if (orb->run (tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
@@ -184,6 +183,8 @@ int main (int argc, char *argv[])
 
       recv_latency.dump_results ("Receive", gsf);
 
+      // root_poa->destroy (1, 1, ACE_TRY_ENV);
+      // ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -214,11 +215,6 @@ Ping_Recv::get_callback (const char *,
   return 0;
 }
 
-Ping_Recv_Callback::Ping_Recv_Callback (void)
-  : count_ (0)
-{
-}
-
 int
 Ping_Recv_Callback::handle_stop (void)
 {
@@ -233,40 +229,33 @@ Ping_Recv_Callback::receive_frame (ACE_Message_Block *frame,
                                    TAO_AV_frame_info *,
                                    const ACE_Addr &)
 {
-  this->count_++;
- 
-  ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::receive_frame %d\n", this->count_));
+  ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::receive_frame\n"));
 
-  if (this->count_ < 10)
+  for (const ACE_Message_Block *i = frame;
+       i != 0;
+       i = i->cont ())
     {
-      for (const ACE_Message_Block *i = frame;
-	   i != 0;
-	   i = i->cont ())
-	{
-	  ACE_hrtime_t stamp;
-	  
-	  if (i->length () < sizeof(stamp))
-	    return 0;
-	  
-	  ACE_OS::memcpy (&stamp, i->rd_ptr (), sizeof(stamp));
-	  
-	  ACE_hrtime_t now = ACE_OS::gethrtime ();
-	  if (recv_base == 0)
-	    {
-	      recv_base = now;
-	    }
-	  else
-	    {
+      ACE_hrtime_t stamp;
+
+      if (i->length () < sizeof(stamp))
+        return 0;
+
+      ACE_OS::memcpy (&stamp, i->rd_ptr (), sizeof(stamp));
+
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
+      if (recv_base == 0)
+        {
+          recv_base = now;
+        }
+      else
+        {
           recv_latency.sample (now - recv_base,
                                now - stamp);
-	    }
-	  
-	  if (respond == 1)
-	    pong_callback.send_response (stamp);
-	}
+        }
+
+      if (respond == 1)
+        pong_callback.send_response (stamp);
     }
-  else
-    TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
 }
 
@@ -349,8 +338,8 @@ template class TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev,
 template class TAO_FDev<TAO_FlowProducer, Ping_Recv>;
 template class TAO_FDev<Pong_Send, TAO_FlowConsumer>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>
-#pragma instantiate TAO_FDev<TAO_FlowProducer, Ping_Recv>
-#pragma instantiate TAO_FDev<Pong_Send, TAO_FlowConsumer>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>;
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>;
+#pragma instantiate TAO_FDev<TAO_FlowProducer, Ping_Recv>;
+#pragma instantiate TAO_FDev<Pong_Send, TAO_FlowConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
index 698d95b1180..c9063f976e3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h
@@ -23,14 +23,11 @@
 class Ping_Recv_Callback : public TAO_AV_Callback
 {
 public:
-  Ping_Recv_Callback (void);
   virtual int handle_stop (void);
   virtual int receive_frame (ACE_Message_Block *frame,
                              TAO_AV_frame_info *frame_info = 0,
                              const ACE_Addr &peer_address = ACE_Addr::sap_any);
   virtual int handle_destroy (void);
- protected:
-  int count_;
 };
 
 class Ping_Recv : public TAO_FlowConsumer
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 53e7345d289..76d223feb0f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -28,7 +28,7 @@ ACE_Throughput_Stats send_latency;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:b:d");
+  ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:b:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -70,9 +70,6 @@ parse_args (int argc, char *argv[])
       case 'x':
         respond = 0;
         break;
-      case 'd':
-        TAO_debug_level++;
-        break;
 
       case '?':
       default:
@@ -112,30 +109,29 @@ int main (int argc, char *argv[])
 
       parse_args (argc, argv);
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
                                             argv);
-
+      
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA");
-
+      
       PortableServer::POA_var poa
         = PortableServer::POA::_narrow (obj.in ());
-
+      
       PortableServer::POAManager_var mgr
         = poa->the_POAManager ();
-
+      
       mgr->activate ();
-
+      
       TAO_AV_CORE::instance ()->init (orb.in (),
                                       poa.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       Reactive_Strategy *reactive_strategy;
       ACE_NEW_RETURN (reactive_strategy,
-                      Reactive_Strategy,
+                      Reactive_Strategy (orb.in (), poa.in ()),
                       1);
-      reactive_strategy->init (orb.in (), poa.in ());
       TAO_MMDevice *mmdevice_impl;
       ACE_NEW_RETURN (mmdevice_impl,
                       TAO_MMDevice (reactive_strategy),
@@ -188,9 +184,9 @@ int main (int argc, char *argv[])
           ACE_TRY_CHECK;
         }
 
-      orb->run ();
-      ACE_TRY_CHECK;
-
+      ACE_Time_Value tv (120, 0);
+      if (orb->run (tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
@@ -201,6 +197,8 @@ int main (int argc, char *argv[])
 
       send_latency.dump_results ("Send", gsf);
 
+      // root_poa->destroy (1, 1, ACE_TRY_ENV);
+      // ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -297,9 +295,8 @@ Ping_Send::get_callback (const char *,
 }
 
 Ping_Send_Callback::Ping_Send_Callback (void)
-  :count_ (0)
 {
-  this->timeout_ = ACE_Time_Value (2);
+  this->timeout_ = ACE_Time_Value (0, milliseconds * 1000);
 
   this->frame_.size (message_size);
   this->frame_.wr_ptr (message_size);
@@ -315,16 +312,7 @@ Ping_Send_Callback::get_timeout (ACE_Time_Value *&tv,
 int
 Ping_Send_Callback::handle_timeout (void *)
 {
-
-  this->count_++;
-
-  ACE_DEBUG ((LM_DEBUG, "Ping timeout frame %d\n", this->count_));
-
-  if (this->count_ > 10)
-    {
-      TAO_AV_CORE::instance ()->orb ()->shutdown ();
-      return 0;
-    }
+  // ACE_DEBUG ((LM_DEBUG, "ping timeout\n"));
 
   ACE_hrtime_t stamp = ACE_OS::gethrtime ();
   ACE_OS::memcpy (this->frame_.rd_ptr (), &stamp, sizeof(stamp));
@@ -362,8 +350,8 @@ template class TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A, TAO_VDev,
 template class TAO_FDev<TAO_FlowProducer, Pong_Recv>;
 template class TAO_FDev<Ping_Send, TAO_FlowConsumer>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A, TAO_VDev, AV_Null_MediaCtrl>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndpoint_A, TAO_VDev, AV_Null_MediaCtrl>
-#pragma instantiate TAO_FDev<TAO_FlowProducer, Ping_Recv>
-#pragma instantiate TAO_FDev<Pong_Send, TAO_FlowConsumer>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A, TAO_VDev, AV_Null_MediaCtrl>;
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndpoint_A, TAO_VDev, AV_Null_MediaCtrl>;
+#pragma instantiate TAO_FDev<TAO_FlowProducer, Ping_Recv>;
+#pragma instantiate TAO_FDev<Pong_Send, TAO_FlowConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
index 92d90adaad4..af52b9a70f7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h
@@ -59,8 +59,6 @@ private:
 
   ACE_Message_Block frame_;
   // Pre-allocate the message block to send...
-  int count_;
-
 };
 
 class Ping_Send : public TAO_FlowProducer
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
deleted file mode 100755
index c98f2d1ab38..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl
+++ /dev/null
@@ -1,69 +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';
-use PerlACE::Run_Test;
-
-# amount of delay between running the servers
-
-$status = 0;
-
-$pingior = PerlACE::LocalFile ("ping.ior");
-$pongior = PerlACE::LocalFile ("pong.ior");
-
-unlink $pingior, $pongior;
-
-$PING = new PerlACE::Process ("ping", "-o $pingior");
-$PONG = new PerlACE::Process ("pong", "-o $pongior");
-$CTRL = new PerlACE::Process ("control", "-f file://$pingior -g file://$pongior");
-
-print STDERR "Starting Ping\n";
-
-$PING->Spawn ();
-
-if (PerlACE::waitforfile_timed ($pingior, 20) == -1) {
-    print STDERR "ERROR: cannot find file <$pingior>\n";
-    $PING->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Pong\n";
-
-$PONG->Spawn ();
-if (PerlACE::waitforfile_timed ($pongior, 20) == -1) {
-    print STDERR "ERROR: cannot find file <$pongior>\n";
-    $PING->Kill ();
-    $PONG->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Control\n";
-
-$control = $CTRL->SpawnWaitKill (200);
-
-if ($control != 0) {
-    print STDERR "ERROR: control returned $control\n";
-    $status = 1;
-}
-
-$pi = $PING->TerminateWaitKill (5);
-
-if ($pi != 0) {
-    print STDERR "ERROR: ping returned $pi\n";
-    $status = 1;
-}
-
-$po = $PONG->TerminateWaitKill (5);
-
-if ($po != 0) {
-    print STDERR "ERROR: pong returned $po\n";
-    $status = 1;
-}
-
-unlink $pingior, $pongior;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf
index 147b102db85..25ae44055a1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/svc.conf
@@ -1,5 +1,5 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global -ORBReactorType select_st  -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
+static Resource_Factory "-ORBresources global -ORBReactorType select_st  -ORBInputCDRAllocator null"
 static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST -ORBConnectorLock null"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 8155e8c437e..5ca73db0f31 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -10,7 +10,7 @@ FTP_Client_Callback::FTP_Client_Callback (void)
 int
 FTP_Client_Callback::handle_end_stream (void)
 {
-  TAO_AV_CORE::instance ()->orb ()->shutdown ();
+  TAO_AV_CORE::instance ()->stop_run ();
   return 0;
 }
 
@@ -56,8 +56,8 @@ FTP_Client_Callback::handle_timeout (void *)
                   //ACE_DECLARE_NEW_CORBA_ENV;
                   CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
                   ACE_TRY_CHECK;
-//                    CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
-//                    ACE_TRY_CHECK;
+                  CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+                  ACE_TRY_CHECK;
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   ACE_TRY_CHECK;
                   return 0;
@@ -108,9 +108,9 @@ FTP_Client_StreamEndPoint::set_protocol_object (const char *flowname,
 Endpoint_Reactive_Strategy::Endpoint_Reactive_Strategy (CORBA::ORB_ptr orb,
                                                         PortableServer::POA_ptr poa,
                                                         Client *client)
-  : client_ (client)
+  :ENDPOINT_STRATEGY (orb, poa),
+   client_ (client)
 {
-  this->init (orb, poa);
 }
 
 int
@@ -176,7 +176,7 @@ Client::streamctrl (void)
 Client::Client (void)
   :endpoint_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa (),this),
    client_mmdevice_ (&endpoint_strategy_),
-   address_ (ACE_OS::strdup ("224.9.9.2:12345")),
+   address_ (ACE_OS::strdup ("224.9.9.2:10002")),
    fp_ (0),
    protocol_ (ACE_OS::strdup ("UDP"))
 {
@@ -232,6 +232,7 @@ Client::init (int argc,char **argv)
   this->argv_ = argv;
 
   // Increase the debug_level so that we can see the output
+  //  TAO_debug_level++;
   this->parse_args (this->argc_, this->argv_);
 
   if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
@@ -317,10 +318,8 @@ Client::run (void)
       // Schedule a timer for the for the flow handler.
       //TAO_AV_CORE::instance ()->run ();
       ACE_Time_Value tv (10000,0);
-      
-      TAO_AV_CORE::instance ()->orb ()->run (tv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (TAO_AV_CORE::instance ()->orb ()->run (tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n"));
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
deleted file mode 100755
index c168a476ea7..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl
+++ /dev/null
@@ -1,82 +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';
-use PerlACE::Run_Test;
-
-# amount of delay between running the servers
-
-$sleeptime = 6;
-$status = 0;
-
-$nsior = PerlACE::LocalFile ("ns.ior");
-$test1 = PerlACE::LocalFile ("test1");
-$test2 = PerlACE::LocalFile ("test2");
-$makefile = PerlACE::LocalFile ("Makefile");
-
-unlink $nsior, $test1, $test2;
-
-$NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
-$SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1");
-$SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2");
-$CL  = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $makefile");
-
-print STDERR "Starting Naming Service\n";
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Server 1\n";
-
-$SV1->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Server 2\n";
-
-$SV2->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Client\n";
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV1->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server 1 returned $server\n";
-    $status = 1;
-}
-
-$server = $SV2->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server 2 returned $server\n";
-    $status = 1;
-}
-
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: Naming Service returned $nserver\n";
-    $status = 1;
-}
-
-unlink $nsior, $test1, $test2;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index ab01e0f1040..0f3fb5da6db 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -23,7 +23,6 @@ FTP_Server_Callback::handle_stop (void)
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
-  TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
 }
 
@@ -49,16 +48,16 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 int
 FTP_Server_Callback::handle_end_stream (void)
 {
-  ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::end_stream\n"));
+  ACE_DEBUG ((LM_DEBUG,"FTP_SFP_Callback::end_stream\n"));
   CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb ();
   orb->shutdown ();
   return 0;
 }
 
 Server::Server (void)
+  : reactive_strategy_ (TAO_AV_CORE::instance ()->orb (),
+                        TAO_AV_CORE::instance ()->poa ())
 {
-  reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
-                      TAO_AV_CORE::instance ()->poa ());
 }
 
 int
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index ed341875eb4..d35014a9fda 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -10,7 +10,7 @@ FTP_Client_Callback::FTP_Client_Callback (void)
 int
 FTP_Client_Callback::handle_end_stream (void)
 {
-  TAO_AV_CORE::instance ()->orb ()->shutdown ();
+  TAO_AV_CORE::instance ()->stop_run ();
   return 0;
 }
 
@@ -50,9 +50,8 @@ FTP_Client_Callback::handle_timeout (void *)
                   //ACE_DECLARE_NEW_CORBA_ENV;
                   CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
                   ACE_TRY_CHECK;
-		  // CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
-                  //ACE_TRY_CHECK;
-		  ACE_DEBUG ((LM_DEBUG, "Just before Orb Shutdown\n"));
+                  CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+                  ACE_TRY_CHECK;
                   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
                   ACE_TRY_CHECK;
                   return 0;
@@ -181,14 +180,13 @@ Client::streamctrl (void)
 }
 
 Client::Client (void)
-  : client_mmdevice_ (&endpoint_strategy_),
+  : endpoint_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()),
+    client_mmdevice_ (&endpoint_strategy_),
     fdev_ (0),
     address_ (ACE_OS::strdup ("224.9.9.2:10002")),
     fp_ (0),
     protocol_ (ACE_OS::strdup ("UDP"))
 {
-  endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ());
-
 }
 
 
@@ -250,8 +248,6 @@ Client::init (int argc,char **argv)
 
       this->parse_args (this->argc_, this->argv_);
 
-      ACE_DEBUG ((LM_DEBUG, "Parsed Address TWO%s\n", this->address_));
-      
       ACE_NEW_RETURN (this->fdev_,
                       FTP_Client_FDev,
                       -1);
@@ -305,7 +301,7 @@ Client::run (void)
       AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
       AVStreams::flowSpec flow_spec (1);
       // Bind the client and server mmdevices.
-      ACE_DEBUG ((LM_DEBUG, "Parsed Address ONE%s\n", this->address_));
+
       ACE_INET_Addr addr (this->address_);
       TAO_Forward_FlowSpec_Entry entry (this->flowname_,
                                         "IN",
@@ -322,7 +318,6 @@ Client::run (void)
                                      flow_spec,
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Suuceessful ONE\n"));
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs for client_mmdevice failed\n"),-1);
       if (this->bind_to_server ("Server_MMDevice1") == -1)
@@ -334,10 +329,6 @@ Client::run (void)
                                             the_qos.inout (),
                                             flow_spec,
                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Suuceessful TWO\n"));
-      
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs for mmdevice 1 failed\n"),-1);
       ACE_TRY_CHECK;
@@ -351,7 +342,6 @@ Client::run (void)
                                             flow_spec,
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Suuceessful THREE\n"));
       if (result == 0)
         ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs for mmdevice 2 failed\n"),-1);
       AVStreams::flowSpec start_spec (1);
@@ -363,9 +353,8 @@ Client::run (void)
       //TAO_AV_CORE::instance ()->run ();
 
       ACE_Time_Value tv (10000,0);
-      TAO_AV_CORE::instance ()->orb ()->run (tv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (TAO_AV_CORE::instance ()->orb ()->run (tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n"));
@@ -384,7 +373,6 @@ int
 main (int argc,
       char *argv[])
 {
-
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv);
 
@@ -431,5 +419,5 @@ template class TAO_FDev<FTP_Client_Producer, TAO_FlowConsumer>;
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
-#pragma instantiate TAO_FDev<FTP_Client_Producer, TAO_FlowConsumer>
+#pragma instantiate TAO_FDev<FTP_Client_Producer, TAO_FlowConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
deleted file mode 100755
index c168a476ea7..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl
+++ /dev/null
@@ -1,82 +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';
-use PerlACE::Run_Test;
-
-# amount of delay between running the servers
-
-$sleeptime = 6;
-$status = 0;
-
-$nsior = PerlACE::LocalFile ("ns.ior");
-$test1 = PerlACE::LocalFile ("test1");
-$test2 = PerlACE::LocalFile ("test2");
-$makefile = PerlACE::LocalFile ("Makefile");
-
-unlink $nsior, $test1, $test2;
-
-$NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
-$SV1 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test1");
-$SV2 = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $test2");
-$CL  = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $makefile");
-
-print STDERR "Starting Naming Service\n";
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Server 1\n";
-
-$SV1->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Server 2\n";
-
-$SV2->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Client\n";
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV1->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server 1 returned $server\n";
-    $status = 1;
-}
-
-$server = $SV2->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server 2 returned $server\n";
-    $status = 1;
-}
-
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: Naming Service returned $nserver\n";
-    $status = 1;
-}
-
-unlink $nsior, $test1, $test2;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index b9764256d13..8b45a2582c4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -40,7 +40,6 @@ FTP_Server_Callback::handle_stop (void)
 {
   ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop"));
   ACE_OS::fclose (FTP_SERVER::instance ()->file ());
-  TAO_AV_CORE::instance ()->orb ()->shutdown ();
   return 0;
 }
 
@@ -94,9 +93,9 @@ FTP_Server_Callback::handle_end_stream (void)
 // }
 
 Server::Server (void)
+  : reactive_strategy_ (TAO_AV_CORE::instance ()->orb (),
+                        TAO_AV_CORE::instance ()->poa ())
 {
-  reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
-                           TAO_AV_CORE::instance ()->poa ());
 }
 
 AVStreams::protocolSpec
@@ -292,7 +291,7 @@ template class TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev,
 template class TAO_FDev<TAO_FlowProducer, FTP_Server_FlowEndPoint>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Server,ACE_Null_Mutex>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>
-#pragma instantiate TAO_FDev<TAO_FlowProducer, FTP_Server_FlowEndPoint>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>;
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>;
+#pragma instantiate TAO_FDev<TAO_FlowProducer, FTP_Server_FlowEndPoint>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/README b/TAO/orbsvcs/tests/AVStreams/Pluggable/README
index f5d2725204d..8c24da61dd7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/README
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/README
@@ -1,45 +1,22 @@
 // $Id$
 
-Description
------------
+This directory contains a simple file transfer test program for the
+Pluggable Data Protocols in the TAO's Audio/Video Streaming
+Service. This program can be run using UDP,TCP and SFP over UDP.
 
-This directory contains a comprehensive test in the form of a ftp client and server.
-The test has the following features.
+server:
+-------
 
-1. It tests the AVStreams Pluggable Protocol Framework
-2. Shows a mechanism to pace data.
-3. Performs benchmarking.
-
-Running the test
-----------------
-
-server
-------
-
-server -f <output_filename>
-
--f <output_filename> -> The name of the file under which the received stream
-                        data has to be stored.
+-f filename -> The name of the file under which the received stream
+                data has to be stored.
 
 ftp:
 ----
 
-ftp [-f <filename>] [-a <address>] [-p <protocol>] [-s] [-r <frame rate>] [-d] 
-
-
 -f filename --> The file to be streamed to the server. It is currently
                 streamed at the rate of 0.5kbytes/s.
 
--a address  --> Multicast address or the host on which the client is running
-                Default is multicast address
-
--p protocol --> The protocol string could be UDP or TCP. But with the 
-                multicast address it should be UDP.
+-p protocol --> The protocol string could be UDP or TCP.
 
 -s          --> flag to use SFP. This option cannot be used with -p
                 TCP since SFP currently runs only over UDP.
-
--r framerate--> The rate at which tha data frames need to be sent.
-
--d          --> Increament the TAO_debug_level for debug messages.
-
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 52d0abe97a3..31cba7ef728 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -3,17 +3,110 @@
 #include "ftp.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Stats.h"
 
-ACE_High_Res_Timer last_frame_sent_time;
-// The time taken for sending a frmae and preparing for the next frame
 
-ACE_Time_Value inter_frame_time;
-// The time that should lapse between two consecutive frames sent.
+ACE_hrtime_t recv_throughput_base = 0;
+ACE_Throughput_Stats recv_latency;
+
+ACE_hrtime_t send_throughput_base = 0;
+ACE_Throughput_Stats send_latency;
+
+int count =0;
+int message_size = 64;
 
 FTP_Client_Callback::FTP_Client_Callback (void)
+  :count_ (0)
 {
 }
 
+int
+FTP_Client_Callback::handle_destroy (void)
+{
+  TAO_AV_CORE::instance ()->stop_run ();
+  return 0;
+}
+
+void
+FTP_Client_Callback::get_timeout (ACE_Time_Value *&tv,
+                                  void *&)
+{
+  ACE_Time_Value *timeout;
+  ACE_NEW (timeout,
+           ACE_Time_Value(2));
+  tv = timeout;
+}
+
+//@@coryan: Interpretation for the return value like ACE_Event_Handler's handle_timeout method.
+int
+FTP_Client_Callback::handle_timeout (void *)
+{
+  //@@coryan: Use a preallocated buffer for benchmarks.
+  //Memory map the file.
+  count++;
+  ACE_Message_Block mb;
+  mb.size (message_size);
+  mb.wr_ptr (message_size);
+  if (count == 10)
+    {
+      AVStreams::flowSpec stop_spec (1);
+      ACE_DECLARE_NEW_CORBA_ENV;
+      CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
+      CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+      //TAO_AV_CORE::instance ()->stop_run ();
+      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
+      return 0;
+    }
+  ACE_hrtime_t stamp = ACE_OS::gethrtime ();
+  //  ACE_Message_Block mb (BUFSIZ);
+  ACE_OS::memcpy (mb.rd_ptr (), &stamp, sizeof(stamp));
+  //  ACE_OS::memcpy (this->frame_.rd_ptr (), &stamp, sizeof(stamp));
+  ACE_DEBUG ((LM_DEBUG,"FTP_Client_Callback::get_frame"));
+  //char *buf = mb.rd_ptr ();
+  //cerr << "message block size" << mb.size () << endl;
+  //  int n = ACE_OS::fread(buf,1,mb.size (),CLIENT::instance ()->file ());
+  //int n = ACE_OS::fread(buf,1,mb.size (),stamp);
+  /*
+  if (n < 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,"FTP_Client_Flow_Handler::fread end of file\n"),-1);
+    }
+  if (n == 0)
+    {
+      if (::feof (CLIENT::instance ()->file ()))
+        {
+          // wait for sometime for the data to be flushed to the other side.
+          this->count_++;
+          if (this->count_ == 2)
+            {
+              //@@coryan: Remove these code from this method.
+              //Should be called when the user wants to stop the stream.
+              ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
+              AVStreams::flowSpec stop_spec (1);
+              ACE_DECLARE_NEW_CORBA_ENV;
+              CLIENT::instance ()->streamctrl ()->stop (stop_spec,ACE_TRY_ENV);
+              ACE_CHECK_RETURN (-1);
+              CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
+              TAO_AV_CORE::instance ()->stop_run ();
+
+            }
+          else
+            return 0;
+        }
+      else
+        ACE_ERROR_RETURN ((LM_ERROR,"FTP_Client_Flow_Handler::fread error\n"),-1);
+    }
+  cerr << "read bytes = " << n << endl;
+  */
+  //mb.wr_ptr (n);
+  int result = this->protocol_object_->send_frame (&mb);
+  if (result < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,"send failed:%p","FTP_Client_Flow_Handler::send \n"),-1);
+  ACE_DEBUG ((LM_DEBUG,"handle_timeout::buffer sent succesfully\n"));
+  return 0;
+}
+
 FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void)
 {
 }
@@ -22,9 +115,10 @@ int
 FTP_Client_StreamEndPoint::get_callback (const char *,
                                          TAO_AV_Callback *&callback)
 {
-  // Create and return the clienmt application callback and return to the AVStreams
-  // for further upcalls.
-  callback = &this->callback_;
+  ACE_NEW_RETURN (this->callback_,
+                  FTP_Client_Callback,
+                  -1);
+  callback = this->callback_;
   return 0;
 }
 
@@ -32,38 +126,33 @@ int
 FTP_Client_StreamEndPoint::set_protocol_object (const char *,
                                                 TAO_AV_Protocol_Object *object)
 {
-  // Set the client protocol object corresponding to the transport protocol selected.
-  CLIENT::instance ()->set_protocol_object (object);
+  this->callback_->set_protocol_object (object);
   return 0;
 }
 
-Client::Client (void)
-  :client_mmdevice_ (&endpoint_strategy_),
-   count_ (0),
-   address_ (ACE_OS::strdup ("224.9.9.2:12345")),
-   fp_ (0),
-   protocol_ (ACE_OS::strdup ("UDP")),
-   frame_rate_ (30)
+Endpoint_Reactive_Strategy::Endpoint_Reactive_Strategy (Client *client)
+  :ENDPOINT_STRATEGY (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()),
+   client_ (client)
 {
-  this->mb.size (BUFSIZ);
 }
 
-void
-Client::set_protocol_object (TAO_AV_Protocol_Object *object)
+int
+Endpoint_Reactive_Strategy::make_stream_endpoint (FTP_Client_StreamEndPoint *&endpoint)
 {
-  // Set the client protocol object corresponding to the transport protocol selected.
-  this->protocol_object_ = object;
+  ACE_DEBUG ((LM_DEBUG,"Endpoint_Reactive_Strategy::make_stream_endpoint"));
+  ACE_NEW_RETURN (endpoint,
+                  FTP_Client_StreamEndPoint,
+                  -1);
+  return 0;
 }
 
 int
 Client::parse_args (int argc,
                     char **argv)
 {
-  // Parse command line arguments
-  ACE_Get_Opt opts (argc,argv,"f:a:p:r:sd");
+  ACE_Get_Opt opts (argc,argv,"f:a:p:sdt");
 
   this->use_sfp_ = 0;
-
   int c;
   while ((c= opts ()) != -1)
     {
@@ -78,17 +167,17 @@ Client::parse_args (int argc,
         case 'p':
           this->protocol_ = ACE_OS::strdup (opts.optarg);
           break;
-	case 'r':
-	  this->frame_rate_ = ACE_OS::atoi (opts.optarg);
-	  break;
         case 's':
           this->use_sfp_ = 1;
           break;
         case 'd':
           TAO_debug_level++;
           break;
+        case 't':
+          this->test_ = 1;
+          break;
         default:
-          ACE_DEBUG ((LM_DEBUG,"Unknown Option\n"));
+          ACE_DEBUG ((LM_DEBUG,"Unknown option\n"));
           return -1;
         }
     }
@@ -113,262 +202,166 @@ Client::streamctrl (void)
   return &this->streamctrl_;
 }
 
-
-int
-Client::frame_rate (void)
+Client::Client (void)
+  : endpoint_strategy_ (this),
+    client_mmdevice_ (&endpoint_strategy_),
+    address_ (ACE_OS::strdup ("224.9.9.2:12345")),
+    fp_ (0),
+    protocol_ (ACE_OS::strdup ("UDP"))
 {
-  return this->frame_rate_;
 }
 
 
-// Method to get the object reference of the server
 int
-Client::bind_to_server (CORBA::Environment &ACE_TRY_ENV)
+Client::bind_to_server (void)
 {
-  // Initialize the naming services
-  if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       " (%P|%t) Unable to initialize "
-		       "the TAO_Naming_Client. \n"),
-		      -1);
-  
-  CosNaming::Name server_mmdevice_name (1);
-  server_mmdevice_name.length (1);
-  server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
-
-  // Resolve the server object reference from the Naming Service
-  CORBA::Object_var server_mmdevice_obj =
-    my_naming_client_->resolve (server_mmdevice_name,
-				ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  
-  this->server_mmdevice_ =
-    AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (),
-				  ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  ACE_DECLARE_NEW_CORBA_ENV;
 
-  if (CORBA::is_nil (this->server_mmdevice_.in ()))
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       "Could not resolve Server_MMdevice in Naming service <%s>\n"),
-		      -1);
- 
+  ACE_TRY
+    {
+      // Initialize the naming services
+      if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize "
+                           "the TAO_Naming_Client. \n"),
+                          -1);
+
+      CosNaming::Name server_mmdevice_name (1);
+      server_mmdevice_name.length (1);
+      server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
+      CORBA::Object_var server_mmdevice_obj =
+        my_naming_client_->resolve (server_mmdevice_name,
+                                  ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      this->server_mmdevice_ =
+        AVStreams::MMDevice::_narrow (server_mmdevice_obj.in (),
+                                      ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (this->server_mmdevice_.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " could not resolve Server_Mmdevice in Naming service <%s>\n"),
+                          -1);
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Command_Handler::resolve_reference");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
-Client::init (int argc,
-	      char **argv,
-	      CORBA::Environment& ACE_TRY_ENV)
+Client::init (int argc,char **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
-  
+
+  // Increase the debug_level so that we can see the output
+  //  TAO_debug_level++;
   CORBA::String_var ior;
-  
-  // Initialize the endpoint strategy with the orb and poa.
-  this->endpoint_strategy_.init(TAO_AV_CORE::instance ()->orb (), 
-                                TAO_AV_CORE::instance ()->poa ());
-
-  // Parse the command line arguments
-  this->parse_args (argc, 
-		    argv);
-
-  
-  // Open file to read.
-  this->fp_ = ACE_OS::fopen (this->filename_,
-			     "r");
-  if (this->fp_ == 0)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-		       "Cannot open output file %s\n",
-		       this->filename_),
-		      -1);
-  
-  // Resolve the object reference of the server from the Naming Service.
-  if (this->bind_to_server (ACE_TRY_ENV) == -1)
+  PortableServer::POAManager_var mgr
+    = TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
+
+  mgr->activate ();
+
+  this->parse_args (argc, argv);
+
+  if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       " (%P|%t) Unable to initialize "
+                       "the TAO_Naming_Client. \n"),
+                      -1);
+
+  this->fp_ = ACE_OS::fopen (this->filename_,"r");
+  if (this->fp_ != 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
+    }
+
+
+  if (this->bind_to_server () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) Error binding to the naming service\n"),
                       -1);
-  
-  // Create the Flow protocol name
-  char flow_protocol_str [BUFSIZ];
-  if (this->use_sfp_)
-    ACE_OS::strcpy (flow_protocol_str,
-		    "sfp:1.0");
-  else
-    ACE_OS::strcpy (flow_protocol_str,
-		    "");
-  
-  // Initialize the  QoS
-  AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
-  
-  // Set the address of the ftp client.
-  ACE_INET_Addr addr (this->address_);
-  
-  // Initialize the flowname
-  ACE_NEW_RETURN (this->flowname_,
-		  char [BUFSIZ],
-		  0);
-  
-  ACE_OS::sprintf (this->flowname_,
-		   "Data_%s",
-		   this->protocol_);
-  
-  // Create the forward flow specification to describe the flow.
-  TAO_Forward_FlowSpec_Entry entry (this->flowname_,
-				    "IN",
-				    "USER_DEFINED",
-				    flow_protocol_str,
-				    this->protocol_,
-				    &addr);
-  
-  AVStreams::flowSpec flow_spec (1);
-  flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
-  flow_spec.length (1);
-  
-  // Bind/Connect  the client and server MMDevices.
-  CORBA::Boolean result =
-    this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV),
-				 this->server_mmdevice_.in (),
-				 the_qos.inout (),
-				 flow_spec,
-				 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  
-  if (result == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
-  
+
   return 0;
 }
 
-// Method to send data at the specified rate
 int
-Client::pace_data (CORBA::Environment& ACE_TRY_ENV)
+Client::run (void)
 {
-
-  // Rate at which frames of data need to be sent.
-  this->frame_rate_ = CLIENT::instance ()->frame_rate ();
-  
-  // Time within which a frame should be sent.
-  double frame_time = 1/ (double) this->frame_rate_;
-  
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Frame Time ONE = %f\n Frame Rate = %d\n",
-                frame_time,
-                this->frame_rate_));
-
-  // The time between two consecutive frames.
-  inter_frame_time.set (frame_time);
-  
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Inter Frame Time = %d\n",
-                inter_frame_time.msec ()));
-  
+  ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      
-      // Continue to send data till the file is read to the end.
-      while (1)
-	{
-          // Count the frames sent.
-	  count_++;
-          
-          // Read from the file into a message block.
-	  int n = ACE_OS::fread(this->mb.rd_ptr (),
-				1,
-				this->mb.size (),
-				CLIENT::instance ()->file ());
-	  
-	  if (n < 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "FTP_Client_Flow_Handler::fread end of file\n"),
-			      -1);
-	  
-	  if (n == 0)
-	    {
-	      if (feof (CLIENT::instance ()->file ()))
-		{
-                  // At end of file break the loop and end the client.
-                  if (TAO_debug_level > 0)
-                    ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n"));
-                  break;
-                }
-	      
-	    }
-	  
-	  this->mb.wr_ptr (n);
-
-	  if ( this->count_ > 1)
-	    {
-              // Greater than the first frame.
-
-              // Stop the timer that was started just before the previous frame was sent.
-	      last_frame_sent_time.stop ();
-
-              // Get the time elapsed after sending the previous frame.
-	      ACE_Time_Value tv;
-	      last_frame_sent_time.elapsed_time (tv);
-
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "Elapsed Time = %d\n",
-                            tv.msec ()));
-              
-              // Check to see if the inter frame time has elapsed.
-	      if (tv < inter_frame_time)
-		{
-                  // Inter frame time has not elapsed.
-
-                  // Claculate the time to wait before the next frame needs to be sent.
-		  ACE_Time_Value wait_time (inter_frame_time - tv);
-
-                  if (TAO_debug_level > 0)
-                    ACE_DEBUG ((LM_DEBUG,
-                                "Wait Time = %d\n",
-                                wait_time.msec ()));
-                  
-                  // run the orb for the wait time so the client can continue other orb requests.
-		  TAO_AV_CORE::instance ()->orb ()->run (wait_time,
-							 ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-		}
-	    }
-          
-          // Start timer before sending the frame.
-	  last_frame_sent_time.start ();
-	  
-          // Send frame.
-          int result = this->protocol_object_->send_frame (&this->mb);
-	  if (result < 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "send failed:%p","FTP_Client_Flow_Handler::send\n"),
-			      -1);
-          ACE_DEBUG ((LM_DEBUG,"Client::pace_data buffer sent succesfully\n"));
-          
-          // Reset the mb.
-          this->mb.reset ();
-          
-	} // end while
-      
-      // Since the file is read stop the stream.
-      AVStreams::flowSpec stop_spec (1);
-      CLIENT::instance ()->streamctrl ()->destroy (stop_spec,
-						   ACE_TRY_ENV);
+      char flow_protocol_str [BUFSIZ];
+      if (this->use_sfp_)
+        ACE_OS::strcpy (flow_protocol_str,"sfp:1.0");
+      else
+        ACE_OS::strcpy (flow_protocol_str,"");
+      AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS);
+
       ACE_TRY_CHECK;
-      
-      // Shut the orb down.
-      TAO_AV_CORE::instance ()->orb ()->shutdown (0);
+      ACE_INET_Addr addr (this->address_);
+      ACE_NEW_RETURN (this->flowname_,
+                      char [BUFSIZ],
+                      0);
+      ACE_OS::sprintf (this->flowname_,
+                       "Data_%s",
+                       this->protocol_);
+      TAO_Forward_FlowSpec_Entry entry (this->flowname_,
+                                        "IN",
+                                        "USER_DEFINED",
+                                        flow_protocol_str,
+                                        this->protocol_,
+                                        &addr);
+
+      AVStreams::flowSpec flow_spec (1);
+      flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
+      flow_spec.length (1);
+      //ACE_High_Res_Timer timer;
+      //ACE_Time_Value elapsed;
+      // timer.start ();
+      CORBA::Boolean result =
+        this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV),
+                                     this->server_mmdevice_.in (),
+                                     the_qos.inout (),
+                                     flow_spec,
+                                     ACE_TRY_ENV);
+      //timer.stop ();
+      // timer.elapsed_time (elapsed);
+      //elapsed.dump ();
+
+      // If we're supposed to do only bind_devs time calculation return.
+      if (this->test_)
+        {
+          AVStreams::flowSpec flow_spec;
+          this->streamctrl_.destroy (flow_spec,ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          return 0;
+        }
+      ACE_TRY_CHECK;
+      if (result == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1);
+
+      AVStreams::flowSpec start_spec (1);
+      //start_spec.length (1);
+      //start_spec [0] = CORBA::string_dup (this->flowname_);
+      this->streamctrl_.start (start_spec,ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      
+
+      TAO_AV_CORE::instance ()->orb ()->run ();
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Client::pace_data Failed");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run\n");
       return -1;
     }
   ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
@@ -380,49 +373,40 @@ main (int argc,
   ACE_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            argv);
       CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-					   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      //Get the POA_var object from Object_var
-      PortableServer::POA_var root_poa
-        = PortableServer::POA::_narrow (obj.in (),
-					ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        = orb->resolve_initial_references ("RootPOA");
 
-      mgr->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      PortableServer::POA_var poa
+        = PortableServer::POA::_narrow (obj.in ());
 
-      // Initialize the AV STream components.
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
+                                      poa.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      // INitialize the Client.
       int result = 0;
-      result = CLIENT::instance ()->init (argc,
-					  argv,
-					  ACE_TRY_ENV);
+      result = CLIENT::instance ()->init (argc,argv);
       if (result < 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-			   "client::init failed\n"),1);
-      
-      // Start sending data.
-      result = CLIENT::instance ()->pace_data (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
+      result = CLIENT::instance ()->run ();
+      if (result < 0)
+        ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
+      ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
+      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+      ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+      recv_latency.dump_results ("Receive", gsf);
+
+      send_latency.dump_results ("Send", gsf);
+      poa->destroy (1, 1, ACE_TRY_ENV);
+      ACE_CHECK_RETURN (-1);
 
       orb->destroy (ACE_TRY_ENV);
       ACE_CHECK_RETURN (-1);
+
+      if (result < 0)
+        ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
+
     }
   ACE_CATCHANY
 
@@ -437,15 +421,10 @@ main (int argc,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Singleton <Client,ACE_Null_Mutex>;
-template class
-TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
-template class
-TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
+template class TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
+template class TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
-#pragma instantiate
-TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
-#pragma instantiate
-TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 24f43d7664c..f945b3515ef 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -1,23 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Pluggable
-//
-// = FILENAME
-//    ftp.h
-//
-// = DESCRIPTION
-//    Ftp client to send data
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
-
-
 #ifndef TAO_AV_FTP_H
 #define TAO_AV_FTP_H
 
@@ -25,148 +8,87 @@
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/sfp.h"
+#include "orbsvcs/AV/MCast.h"
+#include "ace/High_Res_Timer.h"
 
-
-class FTP_Client_Callback : public TAO_AV_Callback
+class FTP_Client_Callback  : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines the client applcation callback.
-  //   
-  // = DESCRIPTION
-  //    This class can override the methods of 
-  //    the TAO_AV_Callback to do application 
-  //    specific processing. 
 public:
   FTP_Client_Callback (void);
-  //Constructor
+  virtual int handle_timeout (void *arg);
+  virtual int handle_destroy (void);
+  virtual void get_timeout (ACE_Time_Value *&tv,
+                            void *&arg);
+  void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;}
+protected:
+  int count_;
+  TAO_AV_Protocol_Object *protocol_object_;
 };
 
-
 class FTP_Client_StreamEndPoint  : public TAO_Client_StreamEndPoint
 {
-  // = TITLE
-  //    Defines the client stream endpoint.
-  // 
-  // = DESCRIPTION
-  //    This class overrides the methods of TAO_ClientStreamendpoint 
-  //    so the application can perform its processing during post and pre
-  //    connection set up.
-  
 public:
   FTP_Client_StreamEndPoint (void);
-  //Contructor
 
   virtual int get_callback (const char *flowname,
                             TAO_AV_Callback *&callback);
-  // Create the application client callback and return its handle to the 
-  // AVSTreams for further application callbacks
 
   virtual int set_protocol_object (const char *flowname,
                                    TAO_AV_Protocol_Object *object);
-  // Set protocol object corresponding to the transport protocol chosen.
-  
 protected:
-  FTP_Client_Callback callback_;
-  // reference to the cllient application callback.
+  FTP_Client_Callback *callback_;
 };
 
-typedef TAO_AV_Endpoint_Reactive_Strategy_A <FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> ENDPOINT_STRATEGY;
+typedef TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> ENDPOINT_STRATEGY;
+
+class Client;
+class Endpoint_Reactive_Strategy  : public ENDPOINT_STRATEGY
+{
+public:
+  Endpoint_Reactive_Strategy (Client *client_ptr);
+  // constructor . The orb manager is needed for the TAO_AV_Endpoint_Reactive_Strategy_A.
+
+  virtual int make_stream_endpoint (FTP_Client_StreamEndPoint *& endpoint);
+  // hook to make our streamendpoint taking a Client pointer
+private:
+  Client *client_;
+  // pointer to command handler object
+};
 
 
 class Client
 {
-  // = TITLE
-  //    Defines the Client Application
-  // 
-  // = DESCRIPTION
-  //    The actual client program that acts as the ftp client that streams data
-  //    to the ftp servers that are waiting for data.
 public:
   Client (void);
-  // Constructor
-
-  int init (int argc, 
-	    char **argv,
-	    CORBA::Environment&);
-  // Method to initialize the various data components.
-  
-  void set_protocol_object (TAO_AV_Protocol_Object *protocol_object);
-  // Set the protocol object corresponding to the transport protocol chosen.
-  
-  int pace_data (CORBA::Environment&);
-  // Method to pace and send data from a file.
-
+  int init (int argc, char **argv);
+  int run (void);
   FILE *file (void);
-  // File handle from which data is read to be sent.
-
-  TAO_StreamCtrl* streamctrl (void);
-  // The stream control interface that manages the stream set up
-
   char *flowname (void);
-  // name of the flow set up.
-  
-  int frame_rate (void);
-  // The requested frame rate for sending each frame of data read from the file.
-  
+  TAO_StreamCtrl* streamctrl (void);
 private:
   int parse_args (int argc, char **argv);
-  // Method to parse the command line arguments.
-  
-  int bind_to_server (CORBA::Environment& ACE_TRY_ENV);
-  // Method that binds the ftp client to the server
-  
-  ENDPOINT_STRATEGY endpoint_strategy_;
-  // The reacfive strategy of the client.
-
+  int bind_to_server (void);
+  Endpoint_Reactive_Strategy endpoint_strategy_;
   AVStreams::MMDevice_var server_mmdevice_;
-  // The server MMDevice that the ftpo client connects to
-
   TAO_MMDevice client_mmdevice_;
-  // The ftp client MMDevice.
-
   TAO_StreamCtrl streamctrl_;
   // Video stream controller
 
-  int count_;
-  // Number of frames sent.
-  
   int argc_;
   char **argv_;
-
   const char *filename_;
-  // File from which data is read.
-
   const char *address_;
-  // Address of the ftp client host machine or a multicast address - Default is
-  // UDP multicast addess
 
   TAO_Naming_Client my_naming_client_;
-  // The Naming Service client.
-
   FILE *fp_;
-  // File handle of the file read from.
-
   char *protocol_;
-  // Selected protocol - default is UDP
-
   char *flowname_;
-    
   int use_sfp_;
-  // If set to 1 then use sfp as the flow carrier protocol.
-
-  int frame_rate_;
-
-  ACE_Message_Block mb;
-  // Message block into which data is read from a file and then sent.
-
-  TAO_AV_Protocol_Object* protocol_object_;
-  // Protocol object corresponding to the transport protocol selected.
-
+  int test_;
 };
 
 typedef ACE_Singleton<Client,ACE_Null_Mutex> CLIENT;
 
 #endif /* TAO_AV_FTP_H */
-
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
deleted file mode 100755
index 9c507bb244c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
+++ /dev/null
@@ -1,68 +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';
-use PerlACE::Run_Test;
-
-# amount of delay between running the servers
-
-$sleeptime = 6;
-$status = 0;
-
-$nsior = PerlACE::LocalFile ("ns.ior");
-$testfile = PerlACE::LocalFile ("test");
-$makefile = PerlACE::LocalFile ("Makefile");
-
-unlink $nsior;
-
-$NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
-$SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior -f $testfile");
-$CL = new PerlACE::Process ("ftp", "-ORBInitRef NameService=file://$nsior -f $makefile");
-
-print STDERR "Starting Naming Service\n";
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
-}
-
-print STDERR "Starting Server\n";
-
-$SV->Spawn ();
-
-sleep $sleeptime;
-
-print STDERR "Starting Client\n";
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: Naming Service returned $nserver\n";
-    $status = 1;
-}
-
-unlink $nsior;
-unlink $testfile;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 5d58b1db246..7a3b0448193 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -1,22 +1,35 @@
-
-
 // $Id$
 
 #include "server.h"
 #include "ace/Get_Opt.h"
+#include "ace/High_Res_Timer.h"
+#include "ace/Stats.h"
+
 
-static FILE *output_file = 0;
-// File into which the received data is written.
+ACE_hrtime_t recv_base = 0;
+ACE_Throughput_Stats recv_latency;
 
-static const char *output_file_name = "output";
-// File handle of the file into which data is written.
+FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint (void)
+{
+  ACE_DEBUG ((LM_DEBUG,"FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint"));
+}
 
 int
 FTP_Server_StreamEndPoint::get_callback (const char *,
                                          TAO_AV_Callback *&callback)
 {
-  // Return the server application callback to the AVStreams for further upcalls,
-  callback = &this->callback_;
+  ACE_DEBUG ((LM_DEBUG,"FTP_Server_StreamEndPoint::get_sfp_callback\n"));
+  ACE_NEW_RETURN (callback,
+                  FTP_Server_Callback,
+                  -1);
+  return 0;
+}
+
+int
+FTP_Server_Callback::handle_stop (void)
+{
+  ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop"));
+  ACE_OS::fclose (FTP_SERVER::instance ()->file ());
   return 0;
 }
 
@@ -25,25 +38,32 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
                                     TAO_AV_frame_info *,
                                     const ACE_Addr &)
 {
-  // Upcall from the AVStreams when there is data to be received from the
-  // ftp client.
-
-  ACE_DEBUG ((LM_DEBUG,
-              "FTP_Server_Callback::receive_frame\n"));
-
+  ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::receive_frame\n"));
   while (frame != 0)
     {
-      // Write the received data to the file.
-      unsigned int result = ACE_OS::fwrite (frame->rd_ptr (),
-                                            frame->length (),
-                                            1,
-                                            output_file);
-      
-      if (result == frame->length ())
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "FTP_Server_Flow_Handler::fwrite failed\n"),
-                          -1);
-      
+      ACE_hrtime_t stamp;
+      //      int result = ACE_OS::fwrite (frame->rd_ptr (),
+      //                           frame->length (),
+      //                           1,
+      //                           FTP_SERVER::instance ()->file ());
+      if (frame->length () < sizeof(stamp))
+        return 0;
+
+      ACE_OS::memcpy (&stamp, frame->rd_ptr (), sizeof(stamp));
+
+      ACE_hrtime_t now = ACE_OS::gethrtime ();
+      if (recv_base == 0)
+        {
+          recv_base = now;
+        }
+      else
+        {
+          recv_latency.sample (now - recv_base,
+                               now - stamp);
+        }
+
+     //if (result == 0)
+  //    ACE_ERROR_RETURN ((LM_ERROR,"FTP_Server_Flow_Handler::fwrite failed\n"),-1);
       frame = frame->cont ();
     }
   return 0;
@@ -52,71 +72,88 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
 int
 FTP_Server_Callback::handle_destroy (void)
 {
-  // Called when the ftp client requests the stream to be shutdown.
-  ACE_DEBUG ((LM_DEBUG,
-              "FTP_Server_Callback::end_stream\n"));
-  TAO_AV_CORE::instance ()->orb ()->shutdown ();
+  ACE_DEBUG ((LM_DEBUG,"FTP_SFP_Callback::end_stream\n"));
+  TAO_AV_CORE::instance ()->orb ()->shutdown (0);
   return 0;
 }
 
 Server::Server (void)
-  : mmdevice_ (0)
+  : reactive_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ())
 {
 }
 
-Server::~Server (void)
-{
-  delete this->mmdevice_;
-}
-
 int
-Server::init (int,
-              char **,
-              CORBA::Environment &ACE_TRY_ENV)
+Server::init (int argc,
+              char **argv)
 {
-  int result =
-    this->reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (),
-                                   TAO_AV_CORE::instance ()->poa ());
-  if (result != 0)
-    return result;
-
-  // Register the server mmdevice object with the ORB 
-  ACE_NEW_RETURN (this->mmdevice_,
-                  TAO_MMDevice (&this->reactive_strategy_),
-                  -1);
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      PortableServer::POAManager_var mgr
+        = TAO_AV_CORE::instance ()->poa ()->the_POAManager ();
 
-  // Register the mmdevice with the naming service.
-  CosNaming::Name server_mmdevice_name (1);
-  server_mmdevice_name.length (1);
-  server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
+      mgr->activate ();
 
-  CORBA::Object_var mmdevice =
-    this->mmdevice_->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN(-1);
+      int result = this->parse_args (argc,argv);
+      if (result == -1)
+        ACE_ERROR_RETURN  ((LM_ERROR,"parse args failed\n"),-1);
+      // Initialize the naming services
 
-  // Initialize the naming services
-  if (this->my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to initialize "
-                       "the TAO_Naming_Client\n"),
+      if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " (%P|%t) Unable to initialize "
+                           "the TAO_Naming_Client. \n"),
+                          -1);
+
+      // Register the video mmdevice object with the ORB
+      ACE_NEW_RETURN (this->mmdevice_,
+                      TAO_MMDevice (&this->reactive_strategy_),
                       -1);
 
-  // Register the server object with the naming server.
-  this->my_naming_client_->rebind (server_mmdevice_name,
-                                   mmdevice.in (),
-                                   ACE_TRY_ENV);
+      // Register the mmdevice with the naming service.
+      CosNaming::Name server_mmdevice_name (1);
+      server_mmdevice_name.length (1);
+      server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
+
+      // Register the video control object with the naming server.
+      this->my_naming_client_->rebind (server_mmdevice_name,
+                                     this->mmdevice_->_this (ACE_TRY_ENV),
+                                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      return -1;
+    }
+  ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
+  return 0;
+}
 
+int
+Server::run (void)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      TAO_AV_CORE::instance ()->orb ()->run ();
+      ACE_TRY_CHECK;
+    }
+    ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"server::init");
+      return -1;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (-1);
   return 0;
 }
 
 int
-parse_args (int argc,
-            char **argv)
+Server::parse_args (int argc,char **argv)
 {
-  ACE_Get_Opt opts (argc,
-                    argv,
-                    "f:");
+  ACE_Get_Opt opts (argc,argv,"f:p:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -124,87 +161,50 @@ parse_args (int argc,
       switch (c)
         {
         case 'f':
-          output_file_name = opts.optarg;
+          this->fp_ = ACE_OS::fopen (opts.optarg,"w");
+          if (this->fp_ != 0)
+            {
+              ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
+            }
+          break;
+        case 'p':
+          this->protocol_ = ACE_OS::strdup (opts.optarg);
           break;
         default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Usage: server -f filename"),
-                            -1);
+          ACE_ERROR_RETURN ((LM_ERROR,"Usage: server -f filename"),-1);
         }
     }
-
   return 0;
 }
 
+FILE*
+Server::file (void)
+{
+  return this->fp_;
+}
+
 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 == -1)
-        return -1;
-
-      // Make sure we have a valid <output_file>
-      output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_DEBUG,
-                           "Cannot open output file %s\n",
-                           output_file_name),
-                          -1);
+  int result = 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (argc,
+                                        argv);
 
-      else ACE_DEBUG ((LM_DEBUG,
-		       "File Opened Successfull\n"));
+  CORBA::Object_var obj
+    = orb->resolve_initial_references ("RootPOA");
 
-      CORBA::Object_var obj
-        = orb->resolve_initial_references ("RootPOA",
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  PortableServer::POA_var poa
+    = PortableServer::POA::_narrow (obj.in ());
 
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var mgr
-        = root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      mgr->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  ACE_DECLARE_NEW_CORBA_ENV;
 
-      // Initialize the AVStreams components.
+  ACE_TRY
+    {
       TAO_AV_CORE::instance ()->init (orb.in (),
-                                      root_poa.in (),
+                                      poa.in (),
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      Server server;
-      result =
-        server.init (argc,
-                     argv,
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-      if (result != 0)
-        return result;
-      
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -213,20 +213,26 @@ main (int argc,
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
-  ACE_OS::fclose (output_file);
-
+   result = FTP_SERVER::instance ()->init (argc,argv);
+  if (result < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::init failed\n"),1);
+  result = FTP_SERVER::instance ()->run ();
+  if (result < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::run failed\n"),1);
+  ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
+  ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
+  ACE_DEBUG ((LM_DEBUG, "done\n"));
+
+  recv_latency.dump_results ("Receive", gsf);
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_AV_Endpoint_Reactive_Strategy_B
-<FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
-template class TAO_AV_Endpoint_Reactive_Strategy
-<FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
+template class ACE_Singleton <Server,ACE_Null_Mutex>;
+template class TAO_AV_Endpoint_Reactive_Strategy_B <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
+template class TAO_AV_Endpoint_Reactive_Strategy <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B
-<FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy
-<FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate ACE_Singleton <Server,ACE_Null_Mutex>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_B <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
index 4f442c7af4e..ddb0b123e5d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h
@@ -1,94 +1,49 @@
 /* -*- C++ -*- */
 // $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/AVStreams/Pluggable
-//
-// = FILENAME
-//    ftp.h
-//
-// = DESCRIPTION
-//    Ftp server to receive data
-//
-// = AUTHOR
-//    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
-//
-// ============================================================================
 
+#include "ace/Get_Opt.h"
+#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
+#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "orbsvcs/AV/sfp.h"
+#include "orbsvcs/AV/MCast.h"
 #include "orbsvcs/AV/Policy.h"
 
-
-class FTP_Server_Callback : public TAO_AV_Callback
+class FTP_Server_StreamEndPoint : public TAO_Server_StreamEndPoint
 {
-  // = TITLE
-  //    Defines a class for the server application callback.
-  //
-  // = DESCRIPTION
-  //    This class overides the methods of the TAO_AV_Callback so the 
-  //    AVStreams can make upcalls to the application.
-  
 public:
-
-  // Method that is called when there is data to be received from the ftp client.
-  int receive_frame (ACE_Message_Block *frame,
-                     TAO_AV_frame_info *frame_info,
-                     const ACE_Addr &peer_address);
-
-  // Called when the ftp client has finished reading the file and wants
-  // to close4 down the connection.
-  int handle_destroy (void);
+  FTP_Server_StreamEndPoint (void);
+  virtual int get_callback (const char *flowname,
+                            TAO_AV_Callback *&callback);
 };
 
-class FTP_Server_StreamEndPoint : public TAO_Server_StreamEndPoint
+class FTP_Server_Callback : public TAO_AV_Callback
 {
-  // = TITLE
-  //    Defines the aplication stream endpoint
-  //
-  // = DESCRIPTION
-  //    This is the class that overrides the tao_server_enpodint to handle
-  //    pre and post connect processing.
 public:
-  // Create the server application callback.
-  int get_callback (const char *flowname,
-                    TAO_AV_Callback *&callback);
-
-private:
-  FTP_Server_Callback callback_;
-  // reference to the server application callback.
+  virtual int handle_stop (void);
+  virtual int receive_frame (ACE_Message_Block *frame,
+                             TAO_AV_frame_info *frame_info = 0,
+                             const ACE_Addr &peer_address = ACE_Addr::sap_any);
+  virtual int handle_destroy (void);
 };
 
 class Server
 {
-  // = TITLE
-  //    Defines the server application class.
-  // 
-  // = DESCRIPOTION
-  //    The actual server progarm that acts as the ftp server that receives data
-  //    sent by the ftp client.
 public:
   Server (void);
-  // Constructor
-
-  ~Server (void);
-  // Deestructor.
-
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
-  // Initialize data components.
-  
+            char **argv);
+  int run (void);
+  FILE *file (void);
 protected:
+  int parse_args (int argc,char **argv);
   TAO_Naming_Client my_naming_client_;
-  // The Naming Service Client.
-
-  TAO_AV_Endpoint_Reactive_Strategy_B
-  <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
-  // The endpoint reacxtive strategy.
-  
+  TAO_AV_Endpoint_Reactive_Strategy_B <FTP_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
   TAO_MMDevice *mmdevice_;
-  // The server MMDevice.
+  FILE *fp_;
+  char *protocol_;
 };
+
+typedef ACE_Singleton<Server,ACE_Null_Mutex> FTP_SERVER;
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
index 502ad3b7633..5a49df845ad 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
@@ -9,7 +9,7 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
+LDLIBS     = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO
 
 SERVER_OBJS = server.o child.o
 CLIENT_OBJS = client.o
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
index 4f4fd5e711d..7d36af990c8 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
@@ -127,11 +127,11 @@ Client::Client (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int task_id)
   : orb_ (orb),
     poa_ (poa),
     ttcp_reactive_strategy_ (orb, poa,this),
+    reactive_strategy_ (orb, poa),
     client_mmdevice_ (0),
     task_id_ (task_id)
 
 {
-  reactive_strategy_.init (orb, poa);
 }
 
 void
@@ -434,9 +434,9 @@ Client::establish_stream (void)
 ttcp_Endpoint_Reactive_Strategy_A::ttcp_Endpoint_Reactive_Strategy_A (CORBA::ORB_ptr orb,
                                                                       PortableServer::POA_ptr poa,
                                                                       Client *client)
-  : client_ (client)
+  : TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>  (orb, poa),
+    client_ (client)
 {
-  this->init (orb, poa);
 }
 
 int
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
index 16d49a6d962..aa256319e5f 100755
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
@@ -5,61 +5,80 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
 # amount of delay between running the servers
 
 $sleeptime = 6;
 $status = 0;
+$cwd = getcwd();
+local $nsior = "$cwd$DIR_SEPARATOR" . "ns.ior";
 
-$nsior = PerlACE::LocalFile ("ns.ior");
+ACE::checkForTarget($cwd);
 
-unlink $nsior;
+$name_server_prog = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."Naming_Service".$DIR_SEPARATOR."Naming_Service".$EXE_EXT;
+$server_prog = $EXEPREFIX.".".$DIR_SEPARATOR."server".$EXE_EXT;
+$client_prog = $EXEPREFIX.".".$DIR_SEPARATOR."client".$EXE_EXT;
 
-$NS = new PerlACE::Process ("../../../Naming_Service/Naming_Service", "-o $nsior");
-$SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior");
-$CL = new PerlACE::Process ("client", "-ORBInitRef NameService=file://$nsior");
 
-print STDERR "Starting Naming Service\n";
+# variables for parameters
 
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
+sub name_server
+{
+    my $args = "-o $nsior";
+    print ("\n$name_server_prog $args\n");
+    $NS = Process::Create ($name_server_prog, $args);
+    if (ACE::waitforfile_timed ($nsior, 5) == -1) {
+      print STDERR "ERROR: cannot find naming service IOR file\n";
+      $NS->Kill (); $NS->TimedWait (1);
+      exit 1;
+    }
 }
 
-print STDERR "Starting Server\n";
 
-$SV->Spawn ();
+sub server
+{
+    my $args = "-ORBInitRef NameService=file://$nsior";
+    print ("\nServer: $args\n");
+    $SV = Process::Create ($server_prog, $args);
+}
 
-sleep $sleeptime;
 
-print STDERR "Starting Client\n";
+sub client
+{
+    my $args = "-ORBInitRef NameService=file://$nsior";
+    print ("\nclient: $args\n");
+    $CL = Process::Create ($client_prog, $args);
+}
 
-$client = $CL->SpawnWaitKill (60);
+name_server ();
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
+server ();
 
-$server = $SV->TerminateWaitKill (5);
+sleep $sleeptime;
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+client ();
 
-$nserver = $NS->TerminateWaitKill (5);
+if ($CL->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($nserver != 0) {
-    print STDERR "ERROR: Naming Service returned $nserver\n";
-    $status = 1;
+$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-unlink $nsior;
+$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate naming service\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
+}
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
index 053bddcf5e4..87d9945e634 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
@@ -12,9 +12,9 @@ Server::Server (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
   : orb_ (orb),
     poa_ (poa),
     process_strategy_ (&SERVER_GLOBALS::instance ()->process_options_),
+    reactive_strategy_(orb, poa),
     mmdevice_ (0)
 {
-  reactive_strategy_.init (orb, poa);
 }
 
 
@@ -36,10 +36,10 @@ Server::init (int argc, char** argv, CORBA::Environment& ACE_TRY_ENV)
         = this->poa_->the_POAManager ();
 
       mgr->activate ();
-
-      int result = SERVER_GLOBALS::instance ()->parse_args (argc,
+      
+      int result = SERVER_GLOBALS::instance ()->parse_args (argc, 
                                                             argv);
-
+      
       if (result == -1)
         ACE_ERROR_RETURN  ((LM_ERROR,"parse args failed\n"),-1);
 
@@ -49,7 +49,7 @@ Server::init (int argc, char** argv, CORBA::Environment& ACE_TRY_ENV)
                            " (%P|%t) Unable to initialize "
                            "the TAO_Naming_Client. \n"),
                           -1);
-
+      
       switch (SERVER_GLOBALS::instance ()->strategy_)
         {
         case REACTIVE_STRATEGY:
@@ -68,7 +68,7 @@ Server::init (int argc, char** argv, CORBA::Environment& ACE_TRY_ENV)
                             -1);
         }
 
-
+      
       // Register the mmdevice with the naming service.
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
@@ -132,15 +132,15 @@ main (int argc, char **argv)
 
   //TAO_debug_level++;
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, 
                                         argv);
-
+   
   CORBA::Object_var obj
     = orb->resolve_initial_references ("RootPOA");
-
+  
   PortableServer::POA_var poa
     = PortableServer::POA::_narrow (obj.in ());
-
+  
   Server server (orb.in (), poa.in ());
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -149,7 +149,7 @@ main (int argc, char **argv)
 
       if (server.init (argc, argv, ACE_TRY_ENV) == -1)
         return 1;
-
+      
       server.run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
index 02b67dd094d..de3ea52e92d 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile
@@ -22,7 +22,6 @@ BIN2 =  \
 
 PSRC=$(addsuffix .cpp,$(BIN2))
 LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl
index 2f5ff8af44c..5f283075222 100755
--- a/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/run_test.pl
@@ -8,53 +8,64 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs the client and all the other servers that
 # are needed
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
+require Process;
+require Uniqueid;
+use Cwd;
+
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 $status = 0;
 
-$svc_pull_conf = PerlACE::LocalFile ("svc.pull.conf");
+print STDERR "\n\nShutdown EC with clients still attached\n";
+$T = Process::Create ($EXEPREFIX . "Shutdown".$EXE_EXT);
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-sub RunTest ($$$)
-{
-    my $message = shift;
-    my $program = shift;
-    my $arguments = shift;
+print STDERR "\n\nDisconnect callbacks test\n";
+$T = Process::Create ($EXEPREFIX . "Disconnect".$EXE_EXT);
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-    my $TEST = new PerlACE::Process ($program, $arguments);
+print STDERR "\n\nMT Disconnects test\n";
+$T = Process::Create ($EXEPREFIX . "MT_Disconnect".$EXE_EXT);
+if ($T->TimedWait (240) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-    print STDERR "\n\n$message\n";
-    
-    my $test = $TEST->SpawnWaitKill (240);
+print STDERR "\n\nPush Events\n";
+$T = Process::Create ($EXEPREFIX . "Push_Event".$EXE_EXT);
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-    if ($test != 0) {
-        print STDERR "ERROR: Test returned $test\n";
-        $status = 1;
-    }
+print STDERR "\n\nPull-Push Events\n";
+$T = Process::Create ($EXEPREFIX . "Pull_Push_Event".$EXE_EXT,
+                      " -ORBSvcConf $cwd$DIR_SEPARATOR" . "svc.pull.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
 }
 
-RunTest ("\n\nShutdown EC with clients still attached\n",
-         "Shutdown",
-         "");
-
-RunTest ("\n\nDisconnect callbacks test\n",
-         "Disconnect",
-         "");
-          
-RunTest ("\n\nMT Disconnects test\n",
-         "MT_Disconnect",
-         "");
-
-RunTest ("\n\nPush Events\n",
-         "Push_Event",
-         "");
-
-RunTest ("\n\nPull-Push Events\n",
-         "Pull_Push_Event",
-         "-ORBSvcConf $svc_pull_conf");
-
-RunTest ("\n\nRandom\n",
-         "Random",
-         "");
+print STDERR "\n\nRandom\n";
+$T = Process::Create ($EXEPREFIX . "Random".$EXE_EXT);
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index b0c83b7fd25..f14db4c2f81 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -50,10 +50,7 @@ ECB_Driver::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        this->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"),
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp
index 233a44619a1..54bb00d62e2 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/tests/EC_Basic/run_test.pl b/TAO/orbsvcs/tests/EC_Basic/run_test.pl
index c51f890d4fc..57fe34b5352 100755
--- a/TAO/orbsvcs/tests/EC_Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Basic/run_test.pl
@@ -5,16 +5,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+require Process;
+use Cwd;
 
-$T = new PerlACE::Process ("EC_Basic");
+$status = 0;
 
-$test = $T->SpawnWaitKill (60);
+ACE::checkForTarget(getcwd());
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$TEST = Process::Create ($EXEPREFIX."EC_Basic".$EXE_EXT, "");
+
+if ($TEST->TimedWait (60) == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $status = 1;
+  $TEST->Kill (); $TEST->TimedWait (1);
 }
 
-exit 0;
+# @@ Capture any errors from the server too.
+exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
index 9db095948d9..02e4de9f800 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Consumer.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /out:"Release/ECM_Consumer.exe" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"ECM_Consumer.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
index 61fefe6eed5..fb4ad6d6204 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECCM_Supplier.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /out:"Release/ECM_Supplier.exe" /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNaming.lib TAO_RTEvent.lib TAO_RTSched.lib TAO_Svc_Utils.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"ECM_Supplier.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNamingd.lib TAO_RTEventd.lib TAO_RTSchedd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 68c1c7b33cf..7b9dca0b336 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -1,17 +1,16 @@
 // $Id$
 
-#include "ECM_Consumer.h"
-#include "ECM_Data.h"
+#include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Sched_Params.h"
 
+#include "tao/Timeprobe.h"
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/CosNamingC.h"
-#include "tao/Timeprobe.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Sched_Params.h"
+#include "ECM_Consumer.h"
+#include "ECM_Data.h"
 
 ACE_RCSID(EC_Custom_Marshal, ECM_Consumer, "$Id$")
 
@@ -34,7 +33,7 @@ Driver::Driver (void)
 {
 }
 
-// ****************************************************************
+
 
 int
 Driver::run (int argc, char* argv[])
@@ -47,9 +46,7 @@ Driver::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -116,10 +113,7 @@ Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
@@ -154,9 +148,8 @@ Driver::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "connected consumer(s)\n"));
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       this->disconnect_consumers (ACE_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
index b1a936966d1..49f0925df86 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h
@@ -18,7 +18,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/Channel_Clients_T.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
 
 class Driver;
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 2651bab0e04..b86af8c0a26 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -44,8 +44,7 @@ ECMS_Driver::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        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"),
@@ -116,8 +115,7 @@ ECMS_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index e95f013b839..bd781f23a1a 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -16,7 +16,7 @@ IDL_HDR = 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, $(BIN2)) \
+SRC =  $(addsuffix .cpp, $(BIN)) \
         $(addsuffix .cpp, $(IDL_SRC)) \
         ECM_Data.cpp
 
@@ -62,825 +62,6 @@ realclean:
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/ECM_Supplier.o .obj/ECM_Supplier.so .shobj/ECM_Supplier.o .shobj/ECM_Supplier.so: ECM_Supplier.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.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/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- ECM_Supplier.h \
- $(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/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- $(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/RtecDefaultEventDataS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- ECM_Data.h dataC.h dataC.i
-
-.obj/ECM_Consumer.o .obj/ECM_Consumer.so .shobj/ECM_Consumer.o .shobj/ECM_Consumer.so: ECM_Consumer.cpp ECM_Consumer.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/pre.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/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.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.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/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/svc_utils_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- $(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/RtecDefaultEventDataS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/event_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecDefaultEventDataS.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/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- ECM_Data.h dataC.h dataC.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/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-
 .obj/dataC.o .obj/dataC.so .shobj/dataC.o .shobj/dataC.so: dataC.cpp dataC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index e86186b36e8..5f78d78fb71 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -5,70 +5,69 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+require Process;
+use Cwd;
 
-$port = PerlACE::uniqueid () + 10001;  # This can't be 10000 on Chorus 4.0
+$port = ACE::uniqueid () + 10001;  # This can't be 10000 on Chorus 4.0
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
-$NS_ior = PerlACE::LocalFile ("NameService.ior");
+$NS_ior = "$cwd$DIR_SEPARATOR" . "NameService.ior";
 $sleeptime = 5;
 $status = 0;
 
-$NS = new PerlACE::Process ("../../Naming_Service/Naming_Service",
-                            "-ORBNameServicePort $port -o $NS_ior");
-$ES = new PerlACE::Process ("../../Event_Service/Event_Service",
-                            "-ORBInitRef NameService=file://$NS_ior -t new");
-$C  = new PerlACE::Process ("ECM_Consumer", 
-                            "-ORBInitRef NameService=file://$NS_ior");
-$S  = new PerlACE::Process ("ECM_Supplier",
-                            "-ORBInitRef NameService=file://$NS_ior");
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($NS_ior, 5) == -1) {
-    print STDERR "ERROR: waiting for naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
+$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR.
+                       "..".$DIR_SEPARATOR.
+                       "Naming_Service".$DIR_SEPARATOR.
+                       "Naming_Service".$EXE_EXT,
+                       "-ORBNameServicePort $port -o $NS_ior ");
+
+if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
+  print STDERR "ERROR: waiting for naming service IOR file\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$ES->Spawn ();
+$ES = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR.
+                       "..".$DIR_SEPARATOR.
+                       "Event_Service".$DIR_SEPARATOR.
+                       "Event_Service".$EXE_EXT,
+		       "-ORBInitRef NameService=file://$NS_ior -t new");
 
 sleep $sleeptime;
 
-$C->Spawn ();
+$C = Process::Create ($EXEPREFIX."ECM_Consumer".$EXE_EXT,
+		      "-ORBInitRef NameService=file://$NS_ior");
 
 sleep $sleeptime;
 
-$S->Spawn ();
-
-$consumer = $C->WaitKill (60);
+$S = Process::Create ($EXEPREFIX."ECM_Supplier".$EXE_EXT,
+		      "-ORBInitRef NameService=file://$NS_ior");
 
-if ($consumer != 0) {
-    print STDERR "ERROR: consumer returned $consumer\n";
-    $status = 1;
+if ($C->TimedWait (60) == -1) {
+  $status = 1;
+  print STDERR "ERROR: consumer timedout\n";
+  $C->Kill (); $C->TimedWait (1);
 }
 
-$supplier = $S->WaitKill (60);
-
-if ($supplier == -1) {
-    print STDERR "ERROR: supplier returned $supplier\n";
-    $status = 1;
+if ($S->TimedWait (60) == -1) {
+  $status =1;
+  print STDERR "ERROR: supplier timedout\n";
+  $S->Kill (); $S->TimedWait (1);
 }
 
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: nameserver returned $nserver\n";
-    $status = 1;
-}
-
-$eserver = $ES->TerminateWaitKill (5);
-
-if ($eserver != 0) {
-    print STDERR "ERROR: eventserver returned $eserver\n";
-    $status = 1;
+$NS->Terminate();
+$ES->Terminate();
+if ($NS->TimedWait (5) == -1 || $ES->TimedWait (5) == -1) {
+  print STDERR "ERROR: couldn't terminate the services nicely\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  $ES->Kill (); $ES->TimedWait (1);
+  $status = 1;
 }
 
 unlink $NS_ior;
 
+# @@ Capture the errors from the processes.
 exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index e7331c9ded4..317529728fc 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -47,10 +47,7 @@ ECM_Driver::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        this->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"),
diff --git a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
index 443a19d3e24..9af67926b84 100755
--- a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
@@ -5,37 +5,34 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-
-$sample_cfg = PerlACE::LocalFile ("sample.cfg");
-$svc_conf = PerlACE::LocalFile ("svc.conf");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 # Run two copies of the same test...
-$T1 = new PerlACE::Process ("EC_Mcast",
-                            "-c $sample_cfg -ORBSvcConf $svc_conf "
-                            . "-n 100 -t 50000 -f Set02");
-$T2 = new PerlACE::Process ("EC_Mcast",
-                            "-c $sample_cfg -ORBSvcConf $svc_conf "
-                            . "-n 100 -t 50000 -f Set02");
-
-$T1->Spawn ();
-$T2->Spawn ();
-
-$test1 = $T1->WaitKill (60);
-
-if ($test1 != 0) {
-    print STDERR "ERROR: test 1 returned $test1\n";
-    $status = 1;
+$T1 = Process::Create ($EXEPREFIX."EC_Mcast".$EXE_EXT,
+		       " -c $cwd$DIR_SEPARATOR" .
+                       "sample.cfg -ORBSvcConf $cwd$DIR_SEPARATOR" .
+                       "svc.conf -n 100 -t 50000 -f Set02");
+$T2 = Process::Create ($EXEPREFIX."EC_Mcast".$EXE_EXT,
+		       " -c $cwd$DIR_SEPARATOR" .
+                       "sample.cfg -ORBSvcConf $cwd$DIR_SEPARATOR" .
+                       "svc.conf -n 100 -t 50000 -f Set02");
+
+if ($T1->TimedWait (60) == -1) {
+  print STDERR "ERROR: test1 timedout\n";
+  $T1->Kill (); $T1->TimedWait (1);
+  $T2->Kill (); $T2->TimedWait (1);
+  exit 1;
 }
 
-$test2 = $T2->WaitKill (60);
-
-if ($test2 != 0) {
-    print STDERR "ERROR: test 2 returned $test2\n";
-    $status = 1;
+if ($T2->TimedWait (60) == -1) {
+  print STDERR "ERROR: test2 timedout\n";
+  $T2->Kill (); $T2->TimedWait (1);
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index ed85106123a..af62cfd60bc 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -138,10 +138,7 @@ Test_ECG::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA",
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -257,9 +254,7 @@ Test_ECG::run (int argc, char* argv[])
       print_priority_info ("Test_ECG::run (Main after thr_setprio)");
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
@@ -444,8 +439,8 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->rmt_name_ != 0)
         {
-          orb->run (&tv, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          if (orb->run (&tv) == -1)
+            ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
         }
 
       ACE_DEBUG ((LM_DEBUG, "starting....\n"));
@@ -477,8 +472,8 @@ Test_ECG::run (int argc, char* argv[])
       if (this->rmt_name_ != 0)
         {
           tv.set (5, 0);
-          orb->run (&tv, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          if (orb->run (&tv) == -1)
+            ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
           RtecEventChannelAdmin::EventChannel_var remote_ec =
             this->get_ec (naming_context.in (),
@@ -513,8 +508,8 @@ Test_ECG::run (int argc, char* argv[])
           ACE_DEBUG ((LM_DEBUG, "connected proxy\n"));
 
           tv.set (5, 0);
-          orb->run (&tv, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          if (orb->run (&tv) == -1)
+            ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
           RtecEventChannelAdmin::Observer_ptr observer =
             this->ecg_._this (ACE_TRY_ENV);
@@ -565,8 +560,8 @@ Test_ECG::run (int argc, char* argv[])
       ec_impl.activate ();
 
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
       this->test_stop_ = ACE_OS::gethrtime ();
 
@@ -635,8 +630,9 @@ Test_ECG::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "shutdown grace period\n"));
       tv.set (5, 0);
-      orb->run (&tv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run (&tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
+
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
     {
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 00b36ec7e7d..2410208b0d9 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 
 SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS= -lTAO_RTOLDEvent -lTAO_RTSchedEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
  TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index 704b47511d2..1aef14e8855 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -5,40 +5,42 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
+$NS_ior = "$cwd$DIR_SEPARATOR" . "NameService.ior";
 $status = 0;
 
-$NS_ior = PerlACE::LocalFile ("NameService.ior");
-
-$NS = new PerlACE::Process ("../../Naming_Service/Naming_Service", "-o $NS_ior");
-$T = new PerlACE::Process ("EC_Multiple", 
-                           "-ORBInitRef NameService=file://$NS_ior"
-                           ." -s local");
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($NS_ior, 5) == -1) {
-    print STDERR "ERROR: waiting for naming service IOR file\n";
-    $NS->Kill ();
-    exit 1;
+ACE::checkForTarget($cwd);
+
+$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR.
+                       "..".$DIR_SEPARATOR.
+                       "Naming_Service".$DIR_SEPARATOR.
+                       "Naming_Service".$EXE_EXT,
+                       " -o $NS_ior ");
+if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
+  print STDERR "ERROR: waiting for naming service IOR file\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
 # This is a very simple test, no multiple consumers and no gateways.
-$test = $T->SpawnWaitKill (60);
-
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    $status = 1;
+$TEST = Process::Create ($EXEPREFIX."EC_Multiple".$EXE_EXT,
+			 "-ORBInitRef NameService=file://$NS_ior"
+			 ." -s local");
+if ($TEST->TimedWait (60) == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $status = 1;
+  $TEST->Kill (); $TEST->TimedWait (1);
 }
 
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: naming service returned $nserver\n";
-    $status = 1;
+$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate naming service\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index c00025a6778..740bc4ecc00 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -48,10 +48,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        this->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"),
@@ -74,14 +71,14 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                       "Execution parameters:\n"
                       "  consumers = <%d>\n"
                       "  suppliers = <%d>\n"
-                      "  type start = <%d>\n"
+                      "  type_start = <%d>\n"
                       "  type count = <%d>\n"
                       "  pid file name = <%s>\n",
 
                       this->n_consumers_,
                       this->n_suppliers_,
                       this->type_start_,
-                      this->type_count_,
+                      this->type_start_,
 
                       this->pid_file_name_?this->pid_file_name_:"nil") );
         }
@@ -121,10 +118,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService",
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
@@ -175,7 +169,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       ACE_DEBUG ((LM_DEBUG, "running the test\n"));
       for (;;)
         {
-          ACE_Time_Value tv (1, 0);
+          ACE_Time_Value tv (0, 10000);
           this->orb_->perform_work (tv, ACE_TRY_ENV);
           ACE_TRY_CHECK;
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 1);
@@ -194,12 +188,6 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
           channel->destroy (ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->orb_->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
     {
@@ -281,9 +269,6 @@ ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
     {
       this->consumers_[i]->disconnect (ACE_TRY_ENV);
       ACE_CHECK;
-
-      delete this->consumers_[i];
-      this->consumers_[i] = 0;
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 18f42f45db5..1243ef2f66d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -55,9 +55,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -133,9 +131,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
         }
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
@@ -203,17 +199,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
       this->disconnect_suppliers (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
-
       // @@ Deactivate the suppliers (as CORBA Objects?)
-
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "orb and poa destroyed\n"));
     }
   ACE_CATCH (CORBA::SystemException, sys_ex)
     {
@@ -270,9 +256,6 @@ ECT_Supplier_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
     {
       this->suppliers_[i]->disconnect (ACE_TRY_ENV);
       ACE_CHECK;
-
-      delete this->suppliers_[i];
-      this->suppliers_[i] = 0;
     }
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 99d33d22e95..333a0ab66ab 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -71,10 +71,7 @@ ECT_Throughput::run (int argc, char* argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        this->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"),
@@ -191,10 +188,7 @@ ECT_Throughput::run (int argc, char* argv[])
 
 #if 0
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService",
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        this->orb_->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index de9152d16b9..e6ffbd0c26a 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -1,6 +1,6 @@
 # $Id$
 
-LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_RTOLDEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_RTEvent -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index ac539e0c499..f95c59d72d4 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -5,106 +5,103 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
-
-$ec_conf = PerlACE::LocalFile ("ec.conf");
-$ec_mt_conf = PerlACE::LocalFile ("ec_mt_conf");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 print STDERR "================ Collocated tests, single threaded\n";
 
-$T = new PerlACE::Process ("ECT_Throughput",
-                           "-ORBsvcconf $ec_conf"
-                           . " -m new -u 10000 -n 1 -t 0 -c 4");
-
-
-$test = $T->SpawnWaitKill (120);
+$T = Process::Create ($EXEPREFIX."ECT_Throughput".$EXE_EXT,
+		      " -ORBsvcconf $cwd$DIR_SEPARATOR" . "ec.conf" .
+                      " -m new -u 10000 -n 1 -t 0 -c 4");
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    $status = 1;
+if ($T->TimedWait (120) == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
 print STDERR "================ Collocated tests, single threaded\n";
 
-$T = new PerlACE::Process ("ECT_Throughput",
-                           "-ORBsvcconf $ec_mt_conf" 
-                           . "-m new -u 10000 -n 1 -t 0 -c 4");
+$T = Process::Create ($EXEPREFIX."ECT_Throughput".$EXE_EXT,
+		      " -ORBsvcconf $cwd$DIR_SEPARATOR" . "ec.mt.conf" .
+                      " -m new -u 10000 -n 1 -t 0 -c 4");
 
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    $status = 1;
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
 print STDERR "================ Remote test\n";
 
-$ns_ior = PerlACE::LocalFile ("NameService.ior");
+$ns_ior = "NameService.ior";
 
 unlink $ns_ior;
-
-$NS = new PerlACE::Process ("../../Naming_Service/Naming_Service",
-                           "-o $ns_ior");
-                           
-$ES = new PerlACE::Process ("../../Event_Service/Event_Service",
-                            "-ORBInitRef NameService=file://$ns_ior "
-                            . " -ORBSvcConf $ec_conf "
-                            . " -t NEW");
-                            
-$C = new PerlACE::Process ("ECT_Consumer",
-                           "-ORBInitRef NameService=file://$ns_ior "
-                           . " -c 4 -s 1");
-
-$S = new PerlACE::Process ("ECT_Supplier",
-                           "-ORBInitRef NameService=file://$ns_ior "
-                           . " -s 1 -u 5000 -n 1 -t 0");
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($ns_ior, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ns_ior>\n";
-    $NS->Kill (); 
-    exit 1;
+$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR.
+                       "..".$DIR_SEPARATOR.
+                       "Naming_Service".$DIR_SEPARATOR.
+                       "Naming_Service".$EXE_EXT,
+                       " -o $ns_ior ");
+
+if (ACE::waitforfile_timed ($ns_ior, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$ns_ior>\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$ES->Spawn ();
+$ES = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR.
+                       "..".$DIR_SEPARATOR.
+                       "Event_Service".$DIR_SEPARATOR.
+                       "Event_Service".$EXE_EXT,
+                       " -ORBInitRef NameService=file://$ns_ior "
+                       ." -ORBSvcConf $cwd$DIR_SEPARATOR" . "ec.conf "
+		       . " -t NEW");
 
 sleep 5;
 
-$C->Spawn ();
-$S->Spawn ();
-
-$supplier = $S->WaitKill (300);
-
-if ($supplier != 0) {
-    print STDERR "ERROR: supplier returned $supplier\n";
-    $status = 1;
+$C = Process::Create ($EXEPREFIX."ECT_Consumer".$EXE_EXT,
+		      " -ORBInitRef NameService=file://$ns_ior "
+		      . " -c 4 -s 1");
+
+$S = Process::Create ($EXEPREFIX."ECT_Supplier".$EXE_EXT,
+		      " -ORBInitRef NameService=file://$ns_ior "
+		      . " -s 1 -u 5000 -n 1 -t 0");
+
+if ($S->TimedWait (300) == -1) {
+  print STDERR "ERROR: supplier timedout\n";
+  $S->Kill (); $S->TimedWait (1);
+  $C->Kill (); $C->TimedWait (1);
+  $ES->Kill (); $ES->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$consumer = $C->WaitKill (60);
-
-if ($consumer != 0) {
-    print STDERR "ERROR: consumer returned $consumer\n";
-    $status = 1;
+if ($C->TimedWait (60) == -1) {
+  print STDERR "ERROR: consumer timedout\n";
+  $C->Kill (); $C->TimedWait (1);
+  $ES->Kill (); $ES->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$eserver = $ES->WaitKill (5);
-
-if ($eserver != 0) {
-    print STDERR "ERROR: event server returned $eserver\n";
-    $status = 1;
+if ($ES->TimedWait (5) == -1) {
+  print STDERR "ERROR: event channel timedout\n";
+  $ES->Kill (); $ES->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: name server returned $nserver\n";
-    $status = 1;
+$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate naming service\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
 unlink $ns_ior;
 
-exit $status;
+exit 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
index 111141f60d7..a9061f6f223 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile
@@ -30,7 +30,6 @@ BIN2 =   Reconnect \
 
 PSRC=$(addsuffix .cpp,$(BIN2)) Schedule.cpp
 LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 03a4f7e3f3b..d897cad75e8 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -167,9 +167,7 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[],
   ACE_CHECK;
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-  ACE_CHECK;
-
+    this->orb_->resolve_initial_references("RootPOA");
   if (CORBA::is_nil (poa_object.in ()))
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
index 8ac6b2e0dc1..6811dd7c615 100755
--- a/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/exhaustive_test.pl
@@ -8,51 +8,61 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs the client and all the other servers that
 # are needed
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
+require Uniqueid;
+use Cwd;
 
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 $status = 0;
 
-$conf_file = PerlACE::LocalFile ('exhaustive.conf');
-
-@dispatching_configs   = ("-ECDispatching reactive",
-                          "-ECDispatching mt -ECDispatchingThreads 4");
-@collection_strategies = ("copy_on_read", 
-                          "copy_on_write", 
-                          "delayed");
-@collection_types      = ("list", 
-                          "rb_tree");
-@filtering_configs     = ("-ECFiltering prefix -ECSupplierFilter per-supplier",
-                          "-ECFiltering prefix -ECSupplierFilter null");
+$conf_file = 'exhaustive.conf';
+@dispatching_configs = ("-ECDispatching reactive",
+			"-ECDispatching mt -ECDispatchingThreads 4");
+@collection_strategies = ("copy_on_read",
+			  "copy_on_write",
+			  "delayed");
+@collection_types = ("list", "rb_tree");
+@filtering_configs = ("-ECFiltering prefix -ECSupplierFilter per-supplier",
+		      "-ECFiltering prefix -ECSupplierFilter null");
 
 foreach $d (@dispatching_configs) {
-    foreach $f (@filtering_configs) {
-        foreach $c (@collection_strategies) {
-            foreach $t (@collection_types) {
-                my $collection = "mt:".$c.":".$t;
-                
-                my $config = 'static EC_Factory "'
-                             .$d
-                             ." -ECProxyPushConsumerCollection ".$collection
-                             ." -ECProxyPushSupplierCollection ".$collection
-                             ." ".$f
-                             .'"';
-
-                open (CONFIG,">$conf_file") || die "Cannot open $conf_file\n";
-                print CONFIG $config, "\n";
-                close (CONFIG);
-
-                print STDERR "\n\n", $config, "\n";
-
-                system ("purify.exe "
-                        . "/run .\\Release\\Random.exe "
-                        . " -ORBSvcConf $conf_file"
-                        . " -suppliers 16"
-                        . " -consumers 16"
-                        . " -max_recursion 0");
-            }
-        }
+  foreach $f (@filtering_configs) {
+    foreach $c (@collection_strategies) {
+      foreach $t (@collection_types) {
+	local $collection = "mt:".$c.":".$t;
+	local $config =
+	  'static EC_Factory "'
+	  .$d
+	  ." -ECProxyPushConsumerCollection ".$collection
+	  ." -ECProxyPushSupplierCollection ".$collection
+	  ." ".$f
+	  .'"';
+	open (CONFIG,">$conf_file")
+	  || die "Cannot open $conf_file\n";
+	print CONFIG $config, "\n";
+	close (CONFIG);
+
+	print STDERR "\n\n", $config, "\n";
+
+	system ("purify.exe ".
+			      "/run .\\Release\\Random.exe ".
+			      " -ORBSvcConf "
+			      .$cwd.$DIR_SEPARATOR.
+			      "$conf_file"
+			      ." -suppliers 16"
+			      ." -consumers 16"
+			      ." -max_recursion 0");
+# $T = Process::Create ("c:\\Program Files\\Rational\\Purify\\purify.exe"
+#	if ($T->TimedWait (900) == -1) {
+#	  print STDERR "ERROR: Test timedout\n";
+#	  $status = 1;
+#	  $T->Kill (); $T->TimedWait (1);
+#	}
+      }
     }
+  }
 }
 
 unlink "$conf_file";
diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
index cbe4506e0d2..1aa10dae736 100755
--- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
@@ -8,94 +8,158 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs the client and all the other servers that
 # are needed
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
+require Uniqueid;
+use Cwd;
 
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 $status = 0;
 
-$svc_conf = PerlACE::LocalFile ("svc.conf");
-$observer_conf = PerlACE::LocalFile ("observer.conf");
-$svc_complex_conf = PerlACE::LocalFile ("svc.complex.conf");
-$mt_svc_conf = PerlACE::LocalFile ("mt.svc.conf");
-$svc_complex_conf = PerlACE::LocalFile ("svc.complex.conf");
-$control_conf = PerlACE::LocalFile ("control.conf");
-
-sub RunTest ($$$)
-{
-    my $message = shift;
-    my $program = shift;
-    my $arguments = shift;
-
-    my $TEST = new PerlACE::Process ($program, $arguments);
-
-    print STDERR "\n\n$message\n";
-    
-    my $test = $TEST->SpawnWaitKill (240);
-
-    if ($test != 0) {
-        print STDERR "ERROR: Test returned $test\n";
-        $status = 1;
-    }
+print STDERR "\n\nReconnect suppliers and consumers,",
+  " using disconnect/connect calls\n";
+$T = Process::Create ($EXEPREFIX . "Reconnect".$EXE_EXT,
+                      "-ORBsvcconf $cwd$DIR_SEPARATOR" . "svc.conf" .
+                      " -suppliers 100 -consumers 100 -d 100");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
 }
 
-RunTest ("Reconnect suppliers and consumers, using disconnect/connect calls",
-         "Reconnect",
-         "-ORBsvcconf $svc_conf -suppliers 100 -consumers 100 -d 100");
+print STDERR "\n\nReconnect suppliers and consumers, using connect calls\n";
+$T = Process::Create ($EXEPREFIX . "Reconnect".$EXE_EXT,
+                      "-ORBsvcconf $cwd$DIR_SEPARATOR" . "svc.conf" .
+                      " -suppliers 100 -consumers 100 -d 100 -s -c");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Reconnect suppliers and consumers, using connect calls",
-         "Reconnect",
-         "-ORBsvcconf $svc_conf -suppliers 100 -consumers 100 -d 100 -s -c");
 
-RunTest ("Shutdown EC with clients still attached",
-         "Shutdown",
-         "-ORBsvcconf $svc_conf -suppliers 5 -consumers 5");
+print STDERR "\n\nShutdown EC with clients still attached\n";
+$T = Process::Create ($EXEPREFIX . "Shutdown".$EXE_EXT,
+                      "-ORBsvcconf $cwd$DIR_SEPARATOR" . "svc.conf" .
+                      " -suppliers 5 -consumers 5");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Gateway test",
-         "Gateway",
-         "-ORBsvcconf $observer_conf");
+print STDERR "\n\nGateway test\n";
+$T = Process::Create ($EXEPREFIX . "Gateway".$EXE_EXT,
+                      " -ORBsvcconf $cwd$DIR_SEPARATOR" . "observer.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Complex event channel test, multiple ECs connected through gateways",
-         "Observer",
-         "-ORBsvcconf $observer_conf -consumer_tshift 0 -consumers 5 -supplier_tshift 0 -suppliers 2 -burstsize 10 -burstcount 10 -burstpause 0");
+print STDERR "\n\nComplex event channel test,",
+  "multiple ECs connected through gateways\n";
+$T = Process::Create ($EXEPREFIX . "Observer".$EXE_EXT,
+                      " -ORBsvcconf $cwd$DIR_SEPARATOR" . "observer.conf"
+                      ." -consumer_tshift 0 -consumers 5"
+                      ." -supplier_tshift 0 -suppliers 2"
+                      ." -burstsize 10 -burstcount 10 -burstpause 0");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Timeout tests",
-         "Timeout",
-         "-ORBsvcconf $svc_conf");
+print STDERR "\n\nTimeout tests\n";
+$T = Process::Create ($EXEPREFIX . "Timeout".$EXE_EXT,
+                      "-ORBsvcconf $cwd$DIR_SEPARATOR" . "svc.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Wildcard tests",
-         "Wildcard",
-         "-ORBsvcconf $svc_conf");
+print STDERR "\n\nWildcard tests\n";
+$T = Process::Create ($EXEPREFIX . "Wildcard".$EXE_EXT,
+                      "-ORBsvcconf $cwd$DIR_SEPARATOR" . "svc.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Negation tests",
-         "Negation",
-         "-ORBsvcconf $svc_conf");
+print STDERR "\n\nNegation tests\n";
+$T = Process::Create ($EXEPREFIX . "Negation".$EXE_EXT,
+                      "-ORBsvcconf $cwd$DIR_SEPARATOR" . "svc.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Bitmask tests",
-         "Bitmask",
-         "-ORBSvcConf $svc_complex_conf");
+print STDERR "\n\nBitmask tests\n";
+$T = Process::Create ($EXEPREFIX . "Bitmask".$EXE_EXT,
+                      " -ORBSvcConf $cwd$DIR_SEPARATOR" . "svc.complex.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Disconnect callbacks test",
-         "Disconnect",
-         "-ORBsvcconf $svc_conf");
+print STDERR "\n\nDisconnect callbacks test\n";
+$T = Process::Create ($EXEPREFIX . "Disconnect".$EXE_EXT,
+                      "-ORBsvcconf $cwd$DIR_SEPARATOR" . "svc.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("MT Disconnects test",
-         "MT_Disconnect",
-         "-ORBSvcConf $mt_svc_conf");
+print STDERR "\n\nMT Disconnects test\n";
+$T = Process::Create ($EXEPREFIX . "MT_Disconnect".$EXE_EXT,
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "mt.svc.conf");
+if ($T->TimedWait (240) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Atomic Reconnection test",
-         "Atomic_Reconnect",
-         "-ORBSvcConf $mt_svc_conf");
+print STDERR "\n\nAtomic Reconnection test\n";
+$T = Process::Create ($EXEPREFIX . "Atomic_Reconnect".$EXE_EXT,
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "mt.svc.conf");
+if ($T->TimedWait (120) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Complex filter",
-         "Complex",
-         "-ORBSvcConf $svc_complex_conf");
+print STDERR "\n\nComplex filter\n";
+$T = Process::Create ($EXEPREFIX . "Complex".$EXE_EXT,
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "svc.complex.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Control test",
-         "Control",
-         "-ORBSvcConf $control_conf");
+print STDERR "\n\nControl test\n";
+$T = Process::Create ($EXEPREFIX . "Control".$EXE_EXT,
+                     " -ORBSvcConf $cwd$DIR_SEPARATOR" . "control.conf");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("Random test",
-         "Random",
-         "-ORBSvcConf $svc_conf -suppliers 4 -consumers 4 -max_recursion 1");
+print STDERR "\n\nRandom test\n";
+$T = Process::Create ($EXEPREFIX . "Random".$EXE_EXT,
+		      " -ORBSvcConf $cwd$DIR_SEPARATOR" . "svc.conf"
+		      . " -suppliers 4 -consumers 4 -max_recursion 1");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 7b202b6a323..37fab174375 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -2,7 +2,6 @@
 
 #include "Latency.h"
 #include "orbsvcs/Event_Service_Constants.h"
-#include "tao/Strategies/advanced_resource.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
@@ -50,7 +49,7 @@ main (int argc, char *argv [])
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-#if (TAO_HAS_CORBA_MESSAGING == 1)
+#if (TAO_HAS_MESSAGING == 1)
       CORBA::Object_var manager_object =
         orb->resolve_initial_references ("ORBPolicyManager",
                                          ACE_TRY_ENV);
@@ -82,9 +81,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -201,24 +198,20 @@ main (int argc, char *argv [])
 
       task.activate ();
 
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
       while (!task.done () || !consumer.done ())
         {
-          ACE_Time_Value tv (1, 0);
+          ACE_Time_Value tv (10, 0); //0, 10000);
           orb->run (tv, ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-      ACE_hrtime_t end = ACE_OS::gethrtime ();
 
       ACE_Thread_Manager::instance ()->wait ();
 
       // Calibrate the high resolution timer *before* starting the
       // test.
-      ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
 
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
       if (do_dump_history)
         {
           history.dump_samples ("HISTORY", gsf);
@@ -228,14 +221,6 @@ main (int argc, char *argv [])
       history.collect_basic_stats (stats);
       stats.dump_results ("Latency", gsf);
 
-      ACE_hrtime_t elapsed_microseconds = (end - start) / gsf;
-      double elapsed_seconds =
-        ACE_CU64_TO_CU32(elapsed_microseconds) / 1000000.0;
-      double throughput =
-        double(iterations) / elapsed_seconds;
-
-      ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput));
-
       proxy_supplier->disconnect_push_supplier (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -331,12 +316,6 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events,
 
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   this->history_->sample (now - creation);
-  if (this->remaining_messages_ % 1000 == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Only %d messages to go\n",
-                  this->remaining_messages_));
-    }
-
   this->remaining_messages_--;
 }
 
@@ -384,7 +363,6 @@ Task::svc (void)
       event[0].header.type   = ACE_ES_EVENT_UNDEFINED;
       event[0].header.source = 1;
       event[0].header.ttl    = 1;
-      event[0].data.payload.length(1024);
 
       for (;;)
         {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.dsp b/TAO/orbsvcs/tests/Event/Performance/Latency.dsp
index f7a4e73d603..d062f82e95c 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.dsp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTest.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ECTest.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Svc_Utils.lib TAO_RTEvent.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ECTestd.lib aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 30b4a9709b8..75d52d49b09 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -2,7 +2,6 @@
 
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
-#include "tao/Strategies/advanced_resource.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
@@ -49,7 +48,7 @@ main (int argc, char *argv [])
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-#if (TAO_HAS_CORBA_MESSAGING == 1)
+#if (TAO_HAS_MESSAGING == 1)
       CORBA::Object_var manager_object =
         orb->resolve_initial_references ("ORBPolicyManager",
                                          ACE_TRY_ENV);
@@ -81,9 +80,7 @@ main (int argc, char *argv [])
 #endif /* TAO_HAS_MESSAGING */
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.dsp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.dsp
index 83156f7883c..664d4dfc64e 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.dsp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTest.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Svc_Utils.lib TAO_RTEvent.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ECTest.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_Svc_Utils.lib TAO_RTEvent.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

 

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

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib TAO_Strategiesd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\tao\Strategies" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 ECTestd.lib aced.lib TAOd.lib TAO_PortableServerd.lib TAO_Svc_Utilsd.lib TAO_RTEventd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
index f113a3c47b9..050e5c64ff9 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile
@@ -19,8 +19,7 @@ BIN2 =  Throughput \
 	Latency_Server
 
 PSRC=$(addsuffix .cpp,$(BIN2))
-LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO_Strategies -lTAO
-
+LDLIBS = -lECTests -lTAO_RTEvent -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
 CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
         $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
 
diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
index 56145ed31e7..94acf56453f 100755
--- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
@@ -8,58 +8,94 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs the client and all the other servers that
 # are needed
 
-use lib  '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
+require Uniqueid;
+use Cwd;
+
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 $status = 0;
 
-$ec_st_conf = PerlACE::LocalFile ("ec.st.conf");
+print STDERR "\n\nThroughput/Latency single threaded configuration\n";
+$T = Process::Create ($EXEPREFIX . "Throughput".$EXE_EXT,
+		      " -ORBsvcconf $cwd$DIR_SEPARATOR" . "ec.st.conf "
+		      . "-burstsize 2000 -burstcount 1");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-sub RunTest ($$$)
-{
-    my $message = shift;
-    my $program = shift;
-    my $arguments = shift;
 
-    my $TEST = new PerlACE::Process ($program, $arguments);
+print STDERR "\n\nThroughput/Latency MT-safe configuration\n";
+$T = Process::Create ($EXEPREFIX . "Throughput".$EXE_EXT,
+		      " -burstsize 2000"
+		      ." -burstcount 1");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-    print STDERR "\n\n$message\n";
-    
-    my $test = $TEST->SpawnWaitKill (60);
 
-    if ($test != 0) {
-        print STDERR "ERROR: Test returned $test\n";
-        $status = 1;
-    }
+print STDERR "\n\nThroughput/Latency MT-safe configuration, 4 consumers\n";
+$T = Process::Create ($EXEPREFIX . "Throughput".$EXE_EXT,
+		      " -burstsize 2000"
+		      ." -burstcount 1 -consumers 4");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
 }
 
-RunTest ("\n\nThroughput/Latency single threaded configuration\n",
-         "Throughput",
-         "-ORBsvcconf $ec_st_conf -burstsize 2000 -burstcount 1");
 
-RunTest ("\n\nThroughput/Latency MT-safe configuration\n",
-         "Throughput",
-         "-burstsize 2000 -burstcount 1");
+print STDERR "\n\nThroughput/Latency MT-safe configuration,",
+  " 4 consumers 4 suppliers\n";
+$T = Process::Create ($EXEPREFIX . "Throughput".$EXE_EXT,
+		      " -burstsize 2000"
+		      ." -burstcount 1 -consumers 4 -suppliers 4");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("\n\nThroughput/Latency MT-safe configuration, 4 consumers\n",
-         "Throughput",
-         "-burstsize 2000 -burstcount 1 -consumers 4");
 
-RunTest ("\n\nThroughput/Latency MT-safe configuration, 4 consumers 4 suppliers\n",
-         "Throughput",
-         "-burstsize 2000 -burstcount 1 -consumers 4 -suppliers 4");
+print STDERR "\n\nThroughput/Latency MT-safe configuration,",
+  " 4 consumers 4 suppliers\n";
+$T = Process::Create ($EXEPREFIX . "Throughput".$EXE_EXT,
+		      " -burstsize 2000"
+		      ." -burstcount 1 -consumers 4 -suppliers 4"
+		      ." -consumers_tshift 0 -suppliers_tshift 0");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("\n\nThroughput/Latency MT-safe configuration, 4 consumers 4 suppliers\n",
-         "Throughput",
-         "-burstsize 2000 -burstcount 1 -consumers 4 -suppliers 4"
-         . " -consumers_tshift 0 -suppliers_tshift 0");
+print STDERR "\n\nConnection and disconnection time,",
+  " 100 consumers 100 suppliers\n";
+$T = Process::Create ($EXEPREFIX . "Connect".$EXE_EXT,
+		      " -consumers 100 -suppliers 100"
+		      ." -connection_order interleaved");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
-RunTest ("\n\nConnection and disconnection time, 100 consumers 100 suppliers\n",
-         "Connect",
-         "-consumers 100 -suppliers 100 -connection_order interleaved");
 
-RunTest ("\n\nConnection and disconnection time, 500 consumers 500 suppliers\n",
-         "Connect",
-         "-consumers 500 -suppliers 500 -connection_order interleaved");
+print STDERR "\n\nConnection and disconnection time,",
+  " 500 consumers 500 suppliers\n";
+$T = Process::Create ($EXEPREFIX . "Connect".$EXE_EXT,
+		      " -consumers 500 -suppliers 500"
+		      ." -connection_order interleaved");
+if ($T->TimedWait (60) == -1) {
+  print STDERR "ERROR: Test timedout\n";
+  $status = 1;
+  $T->Kill (); $T->TimedWait (1);
+}
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index b0201c42893..652630cd67e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -178,9 +178,7 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[],
   ACE_CHECK;
 
   CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-  ACE_TRY_CHECK;
-
+    this->orb_->resolve_initial_references("RootPOA");
   if (CORBA::is_nil (poa_object.in ()))
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index beaacd0a7d1..b81e127c174 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -865,9 +865,7 @@ main (int argc, char *argv [])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -885,9 +883,7 @@ main (int argc, char *argv [])
       ACE_TRY_CHECK;
 
       CORBA::Object_var naming_obj =
-        orb->resolve_initial_references ("NameService", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get the Naming Service.\n"),
diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
index 71a7436bb3e..e7d20789200 100755
--- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
@@ -5,56 +5,59 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$NS_ior = PerlACE::LocalFile ("NameService.ior");
+$cwd = getcwd();
+$NS_ior = "$cwd$DIR_SEPARATOR" . "NameService.ior";
 $sleeptime = 3;
 $status = 0;
 
-unlink $NS_ior;
-
-$NS = new PerlACE::Process ("../../Naming_Service/Naming_Service",
-                            "-o $NS_ior ");
-$ES = new PerlACE::Process ("../../Event_Service/Event_Service",
-                            "-ORBInitRef NameService=file://$NS_ior -t new");
-$T  = new PerlACE::Process ("Event_Latency",
-                            "-ORBInitRef NameService=file://$NS_ior"
-                            . " -j -m 100");
+ACE::checkForTarget($cwd);
 
-$NS->Spawn ();
+$NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+		       ."..".$DIR_SEPARATOR
+		       ."Naming_Service".$DIR_SEPARATOR
+		       ."Naming_Service".$EXE_EXT,
+		       " -o $NS_ior ");
 
-if (PerlACE::waitforfile_timed ($NS_ior, 5) == -1) {
-    print STDERR "ERROR: waiting for naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($NS_ior, 5) == -1) {
+  print STDERR "ERROR: waiting for naming service IOR file\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$ES->Spawn ();
+$ES = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+		       ."..".$DIR_SEPARATOR
+		       ."Event_Service".$DIR_SEPARATOR
+		       ."Event_Service".$EXE_EXT,
+		       "-ORBInitRef NameService=file://$NS_ior -t new");
 
 sleep $sleeptime;
 
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    $status = 1;
-}
-
-$nserver = $NS->TerminateWaitKill (5);
+$TEST = Process::Create ($EXEPREFIX.".".$DIR_SEPARATOR."Event_Latency".$EXE_EXT,
+			 "-ORBInitRef NameService=file://$NS_ior"
+			 ." -j -m 100");
 
-if ($nserver != 0) {
-    print STDERR "ERROR: name server returned $nserver\n";
-    $status = 1;
+if ($TEST->TimedWait (60) == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $status = 1;
+  $TEST->Kill (); $TEST->TimedWait (1);
 }
 
-$eserver = $ES->TerminateWaitKill (5);
 
-if ($eserver != 0) {
-    print STDERR "ERROR: event server returned $eserver\n";
-    $status = 1;
+$NS->Terminate();
+$ES->Terminate();
+if ($NS->TimedWait (5) == -1 || $ES->TimedWait (5) == -1) {
+  print STDERR "ERROR: couldn't terminate the services nicely\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  $ES->Kill (); $ES->TimedWait (1);
+  $status = 1;
 }
 
 unlink $NS_ior;
 
+# @@ Capture any errors from the server too.
 exit $status;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
index 16c9af0b8fa..8c1a4fb5678 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-#LDLIBS = -lTAO_FaultTolerance -lTAO
+#LDLIBS = -lTAO_FaultTolerance -lTAO -lACE
 
 IDL_FILES=test
 IDL_SRC = testC testS
@@ -50,7 +50,7 @@ include $(TAO_ROOT)/taoconfig.mk
 .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
 TAO_IOR_MANIP_LIBS = -lTAO_IORManip
-TAO_FT_LIBS = -lTAO_FaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer
+TAO_FT_LIBS = -lTAO_FaultTolerance -lTAO_CosNaming -lTAO_CosNotification -lTAO_Svc_Utils -lTAO_PortableServer
 
 server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_FT_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 1f52b861e36..943dc098c7a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -239,18 +239,10 @@ Manager::set_properties (CORBA::Environment &ACE_TRY_ENV)
 int
 Manager::run (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR_RETURN ((LM_DEBUG,
-                         "Error in run \n"),
-                        -1);
-    }
-  ACE_ENDTRY;
+  if (this->orb_->run (ACE_TRY_ENV) == -1)
+    ACE_ERROR_RETURN ((LM_DEBUG,
+                       "Error in run \n"),
+                       -1);
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
index 6396e89806a..2664bb99ddd 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_FaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORManip -lTAO
+LDLIBS = -lTAO_FaultTolerance -lTAO_CosNaming -lTAO_CosNotification -lTAO_IORManip -lTAO
 
 PROG_SRCS = IOGRTest.cpp
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/Makefile.bor b/TAO/orbsvcs/tests/FaultTolerance/Makefile.bor
deleted file mode 100644
index dd386ae9bfa..00000000000
--- a/TAO/orbsvcs/tests/FaultTolerance/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#
-# Makefile for building the TAO obsvcs examples
-#
-
-DIRS = \
-        IOGR \
-        IOGRManipulation
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
index c7ae582978f..7b3fa36d070 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/run_test.pl
@@ -6,109 +6,72 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../../bin";
-use PerlACE::Run_Test;
+
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd();
 
 ################################################################################
 # Program locations
 
-$imr_ior = PerlACE::LocalFile ("imr.ior");
-$name_ior = PerlACE::LocalFile ("name.ior");
+$imr_ior = "$cwd$DIR_SEPARATOR" . "imr.ior";
+$name_ior = "$cwd$DIR_SEPARATOR" . "name.ior";
+
+$imr_server = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.".."
+              .$DIR_SEPARATOR."ImplRepo_Service"
+              .$DIR_SEPARATOR."ImplRepo_Service".$EXE_EXT;
+
+$name_server = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.".."
+               .$DIR_SEPARATOR."Naming_Service"
+               .$DIR_SEPARATOR."Naming_Service".$EXE_EXT;
 
-$IMR = new PerlACE::Process ("../../../ImplRepo_Service/ImplRepo_Service");
-$NS  = new PerlACE::Process ("../../../Naming_Service/Naming_Service");
 
 if ($^O eq "MSWin32") {
-    $TAO_IMR = new PerlACE::Process ("../../../../../bin/tao_imr");
+    # Just find it in the path
+    $tao_imr = "tao_imr".$EXE_EXT;
 }
 else {
-    $TAO_IMR = new PerlACE::Process ("../../../ImplRepo_Service/tao_imr");
+    $tao_imr = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.".."
+               .$DIR_SEPARATOR."ImplRepo_Service"
+               .$DIR_SEPARATOR."tao_imr".$EXE_EXT;
 }
 
-$TEST = new PerlACE::Process ("test");
+$test = $EXEPREFIX."test".$EXE_EXT;
 
 ################################################################################
 
 $errors = 0;
 
+ACE::checkForTarget($cwd);
+
 unlink $imr_ior;
 unlink $name_ior;
 
-################################################################################
-## Start the implementation Repository 
-
-$IMR->Arguments ("-o $imr_ior -d 0");
-$IMR->Spawn ();
-
-if (PerlACE::waitforfile_timed ($imr_ior, 5) == -1) {
-    print STDERR "ERROR: waiting for $imr_ior\n";
-    $IMR->Kill ();
-    exit 1;
-}
+$IR = Process::Create ($imr_server, "-o $imr_ior -d 0");
 
-################################################################################
-## Register the NameService
+ACE::waitforfile ($imr_ior);
 
-$TAO_IMR->Arguments("-ORBInitRef ImplRepoService=file://$imr_ior"
-                    . " add NameService "
-                    ." -c \"" . $NS->Executable () 
+system ($tao_imr." -ORBInitRef ImplRepoService=file://$imr_ior"
+                ." add NameService "
+                ." -c \"$name_server"
                        ." -ORBInitRef ImplRepoService=file://$imr_ior"
                        ." -ORBUseIMR 1 .\"");
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
+system ($tao_imr." -ORBInitRef ImplRepoService=file://$imr_ior"
+                ." ior NameService -f $name_ior");
 
-if ($tao_imr != 0) {
-    print STDERR "ERROR: tao_imr (add) returned $tao_imr\n";
+if (system ($test." -ORBInitRef NameService=file://$name_ior")) {
     ++$errors;
 }
 
-################################################################################
-## Create IOR for NameService
-
-$TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$imr_ior"
-                     . " ior NameService -f $name_ior");
+system ($tao_imr." -ORBInitRef ImplRepoService=file://$imr_ior"
+                ." shutdown NameService ");
 
+$IR->Kill (); $IR->Wait ();
 
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
 
-if ($tao_imr != 0) {
-    print STDERR "ERROR: tao_imr (ior) returned $tao_imr\n";
-    ++$errors;
+if ($errors > 0) {
+    print "Error: run_test.pl detected $errors errors!\n";
 }
-
-################################################################################
-## Run the test
-
-$TEST->Arguments ("-ORBInitRef NameService=file://$name_ior");
-
-$test = $TEST->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    ++$errors;
-}
-
-
-################################################################################
-## Shutdown the NameService
-
-$TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$imr_ior shutdown "
-                     . "NameService ");
-
-$taoimr = $TAO_IMR->SpawnWaitKill (60);
-
-if ($tao_imr != 0) {
-    print STDERR "ERROR: tao_imr (shutdown) returned $tao_imr\n";
-    ++$errors;
-}
-
-################################################################################
-## Kill the IMR
-
-$iserver = $IMR->TerminateWaitKill (5); 
-
-if ($iserver != 0) {
-    print STDERR "ERROR: IMR returned $iserver\n";
-    ++$errors;
-}
-
-exit $errors;
+exit ($errors);
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
index 093f745386c..6d386d2de1e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
@@ -18,3 +18,4 @@ main (int argc, char **argv)
   else
     return client.run ();
 }
+
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 4b9708cc0e2..5a22f6d9285 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -10,7 +10,7 @@ main (int argc, char *argv[])
   Airplane_Server_i server;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n"));
-
+  
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index f0b2be8b60f..349607547cf 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -2,9 +2,7 @@
 
 #include "nestea_i.h"
 #include "tao/corba.h"
-#include "ace/FILE_Addr.h"
 #include "ace/FILE_Connector.h"
-#include "ace/FILE_IO.h"
 
 const size_t MAX_UINT32_STR_LEN = 11;  // Largest UINT32 is 8589934591 + NUL is 11 characters
 
@@ -113,17 +111,7 @@ int
 Nestea_i::save_data (void)
 {
   ACE_FILE_IO file;
-  ACE_FILE_Connector connector;
-
-  if (connector.connect (file,
-                         ACE_FILE_Addr (this->data_filename_),
-                         0,
-                         ACE_Addr::sap_any) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n to %s", 
-                       "connect", 
-                       this->data_filename_), 
-                      -1);
+  ACE_FILE_Addr filename (this->data_filename_);
 
   char str[MAX_UINT32_STR_LEN];
 
@@ -139,21 +127,11 @@ int
 Nestea_i::load_data (void)
 {
   ACE_FILE_IO file;
-  ACE_FILE_Connector connector;
-
-  if (connector.connect (file,
-                         ACE_FILE_Addr (this->data_filename_),
-                         0,
-                         ACE_Addr::sap_any) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "%p\n to %s", 
-                       "connect", 
-                       this->data_filename_), 
-                      -1);
+  ACE_FILE_Addr filename ("nestea.dat");
 
-  char str[MAX_UINT32_STR_LEN];
+  char str[12];
 
-  int len = file.recv (str, MAX_UINT32_STR_LEN);
+  int len = file.recv (str, ACE_OS::strlen (str) + 1);
   str[len] = 0;
 
   if (len > 0)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index f7660f13d30..753562725ee 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -232,16 +232,16 @@ Nestea_Server_i::run (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      status = this->orb_->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
-      status = -1;
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::run");
       ACE_RE_THROW;
     }
   ACE_ENDTRY;
+
   ACE_CHECK_RETURN (-1);
 
   return status;
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index fa884460a26..a10af6303a1 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -6,23 +6,29 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 ###############################################################################
-use lib "../../../../bin";
-use PerlACE::Run_Test;
 use Cwd;
 use Sys::Hostname;
 use File::Copy;
 
-$cwd = getcwd();
+BEGIN {
+    ### We need to BEGIN this block so we make sure ACE_ROOT is set before
+    ### we use it in the use lib line
+    $cwd = getcwd();
 
-$ACE_ROOT = $ENV{ACE_ROOT};
+    $ACE_ROOT = $ENV{ACE_ROOT};
 
-if (!defined $ACE_ROOT) {
-    chdir ('../../../../');
-    $ACE_ROOT = getcwd ();
-    chdir ($cwd);
-    print "ACE_ROOT not defined, defaulting to ACE_ROOT=$ACE_ROOT\n";
+    if (!$ACE_ROOT) {
+        chdir ('../../../../');
+        $ACE_ROOT = getcwd ();
+        chdir ($cwd);
+        print "ACE_ROOT not defined, defaulting to ACE_ROOT=$ACE_ROOT\n";
+    }
 }
 
+use lib "$ACE_ROOT/bin";
+
+use PerlACE::Run_Test;
+
 $airplane_ior = PerlACE::LocalFile ("airplane.ior");
 $nestea_ior = PerlACE::LocalFile ("nestea.ior");
 $implrepo_ior = PerlACE::LocalFile ("implrepo.ior");
@@ -30,12 +36,11 @@ $implrepo_ior = PerlACE::LocalFile ("implrepo.ior");
 $refstyle = " -ORBobjrefstyle URL";
 
 $backing_store = "imr_backing_store";
-$nestea_dat = "nestea.dat";
 
 $protocol = "iiop";
 $host = hostname();
 $port = 12345;
-$endpoint = "-ORBEndpoint " . "$protocol" . "://" . "$host" . ":" . $port;
+$endpoint = "-ORBEndpoint" . "$protocol" . "://" . "$host" . ":" . $port;
 
 
 $IMR = new PerlACE::Process ("../../ImplRepo_Service/ImplRepo_Service");
@@ -60,155 +65,81 @@ unlink $airplane_ior;
 unlink $nestea_ior;
 unlink $implrepo_ior;
 
+sub convert_slash($)
+{
+    $cmd = shift;
+
+    $cmd =~ s/\//\\/g;
+
+    return $cmd;
+}
+
 # The Tests
 
 ###############################################################################
 
 sub airplane_test
 {
-    my $status = 0;
-    
     $A_SVR->Arguments ("-o $airplane_ior $refstyle");
     $A_SVR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $airplane_ior\n";
-        $A_SVR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($airplane_ior);
 
-    my $client = $A_CLI->SpawnWaitKill (300);
-    
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
+    $A_CLI->SpawnWaitKill (300);
 
-    my $server = $A_SVR->TerminateWaitKill (5); 
-    
-    if ($server != 0) {
-        print STDERR "ERROR: server returned $server\n";
-        $status = 1;
-    }
-    
-    return $status;
+    $A_SVR->Kill (); $A_SVR->Wait ();
 }
 
 ###############################################################################
 
 sub nestea_test
 {
-    my $status = 0;
-    unlink $nestea_dat;
-    
     $N_SVR->Arguments ("-o $nestea_ior $refstyle");
     $N_SVR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($nestea_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $nestea_ior\n";
-        $N_SVR->Kill ();
-        return 1;
-    }
-    
-    my $client = $N_CLI->SpawnWaitKill (300);
+    PerlACE::waitforfile ($nestea_ior);
 
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
-    
-    $server = $N_SVR->TerminateWaitKill (5);
-    
-    if ($server != 0) {
-        print STDERR "ERROR: server returned $server\n";
-        $status = 1;
-    }
-    
-    unlink $nestea_dat;
-    return $status;
+    $N_CLI->SpawnWaitKill (300);
+
+    $N_SVR->Kill (); $N_SVR->Wait ();
 }
 
 ###############################################################################
-# @todo: This test doesn't clean up too well if something fails
 
 sub nt_service_test
 {
-    my $result = 0;
-    
-    my $BIN_IMR = new PerlACE::Process ("$ACE_ROOT/bin/ImplRepo_Service",
+    my $BIN_IMR = new PerlACE::Process (convert_slash ("$ACE_ROOT/bin/ImplRepo_Service"),
                                         "-c install");
     
     print "Copying ImplRepo_Service to bin\n";
     copy ($IMR->Executable (), $BIN_IMR->Executable ());
 
     print "Installing TAO Implementation Repository Service\n";
-    $result = $BIN_IMR->SpawnWaitKill (300);
-
-    if ($result != 0) {
-        print STDERR "ERROR: IMR installation returned $result\n";
-        return 1;
-    }
+    $BIN_IMR->SpawnWaitKill (300);
 
     print "Starting TAO Implementation Repository Service\n";
-    my $NET = new PerlACE::Process ("net", 
+    my $NET = new PerlACE::Process ($ENV{'SystemRoot'}."/System32/net", 
                                     "start \"TAO Implementation Repository\"");
-    $NET->IgnoreExeSubDir (1);                                    
-    
-    $result = $NET->SpawnWaitKill (300);
-    if ($result != 0) {
-        print STDERR "ERROR: net returned $result\n";
-        return 1;
-    }
+    $NET->SpawnWaitKill (300);
 
     $TAO_IMR->Arguments ("add airplane_server -c \""
                          . $A_SVR->Executable () .
                          " -ORBUseIMR 1\" -w \"$ACE_ROOT/bin\"");
-    
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        return 1;
-    }
+    $TAO_IMR->SpawnWaitKill (100);
 
     $A_SVR->Arguments ("-o $airplane_ior -ORBUseIMR 1");
     $A_SVR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $airplane_ior\n";
-        $A_SVR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($airplane_ior);
 
-    $result = $A_CLI->SpawnWaitKill (100);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: airplane client returned $result\n";
-        return 1;
-    }
+    $A_CLI->SpawnWaitKill (100);
 
     $TAO_IMR->Arguments ("shutdown airplane_server");
+    $TAO_IMR->SpawnWaitKill (100);
 
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        return 1;
-    }
-
-    $result = $A_CLI->SpawnWaitKill (100);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: airplane client returned $result\n";
-        return 1;
-    }
+    $A_CLI->SpawnWaitKill (100);
 
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        return 1;
-    }
+    $TAO_IMR->SpawnWaitKill (100);
 
     print "Stopping TAO Implementation Repository Service\n";
     $NET->Arguments ("stop \"TAO Implementation Repository\"");
@@ -219,260 +150,94 @@ sub nt_service_test
     $BIN_IMR->SpawnWaitKill (300);
 
     print "Removing ImplRepo_Service from bin\n";
-    unlink $BIN_IMR->Executable ();
-    
-    return 0;
+    unlink ($bin_implrepo_server);
 }
 
 ###############################################################################
 
 sub airplane_ir_test
 {
-    my $status = 0;
-    my $result = 0;
-    
     $IMR->Arguments ("-o $implrepo_ior");
     $IMR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($implrepo_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $implrepo_ior\n";
-        $IMR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($implrepo_ior);
 
     $TAO_IMR->Arguments ("add airplane_server -c \""
                          . $A_SVR->Executable () 
                          . " -ORBUseIMR 1 -o $airplane_ior\"");
-    
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        $IMR->Kill ();
-        return 1;
-    }
-
+    $TAO_IMR->SpawnWaitKill (300);
 
     $A_SVR->Arguments ("-ORBUseIMR 1 -o $airplane_ior");
     $A_SVR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $airplane_ior\n";
-        $IMR->Kill ();
-        $A_SVR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($airplane_ior);
 
     $TAO_IMR->Arguments ("shutdown airplane_server");
 
-    $result = $A_CLI->SpawnWaitKill (100);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: airplane_client 1 returned $result\n";
-        $status = 1;
-    }
-    
-    $result = $TAO_IMR->SpawnWaitKill (30);
-        
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr 1 returned $result\n";
-        $status = 1;
-    }
-
-    $result = $A_CLI->SpawnWaitKill (100);
-
-    if ($result != 0) {
-        print STDERR "ERROR: airplane_client 2 returned $result\n";
-        $status = 1;
-    }
-        
-    $result = $TAO_IMR->SpawnWaitKill (30);
-
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr 2 returned $result\n";
-        $status = 1;
-    }
-
-    my $server = $A_SVR->WaitKill (5);
-    
-    if ($server != 0) {
-        print STDERR "ERROR: airplane server returned $server\n";
-        $status = 1;
-    }
+    $A_CLI->SpawnWaitKill (100);
+    $TAO_IMR->SpawnWaitKill (100);
+    $A_CLI->SpawnWaitKill (100);
+    $TAO_IMR->SpawnWaitKill (100);
 
-    my $implrepo = $IMR->TerminateWaitKill (5);
-    
-    if ($implrepo != 0) {
-        print STDERR "ERROR: IMR returned $implrepo\n";
-        $status = 1;
-    }
-    
-    return $status;
+    $IMR->Kill (); $IMR->Wait ();
 }
 
 ###############################################################################
 
 sub nestea_ir_test
 {
-    unlink $nestea_dat;
-    my $status = 0;
-    my $result = 0;
-    
-    $IMR->Arguments ("-o $implrepo_ior");
+    $IMR->Arguments ("-o $implrepo_ior -d 0 $refstyle");
     $IMR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($implrepo_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $implrepo_ior\n";
-        $IMR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($implrepo_ior);
 
     $TAO_IMR->Arguments ("add nestea_server -c \""
                          . $N_SVR->Executable () 
                          . " -ORBUseIMR 1 -o $nestea_ior\"");
-    
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        $IMR->Kill ();
-        return 1;
-    }
-
+    $TAO_IMR->SpawnWaitKill (300);
 
     $N_SVR->Arguments ("-ORBUseIMR 1 -o $nestea_ior");
     $N_SVR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($nestea_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $nestea_ior\n";
-        $IMR->Kill ();
-        $N_SVR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($nestea_ior);
 
     $TAO_IMR->Arguments ("shutdown nestea_server");
 
-    $result = $N_CLI->SpawnWaitKill (100);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: nestea client 1 returned $result\n";
-        $status = 1;
-    }
-    
-    $result = $TAO_IMR->SpawnWaitKill (30);
-        
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr 1 returned $result\n";
-        $status = 1;
-    }
-
-    $result = $N_CLI->SpawnWaitKill (100);
-
-    if ($result != 0) {
-        print STDERR "ERROR: nestea client 2 returned $result\n";
-        $status = 1;
-    }
-        
-    $result = $TAO_IMR->SpawnWaitKill (30);
+    $N_CLI->SpawnWaitKill (100);
+    $TAO_IMR->SpawnWaitKill (100);
+    $N_CLI->SpawnWaitKill (100);
+    $TAO_IMR->SpawnWaitKill (100);
 
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr 2 returned $result\n";
-        $status = 1;
-    }
-
-    my $server = $N_SVR->WaitKill (5);
-    
-    if ($server != 0) {
-        print STDERR "ERROR: nestea server returned $server\n";
-        $status = 1;
-    }
-
-    my $implrepo = $IMR->TerminateWaitKill (5);
-    
-    if ($implrepo != 0) {
-        print STDERR "ERROR: IMR returned $implrepo\n";
-        $status = 1;
-    }
-
-    unlink $nestea_dat;    
-    return $status;
+    $IMR->Kill (); $IMR->Wait ();
 }
 
 ###############################################################################
 
 sub persistent_ir_test
 {
-    my $status = 0;
-    my $result = 0;
     unlink $backing_store;
  
     $IMR->Arguments ("$endpoint -o $implrepo_ior -p $backing_store -d 0");
     $IMR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($implrepo_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $implrepo_ior\n";
-        $IMR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($implrepo_ior);
 
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior add airplane_server -c \"".$A_SVR->Executable ()." -ORBUseIMR 1 $refstyle -ORBInitRef ImplRepoService=file://$implrepo_ior\"");
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        $IMR->Kill ();
-        return 1;
-    }
+    $TAO_IMR->SpawnWaitKill (100);
 
     $A_SVR->Arguments ("-o $airplane_ior -ORBUseIMR 1 $refstyle -ORBInitRef ImplRepoService=file://$implrepo_ior");
     $A_SVR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $airplane_ior\n";
-        $IMR->Kill ();
-        $A_SVR->Kill ();
-        return 1;
-    }
-
+    PerlACE::waitforfile ($airplane_ior);
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior shutdown airplane_server");
-    
-    $result = $A_CLI->SpawnWaitKill (100);
-
-    if ($result != 0) {
-        print STDERR "ERROR: airplane client returned $result\n";
-        $status = 1;
-    }
-
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        $status = 1;
-    }
-
-    $result = $A_CLI->SpawnWaitKill (100);
 
-    if ($result != 0) {
-        print STDERR "ERROR: airplane client returned $result\n";
-        $status = 1;
-    }
-
-    $result = $TAO_IMR->SpawnWaitKill (30);
-    
-    if ($result != 0) {
-        print STDERR "ERROR: tao_imr returned $result\n";
-        $status = 1;
-    }
-
-    $result = $A_SVR->WaitKill (10);
-
-    if ($result != 0) {
-        print STDERR "ERROR: airplane server returned $result\n";
-        $status = 1;
-    }
+    $A_CLI->SpawnWaitKill (100);
+    $TAO_IMR->SpawnWaitKill (100);
+    $A_CLI->SpawnWaitKill (100);
+    $TAO_IMR->SpawnWaitKill (100);
 
     print "\nShutting down Implementation Repository\n\n";
-    $IMR->Kill (); 
+    $IMR->Kill (); $IMR->Wait ();
 
     print "Restarting Implementation Repository.\n";
     $IMR->Arguments ("$endpoint -p $backing_store -d 0");
@@ -481,9 +246,9 @@ sub persistent_ir_test
     PerlACE::waitforfile ($implrepo_ior);
     
     $A_CLI->SpawnWaitKill (100);
-    $TAO_IMR->SpawnWaitKill (30);
+    $TAO_IMR->SpawnWaitKill (100);
 
-    $IMR->Kill (); 
+    $IMR->Kill (); $IMR->Wait ();
 
     unlink $backing_store;
 }
@@ -492,20 +257,15 @@ sub persistent_ir_test
 
 sub both_ir_test
 {
-    my $status = 0;
     $IMR->Arguments ("-o $implrepo_ior -d 0 $refstyle");
     $IMR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($implrepo_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $implrepo_ior\n";
-        $IMR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($implrepo_ior);
 
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior add airplane_server -c \""
                           . $A_SVR->Executable ()
                           . " -ORBUseIMR 1 $refstyle -ORBInitRef ImplRepoService=file://$implrepo_ior\"");
-    $TAO_IMR->SpawnWaitKill (30);
+    $TAO_IMR->SpawnWaitKill (100);
 
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior"
                          . " add nestea_server"
@@ -513,7 +273,7 @@ sub both_ir_test
                            . " -ORBUseIMR 1"
                            . " $refstyle -ORBInitRef"
                            . " ImplRepoService=file://$implrepo_ior\"");
-    $TAO_IMR->SpawnWaitKill (30);
+    $TAO_IMR->SpawnWaitKill (100);
 
     $N_SVR->Arguments ("-o $nestea_ior -ORBUseIMR 1 $refstyle -ORBInitRef ImplRepoService=file://$implrepo_ior");
     $N_SVR->Spawn ();
@@ -521,21 +281,8 @@ sub both_ir_test
     $A_SVR->Arguments ("-o $airplane_ior -ORBUseIMR 1 $refstyle -ORBInitRef ImplRepoService=file://$implrepo_ior");
     $A_SVR->Spawn ();
 
-    if (PerlACE::waitforfile_timed ($airplane_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $airplane_ior\n";
-        $IMR->Kill ();
-        $A_SVR->Kill ();
-        $N_SVR->Kill ();
-        return 1;
-    }
-
-    if (PerlACE::waitforfile_timed ($nestea_ior, 10) == -1) {
-        print STDERR "ERROR: cannot find $nestea_ior\n";
-        $IMR->Kill ();
-        $A_SVR->Kill ();
-        $N_SVR->Kill ();
-        return 1;
-    }
+    PerlACE::waitforfile ($nestea_ior);
+    PerlACE::waitforfile ($airplane_ior);
 
     $N_CLI->Spawn ();
     $A_CLI->Spawn ();
@@ -544,24 +291,24 @@ sub both_ir_test
     $A_CLI->WaitKill (100);
 
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior shutdown nestea_server");
-    $TAO_IMR->SpawnWaitKill (30);
+    $TAO_IMR->SpawnWaitKill (100);
 
     $N_CLI->Spawn (100);
     
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior shutdown airplane_server");
-    $TAO_IMR->SpawnWaitKill (30);
+    $TAO_IMR->SpawnWaitKill (100);
 
     $A_CLI->SpawnWaitKill (100);
     $N_CLI->WaitKill (100);
 
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior shutdown nestea_server");
-    $TAO_IMR->SpawnWaitKill (30);
+    $TAO_IMR->SpawnWaitKill (100);
     $TAO_IMR->Arguments ("-ORBInitRef ImplRepoService=file://$implrepo_ior shutdown airplane_server");
-    $TAO_IMR->SpawnWaitKill (30);
+    $TAO_IMR->SpawnWaitKill (100);
 
-    $A_SVR->Kill (); 
-    $N_SVR->Kill (); 
-    $IMR->Kill (); 
+    $A_SVR->Kill (); $A_SVR->Wait ();
+    $N_SVR->Kill (); $N_SVR->Wait ();
+    $IMR->Kill (); $IMR->Wait ();
 }
 
 ###############################################################################
@@ -569,42 +316,58 @@ sub both_ir_test
 
 # Parse the arguments
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "run_test test\n";
-        print "\n";
-        print "test               -- Runs a specific test:\n";
-        print "                         airplane, airplane_ir, nt_service, ",
-                                       "nestea, nestea_ir,\n";
-        print "                         both_ir, persistent_ir\n";
-        exit;
-    }
-    elsif ($ARGV[$i] eq "airplane") {
-        exit airplane_test ();
-    }
-    elsif ($ARGV[$i] eq "airplane_ir") {
-        exit airplane_ir_test ();
-    }
-    elsif ($ARGV[$i] eq "nt_service") {
-        exit nt_service_test ();
-    }
-    elsif ($ARGV[$i] eq "nestea") {
-        exit nestea_test ();
-    }
-    elsif ($ARGV[$i] eq "nestea_ir") {
-        exit nestea_ir_test ();
-    }
-    elsif ($ARGV[$i] eq "both_ir") {
-        exit both_ir_test ();
-    }
-    elsif ($ARGV[$i] eq "persistent_ir") {
-        exit persistent_ir_test ();
-    }
-    else {
-        print "run_test: Unknown Option: ".$ARGV[$i]."\n";
-    }
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+      print "run_test [-chorus <target>] test\n";
+      print "\n";
+      print "-chorus <target>   -- Runs the test on Chorus target\n";
+      print "test               -- Runs a specific test:\n";
+      print "                         airplane, airplane_ir, nt_service, ",
+                                      "nestea, nestea_ir,\n";
+      print "                         both_ir, persistent_ir\n";
+      exit;
+    }
+    if ($ARGV[$i] eq "airplane")
+    {
+      airplane_test ();
+      exit;
+    }
+    if ($ARGV[$i] eq "airplane_ir")
+    {
+      airplane_ir_test ();
+      exit;
+    }
+    if ($ARGV[$i] eq "nt_service")
+    {
+      nt_service_test ();
+      exit;
+    }
+    if ($ARGV[$i] eq "nestea")
+    {
+      nestea_test ();
+      exit;
+    }
+    if ($ARGV[$i] eq "nestea_ir")
+    {
+      nestea_ir_test ();
+      exit;
+    }
+    if ($ARGV[$i] eq "both_ir")
+    {
+      both_ir_test ();
+      exit;
+    }
+    if ($ARGV[$i] eq "persistent_ir")
+    {
+      persistent_ir_test ();
+      exit;
+    }
+    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
+  }
 }
 
-# if nothing else, run both_ir
-
-exit both_ir_test ();
+both_ir_test ();
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
index 78da7eee3b2..69c35f0f832 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/run_test.pl
@@ -6,87 +6,94 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../../bin";
-use PerlACE::Run_Test;
 
-$status = 0;
+require ACEutils;
+use Cwd;
 
-$ifr_iorfile= "if_repo.ior";
-$svr_iorfile = "iorfile";
-$test_idl = PerlACE::LocalFile ("test.idl");
+BEGIN {
+    ### We need to BEGIN this block so we make sure ACE_ROOT is set before
+    ### we use it in the use lib line
+    $cwd = getcwd();
 
-if ($^O eq "MSWin32") {
-    $tao_ifr = "../../../../../bin/tao_ifr";
-}
-else {
-    $tao_ifr = "../../../IFR_Service/tao_ifr";
+    $ACE_ROOT = $ENV{ACE_ROOT};
+
+    if (!$ACE_ROOT) {
+        chdir ('../../../../');
+        $ACE_ROOT = getcwd ();
+        chdir ($cwd);
+        print "ACE_ROOT not defined, defaulting to ACE_ROOT=$ACE_ROOT\n";
+    }
 }
 
-$TAO_IFR = new PerlACE::Process ($tao_ifr);
-$IFR     = new PerlACE::Process ("../../../IFR_Service/IFR_Service");
-$SV      = new PerlACE::Process ("server");
-$CL      = new PerlACE::Process ("client", "-ORBInitRef InterfaceRepository=file://$ifr_iorfile");
+use lib "$ACE_ROOT/bin";
 
-unlink $ifr_iorfile;
-unlink $svr_iorfile;
+ACE::checkForTarget($cwd);
 
-$IFR->Spawn ();
+$if_repo_service = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.
+		   "..".$DIR_SEPARATOR."IFR_Service".$DIR_SEPARATOR.
+		   "IFR_Service".$EXE_EXT;
 
-if (PerlACE::waitforfile_timed ($ifr_iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$ifr_iorfile>\n";
-    $IFR->Kill (); 
-    exit 1;
-}
 
-$SV->Spawn ();
+$init_ref = 
+  "-ORBInitRef InterfaceRepository=file://if_repo.ior";
 
-if (PerlACE::waitforfile_timed ($svr_iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$svr_iorfile>\n";
-    $IFR->Kill ();
-    $SV->Kill (); 
-    exit 1;
+if ($^O eq "MSWin32") {
+    ### It is in the path
+    $tao_ifr = "tao_ifr".$EXE_EXT;
+}
+else {
+    $tao_ifr = "$ACE_ROOT/TAO/orbsvcs/IFR_Service/tao_ifr".$EXE_EXT;
 }
 
-$TAO_IFR->Arguments ($test_idl);
-
-$tresult = $TAO_IFR->SpawnWaitKill (30);
+$ifr_iorfile = "$cwd$DIR_SEPARATOR" . "if_repo.ior";
+$svr_iorfile = "$cwd$DIR_SEPARATOR" . "iorfile";
 
-if ($tresult != 0) {
-    print STDERR "ERROR: tao_ifr (test.idl) returned $tresult\n";
-    $status = 1;
-}
+unlink $ifr_iorfile;
+unlink $svr_iorfile;
 
-$client = $CL->SpawnWaitKill (60);
+$IFR = Process::Create ($if_repo_service);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if (ACE::waitforfile_timed ($ifr_iorfile, 15) == -1) 
+{
+  print STDERR "ERROR: cannot find file <$ifr_iorfile>\n";
+  $IFR->Kill (); 
+  $IFR->TimedWait (1);
+  exit 1;
 }
 
-$server = $SV->TerminateWaitKill (5);
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT);
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if (ACE::waitforfile_timed ($svr_iorfile, 15) == -1) 
+{
+  print STDERR "ERROR: cannot find file <$svr_iorfile>\n";
+  $SV->Kill (); 
+  $SV->TimedWait (1);
+  exit 1;
 }
 
-$TAO_IFR->Arguments ("-r $test_idl");
+system ($tao_ifr." test.idl");
 
-$tresult = $TAO_IFR->SpawnWaitKill (30);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       " $init_ref");
 
-if ($tresult != 0) {
-    print STDERR "ERROR: tao_ifr (-r test.idl) returned $tresult\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) 
+{
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); 
+  $CL->TimedWait (1);
 }
 
-$server = $IFR->TerminateWaitKill (5);
+$SV->Kill (); 
+$SV->TimedWait (1);
 
-if ($server != 0) {
-    print STDERR "ERROR: IFR returned $server\n";
-    $status = 1;
-}
+system ($tao_ifr." -r test.idl");
+
+$IFR->Kill (); 
+$IFR->TimedWait (1);
 
 unlink $ifr_iorfile;
 unlink $svr_iorfile;
 
-exit $status;
+exit 0;
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 30297fcc6c6..915e3c77336 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -14,7 +14,7 @@ write_ior_to_file (const char *ior)
 
   if (output_file == 0)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_ERROR, 
                          "Cannot open output files for writing IOR: %s\n",
                          ior_output_file),
                         -1);
@@ -42,9 +42,9 @@ main (int argc, char *argv[])
 {
 	ACE_TRY_NEW_ENV
 	  {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            "",
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
+                                            argv, 
+                                            "", 
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
         orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
+        PortableServer::POA::_narrow (poa_object.in (), 
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -65,12 +65,12 @@ main (int argc, char *argv[])
 
       inventory_i servant_impl;
 
-      warehouse::inventory_var servant =
+      warehouse::inventory_var servant = 
         servant_impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (servant.in (),
+        orb->object_to_string (servant.in (), 
                                ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
@@ -78,9 +78,9 @@ main (int argc, char *argv[])
 
       if (write_result != 0)
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%p\n",
-                             "write_ior_to_file"),
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             "%p\n", 
+                             "write_ior_to_file"), 
                             -1);
         }
 
@@ -88,8 +88,13 @@ main (int argc, char *argv[])
                   "IOR is: <%s>\n",
                   ior.in ()));
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR, 
+                             "%p\n", 
+                             "CORBA::ORB::run"), 
+                            -1);
+        }
 
       root_poa->destroy (1,
                          1,
@@ -106,3 +111,4 @@ main (int argc, char *argv[])
 
   return 0;
 }
+
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
index 03b00dcb3fb..bf81ece0806 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
@@ -6,66 +6,82 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../../bin";
-use PerlACE::Run_Test;
+
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 $locking = "-m";
 
-$iorfile = "if_repo.ior";
+$if_repo_server = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.
+		  "..".$DIR_SEPARATOR."IFR_Service".$DIR_SEPARATOR.
+		  "IFR_Service".$EXE_EXT, " $locking";
+
+
+$init_ref = 
+  "-ORBInitRef InterfaceRepository=file://if_repo.ior";
 
-$status = 0;
+$iorfile = "$cwd$DIR_SEPARATOR" . "if_repo.ior";
 
 $debug = "";
 $test = "";
 $iterations = "";
 $other = "";
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-d") {
-        $debug = "-d";
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-d")
+    {
+      $debug = "-d";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-t") {
-        $test = "-t ".$ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-t")
+    {
+      $test = "-t ".$ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = "-i ".$ARGV[$i + 1];
-        $i++;
-    }
-    else {
-        $other .= $ARGV[$i];
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = "-i ".$ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+    $other .= $ARGV[$i];
+  }
 }
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " $locking");
-$CL = new PerlACE::Process ("IFR_Test", 
-                            "-ORBInitRef InterfaceRepository=file://$iorfile"
-                            . " $debug $test $iterations");
-
-$SV->Spawn ();
+$SV = Process::Create ($if_repo_server);
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) 
+{
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); 
+  $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."IFR_Test".$EXE_EXT,
+                       " $init_ref $debug $test $iterations");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) 
+{
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); 
+  $CL->TimedWait (1);
 }
 
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+$SV->Kill (); 
+$SV->TimedWait (1);
 
 unlink $iorfile;
 
-exit $status;
+exit 0;
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
index f6f3fd38b8f..3d569d52833 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/run_test.pl
@@ -6,92 +6,103 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../../bin";
-use PerlACE::Run_Test;
+
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 $persistent = "-p";
 
-$status = 0;
+$ifr_service = $EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.
+               "..".$DIR_SEPARATOR."IFR_Service".$DIR_SEPARATOR.
+	       "IFR_Service".$EXE_EXT, " $persistent";
 
-$iorfile = "if_repo.ior";
-$backing_file = PerlACE::LocalFile ("ifr_default_backing_store");
+$init_ref = 
+  "-ORBInitRef InterfaceRepository=file://if_repo.ior";
 
-$init_ref = "-ORBInitRef InterfaceRepository=file://$iorfile";
+$iorfile = "$cwd$DIR_SEPARATOR" . "if_repo.ior";
+$backing_file = "$cwd$DIR_SEPARATOR" . "ifr_default_backing_store";
 
 $debug = "";
 $query_opt = "-q";
 $other = "";
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-d") {
-        $debug = "-d";
-    }
-    else {
-        $other .= $ARGV[$i];
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-d")
+    {
+      $debug = "-d";
+      last SWITCH;
     }
+    $other .= $ARGV[$i];
+  }
 }
 
 unlink $iorfile;
 unlink $backing_file;
 
-print STDERR "\t IFR Persistence Test\n\n";
-
-$IFR = new PerlACE::Process ("../../../IFR_Service/IFR_Service", $persistent);
-$T   = new PerlACE::Process ("Persistence_Test");
+print "\t IFR Persistence Test\n\n";
 
-$IFR->Spawn ();
+$NEW_IFR = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.
+               "..".$DIR_SEPARATOR."IFR_Service".$DIR_SEPARATOR.
+	       "IFR_Service".$EXE_EXT, " $persistent");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $IFR->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) 
+{
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $NEW_IFR->Kill (); 
+  $NEW_IFR->TimedWait (1);
+  exit 1;
 }
 
-$T->Arguments ($init_ref);
+$POPULATE = Process::Create ($EXEPREFIX."Persistence_Test".$EXE_EXT,
+                             " $init_ref");
 
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: populate test returned $test\n";
-    $status = 1;
+$populate = $POPULATE->TimedWait (60);
+if ($populate == -1) 
+{
+  print STDERR "ERROR: populate timedout\n";
+  $POPULATE->Kill (); 
+  $POPULATE->TimedWait (1);
 }
 
-$server = $IFR->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: IFR returned $server\n";
-    $status = 1;
-}
+$NEW_IFR->Kill (); 
+$NEW_IFR->TimedWait (1);
 
 unlink $iorfile;
 
-$IFR->Spawn ();
+$FILE_IFR = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR."..".$DIR_SEPARATOR.
+               "..".$DIR_SEPARATOR."IFR_Service".$DIR_SEPARATOR.
+	       "IFR_Service".$EXE_EXT, " $persistent");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $IFR->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) 
+{
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $FILE_IFR->Kill (); 
+  $FILE_IFR->TimedWait (1);
+  exit 1;
 }
 
-$T->Arguments ("$init_ref $debug $query_opt");
+$QUERY = Process::Create ($EXEPREFIX."Persistence_Test".$EXE_EXT,
+                          " $init_ref $debug $query_opt");
 
-
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: query test returned $test\n";
-    $status = 1;
+$query = $QUERY->TimedWait (60);
+if ($query == -1) 
+{
+  print STDERR "ERROR: query timedout\n";
+  $QUERY->Kill (); 
+  $QUERY->TimedWait (1);
 }
 
+$FILE_IFR->Kill (); 
+$FILE_IFR->TimedWait (1);
 
-$server = $IFR->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: IFR returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-unlink $backing_file;
+#unlink $iorfile;
+#unlink $backing_file;
 
-exit $status;
+exit 0;
 
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index 7e20da7c786..20e475fa914 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -22,7 +22,6 @@
 
 int main (int argc, char *argv [])
 {
-  int result = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -32,16 +31,18 @@ int main (int argc, char *argv [])
 
       if (client.init (argc, argv) == -1)
         return 1;
-
-      result = client.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      else
+        {
+          return client.run (ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client");
-      return 1;
+      ACE_RE_THROW;
     }
   ACE_ENDTRY;
 
-  return result;
+  return 0;
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp b/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp
index 788203c5f3f..235c71addd6 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
index 12b26792aa8..0e33c0d7dc5 100755
--- a/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/run_test.pl
@@ -8,8 +8,12 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a perl script that runs the NamingContextExt test. It starts 
 # the Naming service, server and the client as necessary
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd ();
 
 # Amount of delay (in seconds) between starting a server and a client 
 # to allow proper server initialization.
@@ -17,38 +21,58 @@ $sleeptime = 8;
 
 # Variables for command-line arguments to client and server
 # executables
-$iorfile = PerlACE::LocalFile ("ns.ior");
+$iorfile = "$cwd$DIR_SEPARATOR" . "ns.ior";
 
-# Run the server and client for the test. 
+ACE::checkForTarget($cwd);
 
-$NS = new PerlACE::Process ("../../Naming_Service/Naming_Service", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-s -ORBInitRef NameService=file://$iorfile");
+sub name_server
+  {
+    my $args = "@_"." -o $iorfile";
+    my $prog = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR..$DIR_SEPARATOR".
+      "orbsvcs".$DIR_SEPARATOR.
+	"Naming_Service".$DIR_SEPARATOR.
+	  "Naming_Service".$EXE_EXT;
 
-# Make sure the files are gone, so we can wait on them.
-unlink $iorfile;
+    # Make sure the files are gone, so we can wait on them.
+    unlink $iorfile;
 
-$NS->Spawn ();
+    $NS = Process::Create ($prog, $args);
 
-if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-    print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-    $NS->Kill ();
-    exit 1;
-}
-   
-$client = $CL->SpawnWaitKill (60);
+    if (ACE::waitforfile_timed ($iorfile, $sleeptime) == -1) 
+      {
+	print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
+	$NS->Kill (); $NS->TimedWait (1);
+	exit 1;
+      }
+  }
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
+sub client
+  {
+    my $args = "@_"." ";
+    my $prog = $EXEPREFIX."client".$EXE_EXT;
+    
+    $CL = Process::Create ($prog, $args);
+    
+    $client = $CL->TimedWait (60);
+    if ($client == -1) {
+      print STDERR "ERROR: client timedout\n";
+      $CL->Kill (); $CL->TimedWait (1);
+    }
+  }
 
-$nserver = $NS->TerminateWaitKill (5);
+# Options for all the tests recognized by the 'client' program
+$opts = "-s -ORBInitRef NameService=file://$iorfile";  
 
-if ($nserver != 0) {
-    print STDERR "ERROR: server returned $nserver\n";
-    $status = 1;
-}
+# Run the server and client for the test. 
+#
+name_server ();
+client ($opts);
 
-unlink $iorfile;
+$NS->Terminate (); $server = $NS->TimedWait (5);
+if ($server == -1) 
+  {
+    print STDERR "ERROR: server timedout\n";
+    $NS->Kill (); $NS->TimedWait (1);
+  }
 
-exit $status;
+exit 0;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/client.dsp b/TAO/orbsvcs/tests/LoadBalancing/client.dsp
index dd4d5cf6317..75b0af27416 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/client.dsp
+++ b/TAO/orbsvcs/tests/LoadBalancing/client.dsp
@@ -137,8 +137,6 @@ SOURCE=.\Hash_Replica.idl
 

 !IF  "$(CFG)" == "LoadBalancing client - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

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

 # Begin Custom Build

 InputPath=.\Hash_Replica.idl

 InputName=Hash_Replica

@@ -176,8 +174,6 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "LoadBalancing client - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

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

 # Begin Custom Build

 InputPath=.\Hash_Replica.idl

 InputName=Hash_Replica

diff --git a/TAO/orbsvcs/tests/LoadBalancing/server.dsp b/TAO/orbsvcs/tests/LoadBalancing/server.dsp
index e1362427374..61a148ff01e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/server.dsp
+++ b/TAO/orbsvcs/tests/LoadBalancing/server.dsp
@@ -137,8 +137,6 @@ SOURCE=.\Hash_Replica.idl
 

 !IF  "$(CFG)" == "LoadBalancing server - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

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

 # Begin Custom Build

 InputPath=.\Hash_Replica.idl

 InputName=Hash_Replica

@@ -176,8 +174,6 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "LoadBalancing server - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

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

 # Begin Custom Build

 InputPath=.\Hash_Replica.idl

 InputName=Hash_Replica

diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
index 5319c594073..6cb56866e1a 100644
--- a/TAO/orbsvcs/tests/Makefile
+++ b/TAO/orbsvcs/tests/Makefile
@@ -46,11 +46,7 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU
 
 ifeq ($(minimum_corba),0)
   ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    ifneq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION)))
-      ifeq ($(LYNXTARGET),)
-        DIRS += InterfaceRepo
-      endif # LYNXTARGET
-    endif # findstring Compilers 4.2
+    DIRS += InterfaceRepo
   endif # ACE_HAS_GNUG_PRE_2_8
 endif # minimum_corba
 
diff --git a/TAO/orbsvcs/tests/Makefile.bor b/TAO/orbsvcs/tests/Makefile.bor
deleted file mode 100644
index 77dc8b46f5a..00000000000
--- a/TAO/orbsvcs/tests/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#
-# Makefile for building the TAO obsvcs examples
-#
-
-DIRS = \
-        FaultTolerance \
-        Simple_Naming
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp
deleted file mode 100644
index 78e1e097b09..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties_Test.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="AdminProperties_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=AdminProperties_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 "AdminProperties_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 "AdminProperties_Test.mak" CFG="AdminProperties_Test - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "AdminProperties_Test - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "AdminProperties_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /incremental:yes /map

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "AdminProperties_Test___Win32_Debug"

-# PROP BASE Intermediate_Dir "AdminProperties_Test___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_NotifyTestsd.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /map:"Debug/Subscribe.map" /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "AdminProperties_Test - Win32 Release"

-# Name "AdminProperties_Test - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\AdminProperties_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.dsw b/TAO/orbsvcs/tests/Notify/Basic/Basic.dsw
deleted file mode 100644
index d0aca349856..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.dsw
+++ /dev/null
@@ -1,101 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "AdminProperties_Test"=.\AdminProperties_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ConnectDisconnect"=.\ConnectDisconnect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Events_Test"=.\Events_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "IdAssignment"=.\IdAssignment.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "LifeCycleTest"=.\LifeCycleTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Simple"=.\Simple.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Updates"=.\Updates.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp
deleted file mode 100644
index a19d0986ec6..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ConnectDisconnect" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=ConnectDisconnect - 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 "ConnectDisconnect.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 "ConnectDisconnect.mak" CFG="ConnectDisconnect - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ConnectDisconnect - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "ConnectDisconnect - 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)" == "ConnectDisconnect - 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 "..\..\..\..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib TAO_CosEvent.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /machine:IX86 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /incremental:yes /map

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "ConnectDisconnect___Win32_Debug"

-# PROP BASE Intermediate_Dir "ConnectDisconnect___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_NotifyTestsd.lib TAO_CosEventd.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /map:"Debug/Subscribe.map" /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ConnectDisconnect - Win32 Release"

-# Name "ConnectDisconnect - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\ConnectDisconnect.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.dsp b/TAO/orbsvcs/tests/Notify/Basic/Events_Test.dsp
deleted file mode 100644
index c1dd6acc301..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/Events_Test.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Events_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Events_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 "Events_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 "Events_Test.mak" CFG="Events_Test - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Events_Test - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Events_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /incremental:yes /map /debug

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Events_Test___Win32_Debug"

-# PROP BASE Intermediate_Dir "Events_Test___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_NotifyTestsd.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /map:"Debug/Subscribe.map" /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Events_Test - Win32 Release"

-# Name "Events_Test - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Events_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.dsp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.dsp
deleted file mode 100644
index 2d70295f3f4..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="IdAssignment" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=IdAssignment - 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 "IdAssignment.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 "IdAssignment.mak" CFG="IdAssignment - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "IdAssignment - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IdAssignment - 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)" == "IdAssignment - 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 /Gm /GX /Zi /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /incremental:yes /map /debug

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "IdAssignment___Win32_Debug"

-# PROP BASE Intermediate_Dir "IdAssignment___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_NotifyTestsd.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /map:"Debug/Subscribe.map" /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "IdAssignment - Win32 Release"

-# Name "IdAssignment - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\IdAssignment.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.dsp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.dsp
deleted file mode 100644
index cd0d30f8649..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycleTest.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="LifeCycleTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=LifeCycleTest - 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 "LifeCycleTest.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 "LifeCycleTest.mak" CFG="LifeCycleTest - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "LifeCycleTest - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "LifeCycleTest - 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)" == "LifeCycleTest - 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 "..\..\..\..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /incremental:yes /map /debug

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "LifeCycleTest___Win32_Debug"

-# PROP BASE Intermediate_Dir "LifeCycleTest___Win32_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 "..\lib" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_NotifyTestsd.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /map:"Debug/Subscribe.map" /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "LifeCycleTest - Win32 Release"

-# Name "LifeCycleTest - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\LifeCycleTest.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.dsp b/TAO/orbsvcs/tests/Notify/Basic/Simple.dsp
deleted file mode 100644
index 2ec52c06049..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.dsp
+++ /dev/null
@@ -1,105 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Simple" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Simple - 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 "Simple.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 "Simple.mak" CFG="Simple - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Simple - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Simple - 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)" == "Simple - 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 "..\..\..\..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib TAO_CosEvent.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /incremental:yes /map /debug

-

-!ELSEIF  "$(CFG)" == "Simple - 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 "..\lib" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_NotifyTestsd.lib TAO_CosEventd.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /map:"Debug/Subscribe.map" /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Simple - Win32 Release"

-# Name "Simple - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Simple.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.dsp b/TAO/orbsvcs/tests/Notify/Basic/Updates.dsp
deleted file mode 100644
index 6ef9418d2c5..00000000000
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Updates" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Updates - 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 "Updates.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 "Updates.mak" CFG="Updates - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Updates - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Updates - 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)" == "Updates - 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 /Gm /GX /Zi /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib TAO_CosEvent.lib ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_NotifyTests.lib /nologo /subsystem:console /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /incremental:yes /map /debug

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Updates___Win32_Debug"

-# PROP BASE Intermediate_Dir "Updates___Win32_Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_NotifyTestsd.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Updates - Win32 Release"

-# Name "Updates - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Updates.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw b/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
deleted file mode 100644
index b4c3e3a1413..00000000000
--- a/TAO/orbsvcs/tests/Notify/Notify_Tests.dsw
+++ /dev/null
@@ -1,161 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "AdminProperties_Test"=.\Basic\AdminProperties_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ConnectDisconnect"=.\Basic\ConnectDisconnect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Events_Test"=.\BASIC\Events_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "IdAssignment"=.\BASIC\IdAssignment.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "LifeCycleTest"=.\BASIC\LifeCycleTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "RedGreen"=".\PERFORMANCE-TESTS\REDGREEN\RedGreen.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Simple"=.\BASIC\Simple.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "TAO_NotifyTests"=.\lib\TAO_NotifyTests.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Throughput"=".\PERFORMANCE-TESTS\THROUGHPUT\Throughput.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Updates"=.\Basic\Updates.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name TAO_NotifyTests

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 4efcf103d49..21a1ddfa879 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -19,9 +19,8 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
-#include "notify_test_export.h"
 
-class TAO_NOTIFY_TEST_Export Notify_Test_Client
+class Notify_Test_Client
 {
   // = TITLE
   //   Notify_Test_Client
diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
deleted file mode 100644
index e7762e81221..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsp
+++ /dev/null
@@ -1,133 +0,0 @@
-# Microsoft Developer Studio Project File - Name="TAO_NotifyTests DLL" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=TAO_NotifyTests DLL - Win32 Debug

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

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "TAO_NotifyTests.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 "TAO_NotifyTests.mak" CFG="TAO_NotifyTests DLL - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "TAO_NotifyTests DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "TAO_NotifyTests DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "TAO_NotifyTests DLL - 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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../../../" /I "../../../../../" /D "WIN32" /D "_WINDOWS" /D "TAO_NOTIFY_TEST_BUILD_DLL" /FD /c

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

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /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 /dll /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_CosEvent.lib /nologo /dll /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTests.dll" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none /incremental:yes /debug

-

-!ELSEIF  "$(CFG)" == "TAO_NotifyTests DLL - 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" /D "_MBCS" /D "_USRDLL" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../../../" /I "../../../../../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_NOTIFY_TEST_BUILD_DLL" /FD /c

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

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_CosEventd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\..\bin\TAO_NotifyTestsd.dll" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "TAO_NotifyTests DLL - Win32 Release"

-# Name "TAO_NotifyTests DLL - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Notify_PushConsumer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notify_PushSupplier.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notify_SequencePushConsumer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notify_SequencePushSupplier.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notify_StructuredPushConsumer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notify_StructuredPushSupplier.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notify_Test_Client.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsw b/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.dsw
deleted file mode 100644
index dc065aaa13e..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/TAO_NotifyTests.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: "TAO_NotifyTests"=.\TAO_NotifyTests.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README
index 88b6a01e03c..a67a4a6dd9e 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/README
@@ -18,7 +18,7 @@ a ""GREEN" event in a burst of RED and GREEN events alternatively.
 
 The subscriptions are specified in such a manner that the "slow"
 consumer only receives RED events while the "normal" consumer receives
-the "GREEN" events,
+the "GREEN" events, 
 
 We use a TP reactor with 4 worker threads to allow upcalls to the
 normal consumers servant proceed without having to wait for the slow
@@ -28,14 +28,14 @@ First Run the Notify Service in the reactive mode.
 Each participant in this (supplier and both consumers) are coupled
 together because all calls are sychronous. The 1 sec wait should affect
 throughput of all 3.
-
+ 
 Next use 2 Lookup thread and check performance. The throughput
 values should increase for the supplier and normal consumer but same
 for the slow consumer.
 
 Lastly, deploy a thread each at each  proxy supplier. The Throughput
 of the normal consumer should increase dramatically.
-This is because its data path is completely decoupled from the "slow consumer".
+This is because its data path is completely decoupled from the "slow consumer". 
 
 COMMAND LINE OPTIONS:
 --------------------
@@ -48,18 +48,22 @@ Test 1
 ------
 
 run $TAO_ROOT/orbsvcs/Notify_Service/Notify_Service -ORBsvcconf reactive.conf
-run RedGreen_Test
+run RedGreen_Test 
 
 
 Test 2
 ------
 
-run $TAO_ROOT/orbsvcs/Notify_Service/Notify_Service -Notify_TPReactor 2 -ORBsvcconf lookup.conf
-run RedGreen_Test
+run $TAO_ROOT/orbsvcs/Notify_Service/Notify_Service -ORBsvcconf lookup.conf
+run RedGreen_Test 
 
 
 Test 3
 ------
 
-run $TAO_ROOT/orbsvcs/Notify_Service/Notify_Service -Notify_TPReactor 2 -ORBsvcconf listener.conf
-run RedGreen_Test
+run $TAO_ROOT/orbsvcs/Notify_Service/Notify_Service -ORBsvcconf listener.conf
+run RedGreen_Test 
+
+
+
+
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp
deleted file mode 100644
index 902074d82ce..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsp
+++ /dev/null
@@ -1,110 +0,0 @@
-# Microsoft Developer Studio Project File - Name="RedGreen" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=RedGreen - 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 "RedGreen.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 "RedGreen.mak" CFG="RedGreen - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "RedGreen - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "RedGreen - 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)" == "RedGreen - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_Svc_Utils.lib /nologo /subsystem:console /incremental:yes /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_Svc_Utilsd.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "RedGreen - Win32 Release"

-# Name "RedGreen - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RedGreen_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsw b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.dsw
deleted file mode 100644
index 7804db59f54..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen.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: "RedGreen"=".\RedGreen.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
index c8eec8bc908..3f548f1b6ff 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -57,7 +57,7 @@ RedGreen_Test::parse_args(int argc, char *argv[])
 
 RedGreen_Test::RedGreen_Test (void)
   :burst_size_ (10),
-   nthreads_ (2)
+   nthreads_ (4)
 {
   // No-Op.
   ifgop_ = CosNotifyChannelAdmin::OR_OP;
@@ -103,7 +103,7 @@ void
 RedGreen_Test::done (void)
 {
   dump_results ();
-	worker_.done ();
+  this->orb_->shutdown ();
 }
 
 void
@@ -251,7 +251,7 @@ RedGreen_Test::send_events (CORBA::Environment &ACE_TRY_ENV)
   CosNotification::EventTypeSeq removed_1 (0);
 
   added_1[0].domain_name =  CORBA::string_dup (DOMAIN_GREEN);
-  added_1[0].type_name = CORBA::string_dup (TYPE_GREEN);
+  added_1[0].type_name = CORBA::string_dup (DOMAIN_GREEN);
   added_1.length (1);
   removed_1.length (0);
 
@@ -589,7 +589,6 @@ RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier (CORBA
 /*****************************************************************/
 
 Worker::Worker (void)
-:done_(0)
 {
 }
 
@@ -599,20 +598,11 @@ Worker::orb (CORBA::ORB_ptr orb)
   orb_ = CORBA::ORB::_duplicate (orb);
 }
 
-void
-Worker::done (void)
-{
-	done_ = 1;
-}
-
 int
 Worker::svc (void)
 {
-  while (!this->done_)
-		if (this->orb_->work_pending ())
-			this->orb_->perform_work ();
-  
-	return 0;
+  this->orb_->run ();
+  return 0;
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 42a8399f498..45799cd21e8 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -46,15 +46,9 @@ public:
   virtual int svc (void);
   // The thread entry point.
 
-	void done (void);
-	// set done flag.
-
 private:
   CORBA::ORB_var orb_;
   // The orb
-
-	CORBA::Boolean done_;
-	// Flag to tell that we're done servicing.
 };
 
 class RedGreen_Test
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
index 295f1824c1a..c3b76ae1377 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/listener.conf
@@ -1 +1 @@
-static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -MTListenerEval -ListenerThreads 1"
+static Notify_Default_Event_Manager_Objects_Factory "-MTListenerEval -Notify_TPReactor 4 "
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
index 198cc3b8472..fffa47dcc43 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/lookup.conf
@@ -1 +1 @@
-static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -MTLookup -LookupThreads 2"
+static Notify_Default_Event_Manager_Objects_Factory "-MTLookup -LookupThreads 2"
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp
deleted file mode 100644
index 40502533b89..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsp
+++ /dev/null
@@ -1,104 +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 AllowPerConfigDependencies 0

-# 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 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 "..\..\..\..\..\..\\" /I "..\..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_CosNotification.lib TAO_CosNaming.lib TAO_CosEvent.lib TAO_Svc_Utils.lib TAO_NotifyTests.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\lib"

-

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

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\lib" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

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

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

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib TAO_CosNotificationd.lib TAO_CosNamingd.lib TAO_CosEventd.lib TAO_Svc_Utilsd.lib TAO_NotifyTestsd.lib /nologo /subsystem:console /pdb:"Subscribe.pdb" /map:"Debug/.map" /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\orbsvcs" /libpath:"..\..\..\..\..\tao" /libpath:"..\..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\..\..\ace" /libpath:"..\..\lib"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Throughput - Win32 Release"

-# Name "Throughput - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Throughput.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsw b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.dsw
deleted file mode 100644
index e7a03e192cf..00000000000
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.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: "Throughput"=".\Throughput.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index d66bbd712a2..56e731ac912 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -5,60 +5,81 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
 # amount of delay between running the servers
 
 $sleeptime = 6;
 $status = 0;
 
+ACE::checkForTarget($cwd);
+
 # variables for parameters
 
-$nsior = PerlACE::LocalFile ("ns.ior");
+$nsior = "$cwd$DIR_SEPARATOR" . "ns.ior";
+
+sub name_server
+{
+    my $args = " -o $nsior";
+    my $prog =
+    print STDERR ("\nNaming_Service: $args\n");
+
+    unlink $nsior;
+    $NS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR
+			   ."..".$DIR_SEPARATOR
+			   ."Naming_Service".$DIR_SEPARATOR
+			   ."Naming_Service".$EXE_EXT, $args);
+    if (ACE::waitforfile_timed ($nsior, 5) == -1) {
+      print STDERR "ERROR: cannot find naming service IOR file\n";
+      $NS->Kill (); $NS->TimedWait (1);
+      exit 1;
+    }
+}
 
-unlink $nsior;
 
-$NS = new PerlACE::Process ("../../Naming_Service/Naming_Service", "-o $nsior");
-$SV = new PerlACE::Process ("server", "-ORBInitRef NameService=file://$nsior");
-$CL = new PerlACE::Process ("client", "-ORBInitRef NameService=file://$nsior");
+sub server
+{
+    my $args = "-ORBInitRef NameService=file://$nsior";
+    print STDERR "\nServer $args\n";
+    $SV = Process::Create ($EXEPREFIX."server$EXE_EXT", $args);
+}
 
-print STDERR "Starting Naming_Service\n";
-$NS->Spawn ();
 
-if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
-    print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
-    exit 1;
+sub client
+{
+    my $args = "-ORBInitRef NameService=file://$nsior";
+    print STDERR "\nclient $args\n";
+    $CL = Process::Create ($EXEPREFIX."client$EXE_EXT", $args);
 }
 
-print STDERR "Starting Server\n";
-$SV->Spawn ();
+name_server ();
 
+server ();
 sleep $sleeptime;
 
-print STDERR "Starting Client\n";
-
+client ();
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client";
-    $status = 1;
+if ($CL->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server";
-    $status = 1;
+$SV->Terminate (); if ($SV->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate server\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
-$nserver = $NS->TerminateWaitKill (5);
-
-if ($nserver != 0) {
-    print STDERR "ERROR: name server returned $nserver";
-    $status = 1;
+$NS->Terminate (); if ($NS->TimedWait (5) == -1) {
+  print STDERR "ERROR: cannot terminate naming service\n";
+  $NS->Kill (); $NS->TimedWait (1);
+  exit 1;
 }
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index f9a79d3daf8..985c26a6848 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -1,12 +1,12 @@
 # $Id$
 
+SRC = $(BIN:%=%$(VAR).cpp)
+LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
+
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO
-
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched \
             -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.dsp b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
index 9c0e253ea70..27428053174 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.dsp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/tests/Simple_Naming/makefile.bor b/TAO/orbsvcs/tests/Simple_Naming/makefile.bor
index 0e72ee08a3a..3358fb4cefa 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/makefile.bor
+++ b/TAO/orbsvcs/tests/Simple_Naming/makefile.bor
@@ -13,19 +13,12 @@ OBJFILES = \
 
 CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) -I$(TAO_ROOT)/orbsvcs
 
-LIBFILES = \
-        $(ACE_LIB) \
-        $(TAO_LIB) \
-        $(TAO_NAMING_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_SVC_UTILS_LIB)
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB) $(TAO_SVC_UTILS_LIB)
 
 CPPDIR = .
 
 IDLDIR = .
 
-IDLFILES = test_object.idl
-
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
 
 #
diff --git a/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl b/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
index d962113c0ae..ab8a0ec9b73 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/process-m-output.pl
@@ -4,6 +4,10 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
+unshift @INC, '../../../../bin';
+require Process;
+require Uniqueid;
+
 # This is a Perl script that processes the output of the multithreaded
 # client test.  Usage: process-m-output.pl output-file-name number-of-threads
 
@@ -26,8 +30,6 @@ else
     die "Usage: process-m-output.pl output-file-name number-of-threads \n";
 }
 
-$errors = 0;
-
 $binds = 0;
 $unbinds = 0;
 
@@ -103,5 +105,3 @@ else
     print "Number of sucessfule binds is different from number of
 sucessful unbinds\n";
 }
-
-exit $errors;
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 4e5870dad99..a9ea5e590a9 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -8,62 +8,57 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl script that runs all Naming Service tests.  It starts
 # all the servers and clients as necessary.
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+require Uniqueid;
+use Cwd;
 
+$cwd = getcwd();
 # Amount of delay (in seconds) between starting a server and a client
 # to allow proper server initialization.
 $sleeptime = 8;
 
-$quiet = 0;
-
-# check for -q flag
-if ($ARGV[0] eq '-q') {
-    $quiet = 1;
-}
-
 # Variables for command-line arguments to client and server
 # executables.
-$ns_multicast_port = 10001 + PerlACE::uniqueid (); # Can not be 10000 on Chorus 4.0
-$ns_orb_port = 12000 + PerlACE::uniqueid ();
-$iorfile = PerlACE::LocalFile ("ns.ior");
-$persistent_ior_file = PerlACE::LocalFile ("pns.ior");
-$persistent_log_file = PerlACE::LocalFile ("test_log");
-$data_file = PerlACE::LocalFile ("test_run.data");
+$ns_multicast_port = 10001 + uniqueid (); # Can not be 10000 on Chorus 4.0
+$ns_orb_port = 12000 + uniqueid ();
+$iorfile = "$cwd$DIR_SEPARATOR" . "ns.ior";
+$persistent_ior_file = "$cwd$DIR_SEPARATOR" . "pns.ior";
+$persistent_log_file = "$cwd$DIR_SEPARATOR" . "test_log";
+$data_file = "$cwd$DIR_SEPARATOR" . "test_run.data";
 
-$status = 0;
+ACE::checkForTarget($cwd);
 
 sub name_server
 {
-    my $args = "@_ "."-ORBnameserviceport $ns_multicast_port -o $iorfile";
-    my $prog = "../../Naming_Service/Naming_Service";
-
-    $NS = new PerlACE::Process ($prog, $args);
-
-    unlink $iorfile;
-
-    $NS->Spawn ();
-
-    if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-        print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-        $NS->Kill (); 
-        exit 1;
-    }
+  my $args = "@_ "."-ORBnameserviceport $ns_multicast_port -o $iorfile";
+  my $prog = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR".
+      "Naming_Service".$DIR_SEPARATOR.
+          "Naming_Service".$EXE_EXT;
+
+  unlink $iorfile;
+  $NS = Process::Create ($prog, $args);
+
+  if (ACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+    print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
+    $NS->Kill (); $NS->TimedWait (1);
+    exit 1;
+  }
 }
 
 sub client
 {
-    my $args = "@_"." ";
-    my $prog = "client";
+  my $args = "@_"." ";
+  my $prog = $EXEPREFIX."client".$EXE_EXT;
 
-    $CL = new PerlACE::Process ($prog, $args);
+  $CL = Process::Create ($prog, $args);
 
-    $client = $CL->SpawnWaitKill (60);
-
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+      print STDERR "ERROR: client timedout\n";
+      $CL->Kill (); $CL->TimedWait (1);
+  }
 }
 
 # Options for all simple tests recognized by the 'client' program.
@@ -95,15 +90,20 @@ unlink $persistent_ior_file, $persistent_log_file;
 
 # Run server and client for each of the tests.  Client uses ior in a
 # file to bootstrap to the server.
-foreach $o (@opts) {
-    name_server ($server_opts[$test_number]);
+foreach $o (@opts)
+{
+  name_server ($server_opts[$test_number]);
 
-    print STDERR "\n          ".$comments[$test_number];
+  print STDERR "\n          ".$comments[$test_number];
 
-    client ($o);
+  client ($o);
 
-    $NS->Kill ();
-    $test_number++;
+  $NS->Terminate (); $server = $NS->TimedWait (5);
+  if ($server == -1) {
+    print STDERR "ERROR: server timedout\n";
+    $NS->Kill (); $NS->TimedWait (1);
+  }
+  $test_number++;
 }
 
 unlink $persistent_ior_file, $persistent_log_file;
@@ -117,10 +117,6 @@ open (STDOUT, ">$data_file") or die "can't redirect stdout: $!";
 open (OLDERR, ">&STDERR");
 open (STDERR, ">&STDOUT") or die "can't redirect stderror: $!";
 
-# just here to quiet warnings
-$fh = \*OLDOUT;
-$fh = \*OLDERR;
-
 name_server ();
 
 client ("-ORBInitRef NameService=file://$iorfile", "-m15");
@@ -130,31 +126,22 @@ close (STDOUT);
 open (STDOUT, ">&OLDOUT");
 open (STDERR, ">&OLDERR");
 
-$NS->Kill ();
+$NS->Terminate (); $server = $NS->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $NS->Kill (); $NS->TimedWait (1);
+}
 
 unlink $iorfile;
 
-
-$errors = system ("perl process-m-output.pl $data_file 15") >> 8;
-
-if ($errors > 0) {
-    $status = 1;
-
-    if (!$quiet) {
-        print STDERR "Errors Detected, printing output\n";
-        if (open (DATA, "<$data_file")) {
-            print STDERR "================================= Begin\n";
-            print STDERR <DATA>;
-            print STDERR "================================= End\n";
-            close (DATA);
-        }
-        else {
-            print STDERR "ERROR: Could not open $data_file\n";
-        }
-        unlink $data_file;
-    }
+$FL = Process::Create ($EXEPREFIX."process-m-output.pl",
+                       " $data_file 15");
+$filter = $FL->TimedWait (60);
+if ($filter == -1) {
+  print STDERR "ERROR: filter timedout\n";
+  $FL->Kill (); $FL->TimedWait (1);
 }
+print STDERR "\n";
 
-unlink $iorfile;
-
-exit $status;
+# @@ Capture any exit status from the processes.
+exit 0;
diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl
index 9c174e5f654..c722b9167f4 100755
--- a/TAO/orbsvcs/tests/Time/run_test.pl
+++ b/TAO/orbsvcs/tests/Time/run_test.pl
@@ -6,59 +6,134 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../../bin";
-use PerlACE::Run_Test;
 
-$server_ior   = PerlACE::LocalFile ("server_ior");
-$clerk_ior    = PerlACE::LocalFile ("clerk_ior");
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
+$server_ior = "$cwd$DIR_SEPARATOR" . "server_ior";
+$clerk_ior = "$cwd$DIR_SEPARATOR" . "clerk_ior";
+$implrepo_ior = "$cwd$DIR_SEPARATOR" . "implrepo.ior";
 $status = 0;
 
 # Make sure the files are gone, so we can wait on them.
 
-unlink $server_ior, $clerk_ior;
+unlink $server_ior;
+unlink $clerk_ior;
 
-$SV = new PerlACE::Process ("../../Time_Service/Time_Service_Server", "-o $server_ior");
-$CK = new PerlACE::Process ("../../Time_Service/Time_Service_Clerk", "-f $server_ior -o $clerk_ior -t 2");
-$CL = new PerlACE::Process ("client", "-f $clerk_ior");
+ACE::checkForTarget($cwd);
 
-$SV->Spawn ();
+$server_program = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Server".$EXE_EXT;
+$clerk_program = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR"."Time_Service".$DIR_SEPARATOR."Time_Service_Clerk".$EXE_EXT;
+$client_program = $EXEPREFIX."client".$EXE_EXT;
 
-if (PerlACE::waitforfile_timed ($server_ior, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$server_ior>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CK->Spawn ();
+sub time_service_test_using_naming_service
+{
+    $SV1 = Process::Create ($server_program,"");
 
-if (PerlACE::waitforfile_timed ($clerk_ior, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$clerk_ior>\n";
-    $SV->Kill ();
-    $CK->Kill ();
-    exit 1;
-}
+    sleep 5;
 
-$client = $CL->SpawnWaitKill (60);
+    $SV2 = Process::Create ($clerk_program,"-t 2");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
+    sleep 10;
 
-$server = $SV->TerminateWaitKill (5);
+    $CL = Process::Create ($client_program, "");
+    
+    if ($CL->TimedWait (60) == -1) {
+      print STDERR "ERROR: client timedout\n";
+      $status = 1;
+      $CL->Kill (); $CL->TimedWait (1);
+    }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+    $SV1->Terminate ();
+    $SV2->Terminate ();
+    if ($SV1->TimedWait (5) == -1 ||
+        $SV2->TimedWait (5) == -1) {
+      print STDERR "ERROR: couldn't shutdown the servers nicely\n";
+      $status = 1;
+      $SV1->Kill (); $SV2->Kill ();
+      $SV1->TimedWait (1); $SV2->TimedWait (1);
+    }
 }
 
-$clerk = $CK->TerminateWaitKill (5);
-
-if ($clerk != 0) {
-    print STDERR "ERROR: clerk returned $clerk\n";
-    $status = 1;
+sub time_service_test_using_files
+{
+    $SV1 = Process::Create ($server_program,
+                            "-o $server_ior");
+
+    if (ACE::waitforfile_timed ($server_ior, 15) == -1) {
+      print STDERR "ERROR: timedout waiting for file <$server_ior>\n";
+      $status = 1;
+      $SV1->Kill (); $SV1->TimedWait (1);
+    }
+    else {
+      
+      sleep 5;
+      
+      $SV2 = Process::Create ($clerk_program,
+                              "-f $server_ior -o $clerk_ior -t 2");
+      
+      if (ACE::waitforfile_timed ($clerk_ior, 15) == -1) {
+        print STDERR "ERROR: timedout waiting for file <$clerk_ior>\n";
+        $status = 1;
+        $SV2->Kill (); $SV2->TimedWait (1);
+      }
+      else {
+        
+        sleep 10;
+        
+        $CL = Process::Create ($client_program,
+                          " -f $clerk_ior");
+        if ($CL->TimedWait (60) == -1) {
+          print STDERR "ERROR: client timedout\n";
+          $status = 1;
+          $CL->Kill (); $CL->TimedWait (1);
+        }
+      
+        $SV1->Terminate ();
+        $SV2->Terminate ();
+        if ($SV1->TimedWait (5) == -1 ||
+            $SV2->TimedWait (5) == -1) {
+          print STDERR "ERROR: couldn't shutdown the servers nicely\n";
+          $status = 1;
+          $SV1->Kill (); $SV2->Kill ();
+          $SV1->TimedWait (1); $SV2->TimedWait (1);
+        }
+      }
+    }
+    unlink $clerk_ior;
+    unlink $server_ior;
 }
 
-unlink $server_ior, $clerk_ior;
+# Parse the arguments
+
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+      print "run_test [-chorus <target>] <use_naming> or <use_files>\n";
+      print "\n";
+      print "-chorus <target>         -- Run the test on the Chorus target\n";
+      print "use_naming               -- Runs the test using Naming Service\n";
+      print "use_files                -- Runs the test using IOR Files\n";
+      exit;
+    }
+
+    if ($ARGV[$i] eq "use_naming")
+    {
+      time_service_test_using_naming_service ();
+      last SWITCH;
+    }
+
+    if ($ARGV[$i] eq "use_files")
+    {
+      time_service_test_using_files ();
+      last SWITCH;
+    }
+    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
+  }
+}
 
 exit $status;
diff --git a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
index b30b280888e..27afea15f35 100644
--- a/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Colocated_Test.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/tests/Trading/Export_Test.dsp b/TAO/orbsvcs/tests/Trading/Export_Test.dsp
index f4a76f9f3f9..eb5550928ca 100644
--- a/TAO/orbsvcs/tests/Trading/Export_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Export_Test.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/tests/Trading/Import_Test.dsp b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
index 43433d60623..2b13596987a 100644
--- a/TAO/orbsvcs/tests/Trading/Import_Test.dsp
+++ b/TAO/orbsvcs/tests/Trading/Import_Test.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 9f099bf5081..4711ca6551f 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -38,8 +38,8 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)
 
 LSRC    = $(addsuffix .cpp,$(FILES)) $(IDL_SRC)
 PSRC    = $(addsuffix .cpp,$(BIN2))
-ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
-LDLIBS  = -lTAO_CosTrading -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+ACE_SHLIBS = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lACE
+LDLIBS  = -lTAO_CosTrading -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Trading/TradingLib.dsp b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
index 9fa80964dd8..776512d4b34 100644
--- a/TAO/orbsvcs/tests/Trading/TradingLib.dsp
+++ b/TAO/orbsvcs/tests/Trading/TradingLib.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir ".\Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
index 2ee0d0dce60..e557bdb3ddc 100755
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ b/TAO/orbsvcs/tests/Trading/run_test.pl
@@ -5,50 +5,70 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+require Process;
+use Cwd;
 
-$ior = PerlACE::LocalFile ("trading.ior");
-$ready_file = PerlACE::LocalFile ("export_test_ready");
+$cwd = getcwd();
+$ior = "$cwd$DIR_SEPARATOR" . "trading.ior";
+$ready_file = "$cwd$DIR_SEPARATOR" . "export_test_ready";
 $sleeptime = 20;
+$status = 0;
 
 unlink $ior;
 unlink $ready_file;
 
-$TS = new PerlACE::Process ("../../Trading_Service/Trading_Service",
-                            "-TSdumpior $ior");
-$E = new PerlACE::Process ("export_test",
-                           "-ORBInitRef TradingService=file://$ior -quiet");
-$I = new PerlACE::Process ("import_test",
-                           "-ORBInitRef TradingService=file://$ior -quiet");
+ACE::checkForTarget($cwd);
 
-$TS->Spawn ();
+$TS = Process::Create ($EXEPREFIX."..".$DIR_SEPARATOR.
+                       "..".$DIR_SEPARATOR.
+                       "Trading_Service".$DIR_SEPARATOR.
+                       "Trading_Service".$EXE_EXT,
+                       " -TSdumpior $ior ");
 
-if (PerlACE::waitforfile_timed ($ior, $sleeptime) == -1) {
-    print STDERR "ERROR: waiting for trading service IOR file\n";
-    $TS->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($ior, $sleeptime) == -1) {
+  print STDERR "ERROR: waiting for trading service IOR file\n";
+  $TS->Kill (); $TS->TimedWait (1);
+  exit 1;
 }
 
-$E->Spawn ();
+$E = Process::Create ($EXEPREFIX."export_test".$EXE_EXT,
+                      "-ORBInitRef TradingService=file://$ior"
+		      . " -quiet");
 
-if (PerlACE::waitforfile_timed ($ready_file, 120) == -1) {
-    print STDERR "ERROR: waiting for the export test to finish\n";
-    $E->Kill (); 
-    $TS->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($ready_file, 120) == -1) {
+  print STDERR "ERROR: waiting for the export test to finish\n";
+  $E->Kill (); $E->TimedWait (1);
+  $TS->Kill (); $TS->TimedWait (1);
+  exit 1;
 }
 
-$test = $I->SpawnWaitKill (60);
-$E->Kill ();
-$TS->Kill ();
+$I = Process::Create ($EXEPREFIX."import_test".$EXE_EXT,
+                      "-ORBInitRef TradingService=file://$ior"
+		      . " -quiet");
 
-unlink $ior;
-unlink $ready_file;
+if ($I->TimedWait (60) == -1) {
+  $status = 1;
+  print STDERR "ERROR: import test timedout\n";
+  $I->Kill (); $I->TimedWait (1);
+}
+
+$E->Terminate ();
+if ($E->TimedWait (15) == -1) {
+  $status =1;
+  print STDERR "ERROR: export test timedout\n";
+  $E->Kill (); $E->TimedWait (1);
+}
 
-if ($test != 0) {
-    print STDERR "ERROR: import test returned $test\n";
-    exit 1;
+$TS->Terminate();
+if ($TS->TimedWait (15) == -1) {
+  print STDERR "ERROR: couldn't terminate the trading service nicely\n";
+  $TS->Kill (); $TS->TimedWait (1);
+  $status = 1;
 }
 
-exit 0;
+unlink $ior;
+unlink $ready_file;
+
+exit $status;
diff --git a/TAO/orbsvcs/tests/ior_corbaname/Makefile b/TAO/orbsvcs/tests/ior_corbaname/Makefile
index 76a97f6586d..9398e217c86 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile
@@ -15,12 +15,11 @@ endif # ! TAO_ROOT
 IDL_FILES = corbaname
 IDL_SRC = corbanameC corbanameS
 
-LDLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO
-
+LDLIBS = -lTAO_PortableServer -lTAO -lTAO_CosNaming
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 BIN = server client
 
-SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC) status_i ior_corbaname_client_i)
+SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC) status_i)
 
 SERVER_OBJS = $(addsuffix .o, server status_i $(IDL_SRC))
 CLIENT_OBJS = $(addsuffix .o, client ior_corbaname_client_i status_i $(IDL_SRC))
@@ -1716,329 +1715,4 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
  corbanameS_T.h corbanameS_T.i corbanameS_T.cpp corbanameS.i
 
-.obj/ior_corbaname_client_i.o .obj/ior_corbaname_client_i.so .shobj/ior_corbaname_client_i.o .shobj/ior_corbaname_client_i.so: ior_corbaname_client_i.cpp \
- ior_corbaname_client_i.h corbanameC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- corbanameC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/naming_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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
-
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 46bbdf3ee08..7c10797802d 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -39,7 +39,7 @@ int main (int argc, char* argv[])
       corbaname_Status_i status_i;
 
       // Activate it to obtain the reference
-      corbaname::Status_var status =
+      corbaname::Status_var status = 
         status_i._this ();
 
       // Get a reference to Naming Context
@@ -58,7 +58,7 @@ int main (int argc, char* argv[])
       name.length (1);
       name[0].id = CORBA::string_dup ("STATUS");
 
-      naming_context->bind (name,
+      naming_context->bind (name, 
                             status.in (),
                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -72,12 +72,12 @@ int main (int argc, char* argv[])
       orb->destroy ();
 
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  ACE_CATCH (CORBA::SystemException, ex) 
     {
       ACE_PRINT_EXCEPTION (ex, "CORBA exception raised in server!");
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
-
+  
   return 0;
 }
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index 0b632dd0ac2..4fb59c1d299 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -17,7 +17,6 @@ Callback_i::done (void)
 
 void
 Callback_i::response (Test::TimeStamp time_stamp,
-                      const Test::Payload &,
                       CORBA::Environment &)
   ACE_THROW_SPEC (())
 {
@@ -25,12 +24,6 @@ Callback_i::response (Test::TimeStamp time_stamp,
   ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->remaining_samples_ == 0)
     return;
-
-  if (this->remaining_samples_ % 1000 == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Only %d messages to go\n",
-                  this->remaining_samples_));
-    }
   this->remaining_samples_--;
   this->history_.sample (now - time_stamp);
 }
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index 5561ada4901..e66d1969d98 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -22,7 +22,6 @@ public:
   /// Implement the CORBA methods
   //@{
   void response (Test::TimeStamp,
-                 const Test::Payload &,
                  CORBA::Environment &)
     ACE_THROW_SPEC (());
   //@}
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 8821be546eb..4288955318b 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -18,13 +18,12 @@ Server_i::set_callback (Test::Callback_ptr callback,
 
 void
 Server_i::request (Test::TimeStamp time_stamp,
-                   const Test::Payload &payload,
                    CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (!CORBA::is_nil (this->callback_.in ()))
     {
-      this->callback_->response (time_stamp, payload, ACE_TRY_ENV);
+      this->callback_->response (time_stamp, ACE_TRY_ENV);
     }
 }
 
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index fca9406d808..87cd2126d2f 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -22,7 +22,6 @@ public:
     ACE_THROW_SPEC (());
 
   void request (Test::TimeStamp,
-                const Test::Payload &,
                 CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/performance-tests/Callback/callback.idl b/TAO/performance-tests/Callback/callback.idl
index 7ac2851dc01..7f3a14d4393 100644
--- a/TAO/performance-tests/Callback/callback.idl
+++ b/TAO/performance-tests/Callback/callback.idl
@@ -9,13 +9,9 @@ module Test {
   /// we stick the native high resolution timer value there.
   typedef unsigned long long TimeStamp;
 
-  /// Simulated 
-  typedef sequence<octet> Payload;
-
   /// Define the callback interface
   interface Callback {
-    oneway void response (in TimeStamp time_stamp,
-                          in Payload message_payload);
+    oneway void response (in TimeStamp time_stamp);
   };
 
   /// Define the server interface
@@ -26,8 +22,7 @@ module Test {
 
     /// Send a request, the Callback::response method is invoked with
     /// the @param time_stamp value
-    oneway void request (in TimeStamp time_stamp,
-                         in Payload message_payload);
+    oneway void request (in TimeStamp time_stamp);
 
     /// Shutdown the server, just to make cleanup simpler.
     oneway void shutdown ();
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 7fa2f0bbf5c..05f06814964 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -149,25 +149,20 @@ main (int argc, char *argv [])
       Task task (server.in (), iterations);
       task.activate ();
 
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
       while (!callback_i.done () || !task.done ())
         {
           ACE_Time_Value tv (1, 0);
           orb->run (tv, ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-      ACE_hrtime_t end = ACE_OS::gethrtime ();
 
       ACE_Thread_Manager::instance ()->wait ();
 
       // Calibrate the high resolution timer *before* starting the
       // test.
-      ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
 
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
-
       ACE_Sample_History &history =
         callback_i.sample_history ();
       if (do_dump_history)
@@ -179,19 +174,12 @@ main (int argc, char *argv [])
       history.collect_basic_stats (stats);
       stats.dump_results ("Latency", gsf);
 
-      ACE_hrtime_t elapsed_microseconds = (end - start) / gsf;
-      double elapsed_seconds =
-        ACE_CU64_TO_CU32(elapsed_microseconds) / 1000000.0;
-      double throughput =
-        double(iterations) / elapsed_seconds;
-
-      ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput));
-
       server->shutdown (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&callback_i, ACE_TRY_ENV);
+      PortableServer::ObjectId_var id;
+
+      id = root_poa->servant_to_id (&callback_i, ACE_TRY_ENV);
       ACE_TRY_CHECK;
       root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -263,13 +251,12 @@ Task::done (void)
 int
 Task::svc (void)
 {
-  Test::Payload payload(1024); payload.length(1024);
   ACE_TRY_NEW_ENV
     {
       for (;;)
         {
           Test::TimeStamp creation = ACE_OS::gethrtime ();
-          this->server_->request (creation, payload, ACE_TRY_ENV);
+          this->server_->request (creation, ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           // ACE_Time_Value tv (0, 5000);
diff --git a/TAO/performance-tests/Callback/run_test.pl b/TAO/performance-tests/Callback/run_test.pl
index dcb684aee66..fb117e30f64 100755
--- a/TAO/performance-tests/Callback/run_test.pl
+++ b/TAO/performance-tests/Callback/run_test.pl
@@ -5,40 +5,44 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../../bin";
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -i 1000");
+$iorfile = "test.ior";
 
 print STDERR "================ Callback performance test\n";
 
 unlink $iorfile;
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (10);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile "
+                       . " -i 1000");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit 1;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
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 5373e0b021b..9265b516fbd 100755
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
@@ -5,80 +5,114 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $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.
+# Taken from perlrun man page.
+
+# Do not use environment variables here since not all platforms use ACE_ROOT
 use lib "../../../../../bin";
-use PerlACE::Run_Test;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("cubit.ior");
-$svnsflags = " -f $iorfile ";
-$clnsflags = " -f $iorfile ";
+require ACEutils;
+
+$iorfile = "cubit.ior";
+$clexepref = '.' . $DIR_SEPARATOR;
+$svexepref = ".." . $DIR_SEPARATOR . "IDL_Cubit" . $DIR_SEPARATOR;
+$svnsflags = " -f $iorfile";
+$clnsflags = " -f $iorfile";
 $clflags = "";
 $svflags = "";
 
-###############################################################################
+# Make sure the file is gone, so we can wait on it.
+unlink $iorfile;
+
+
 # Parse the arguments
 
-for (my $i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "run_test [-h] [-n num] [-debug] [-orblite]\n";
-        print "\n";
-        print "-h                  -- prints this information\n";
-        print "-n num              -- client uses <num> iterations\n";
-        print "-debug              -- sets the debug flag for both client and server\n";
-        print "-orblite            -- Use the lite version of the orb";
-        exit;
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+      print "run_test [-h] [-n num] [-sleeptime t] [-debug] [-release] [-orblite]\n";
+      print "\n";
+      print "-h                  -- prints this information\n";
+      print "-n num              -- client uses <num> iterations\n";
+      print "-sleeptime t        -- run_test should sleep for <t> seconds between running\n";
+      print "                       the server and client (default is 5 seconds)\n";
+      print "-debug              -- sets the debug flag for both client and server\n";
+      print "-release            -- runs the Release version of the test (for NT use)\n";
+      print "-orblite            -- Use the lite version of the orb";
+      exit;
+    }
+    if ($ARGV[$i] eq "-debug")
+    {
+      $clflags .= " -d";
+      $svflags .= " -d";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-debug") {
-        $clflags .= " -d ";
-        $svflags .= " -d ";
+    if ($ARGV[$i] eq "-release")
+    {
+      $exepref = "Release".$DIR_SEPARATOR;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-n") {
-        $clflags .= " -n $ARGV[$i + 1] ";
-        $i++;
+    if ($ARGV[$i] eq "-n")
+    {
+      $clflags .= " -n $ARGV[$i + 1]";
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-orblite") {
-        $clflags .= " -ORBgioplite ";
-        $svflags .= " -ORBgioplite ";
+    if ($ARGV[$i] eq "-sleeptime")
+    {
+      $ACE::sleeptime = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    else {
-        print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n";    
+    if ($ARGV[$i] eq "-orblite")
+    {
+      $clflags .= " -ORBgioplite";
+      $svflags .= " -ORBgioplite";
+      last SWITCH;
     }
+    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
+  }
 }
 
-###############################################################################
+(-f $svexepref."server".$EXE_EXT  &&
+ -f $clexepref."client".$EXE_EXT)  ||
+  die "$0: server and/or client need to be built!\n";
 
-my $SV = new PerlACE::Process ("../IDL_Cubit/server", $svflags . $svnsflags);
-my $CL = new PerlACE::Process ("client", "$clflags $clnsflags -x");
+$SV = Process::Create ($svexepref."server".$EXE_EXT,
+                       $svflags.
+                       $svnsflags);
 
-if (! (-x $SV->Executable () && -x $CL->Executable)) {
-    print STDERR "ERROR: server and/or client missing or not executable!\n";
-    exit 1;
-}
-
-# Make sure the file is gone, so we can wait on it.
-unlink $iorfile;
+# Put in a wait between the server and client
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (10);
+$CL = Process::Create ($clexepref . "client".$EXE_EXT,
+                       " $clflags $clnsflags -x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 3abf0e683c1..bf6d56b8a6d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -1072,8 +1072,6 @@ Cubit_Client::cube_any (int i,
 
           this->error_count_++;
         }
-
-      delete ret_any;
     }
   ACE_CATCHANY
     {
@@ -1135,8 +1133,6 @@ Cubit_Client::cube_any_struct (int i,
 
           this->error_count_++;
         }
-
-      delete ret_any;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
index 9206455908e..ad1dbc22fb2 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation/svc.conf
@@ -2,6 +2,6 @@
 #
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
-static Resource_Factory "-ORBReactorType select_st -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST" 
+static Resource_Factory "-ORBReactorType select_st"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler ST -ORBConnectorLock null"
 static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
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 738d2c8fa96..f3d52ad8721 100755
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -11,137 +11,259 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 # Do not use environment variables here since not all platforms use ACE_ROOT
 use lib "../../../../../bin";
-use PerlACE::Run_Test;
-use English;
-
-$status = 0;
 
-$iorfile = PerlACE::LocalFile ("cubit.ior");
-$iiop_lite_conf = PerlACE::LocalFile ("iiop_lite.conf");
-$uiop_lite_conf = PerlACE::LocalFile ("uiop_lite.conf");
-$server_shmiop_conf = PerlACE::LocalFile ("server_shmiop.conf");
+use English;
+require Process;
+require ACEutils;
 
+$iorfile = "cubit.ior";
+$exepref = '.' . $DIR_SEPARATOR;
 $svnsflags = " -f $iorfile";
 $clnsflags = " -f $iorfile";
 $clflags = "";
 $svflags = "";
-$quietflag = " -q ";
-$giopliteflag = 0;
-
-###############################################################################
+$quietflag = "-q";
+$liteflag = "";
+$svliteflag = "";
+$clliteflag = "";
 # Parse the arguments
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "run_test [-h] [-n num] [-debug] [-orblite] [-verbose]\n";
-        print "\n";
-        print "-h                  -- prints this information\n";
-        print "-n num              -- client uses <num> iterations\n";
-        print "-debug              -- sets the debug flag for both client and "
-                                      . "server\n";
-        print "-orblite            -- Use the lite version of the orb";
-        exit;
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+      print "run_test [-h] [-n num] [-sleeptime t]",
+	" [-debug] [-release] [-orblite] [-verbose]\n";
+      print "\n";
+      print "-h                  -- prints this information\n";
+      print "-n num              -- client uses <num> iterations\n";
+      print "-sleeptime t        -- run_test should sleep for <t> seconds between running\n";
+      print "                       the server and client (default is 5 seconds)\n";
+      print "-debug              -- sets the debug flag for both client and server\n";
+      print "-release            -- runs the Release version of the test (for NT use)\n";
+      print "-orblite            -- Use the lite version of the orb";
+      exit;
+    }
+    if ($ARGV[$i] eq "-debug")
+    {
+      $clflags .= " -d";
+      $svflags .= " -d";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-debug") {
-        $clflags .= " -d ";
-        $svflags .= " -d ";
+    if ($ARGV[$i] eq "-release")
+    {
+      $exepref = "Release".$DIR_SEPARATOR;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-n") {
-        $clflags .= " -n $ARGV[$i + 1] ";
-        $i++;
+    if ($ARGV[$i] eq "-n")
+    {
+      $clflags .= " -n $ARGV[$i + 1]";
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq " -orblite ") {
-        $giopliteflag = 1;
+    if ($ARGV[$i] eq "-sleeptime")
+    {
+      $ACE::sleeptime = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq " -verbose ") {
-        $quietflag = "";
+    if ($ARGV[$i] eq "-orblite")
+    {
+      $liteflag = "uselite";
+      last SWITCH;
     }
-    else {
-        print STDERR "ERROR: Unknown Option: ".$ARGV[$i]."\n";
+    if ($ARGV[$i] eq "-verbose")
+    {
+      $quietflag = "";
+      last SWITCH;
     }
+    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
+  }
 }
 
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
+(-f $exepref."server".$EXE_EXT  &&
+ -f $exepref."client".$EXE_EXT)  ||
+  die "$0: server and/or client need to be built!\n";
 
-###############################################################################
-# run_test_helper
+unlink $iorfile;
 
-sub run_test_helper ()
-{
-    $SV->Spawn ();
+sleep 2;
 
-    if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-        print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill ();
-        exit 1;
-    }
+print stderr "\nRunning IDL_Cubit with the default ORB protocol.\n\n";
 
-    my $client = $CL->SpawnWaitKill (120);
-    my $server = $SV->WaitKill (30);
-    
-    unlink $iorfile;
+if ($liteflag eq "uselite")
+{
+    $svliteflag = "-ORBSvcConf iiop_lite.conf";
+    $clliteflag = "-ORBSvcConf iiop_lite.conf";
+    print stderr "\nRunning IDL_Cubit with the a lite ORB protocol.\n\n";
+}
 
-    if ($server != 0) {
-        print STDERR "ERROR: server error status $server\n";
-        $status = 1;
-    }
+$SV = Process::Create ($exepref."server".$EXE_EXT,
+                       $svflags.
+                       $svliteflag.
+                       $svnsflags);
 
-    if ($client != 0) {
-        print STDERR "ERROR: client error status $client\n";
-        $status = 1;
-    }
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-###############################################################################
+$CL = Process::Create ($exepref . "client".$EXE_EXT,
+                       " $quietflag $clflags $clnsflags $clliteflag -x");
 
-if (! (-x $SV->Executable () && -x $CL->Executable)) {
-    print STDERR "ERROR: server and/or client missing or not executable!\n";
-    exit 1;
+$client = $CL->TimedWait (120);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
+
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-print STDERR "============================================================\n";
-print STDERR "Running IDL_Cubit with the default ORB protocol.\n\n";
+if ($server != 0) {
+  print STDERR "ERROR: server error status $server\n";
+}
 
-$SV->Arguments ($svflags . $svnsflags);
-$CL->Arguments ($clflags . $clnsflags . $quietflag . " -x ");
+if ($client != 0) {
+  print STDERR "ERROR: client error status $client\n";
+}
 
-if ($giopliteflag) {
-    print STDERR "\nRunning IDL_Cubit with the a lite ORB protocol.\n\n";
-    $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $iiop_lite_conf ");
-    $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $iiop_lite_conf ");
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-run_test_helper ();
+if ($OSNAME ne "MSWin32")
+{
+  # Only run the UIOP test on Unix platforms.
 
-if ($OSNAME ne "MSWin32") {
-    print STDERR "============================================================\n";
-    print STDERR "Running IDL_Cubit with the UIOP protocol.\n\n";
+  Process::Wait();
 
-    $SV->Arguments ($svflags . $svnsflags . " -ORBEndpoint uiop:// ");
-    $CL->Arguments ($clflags . $clnsflags . $quietflag . " -x ");
+  # No need to unlink the iorfile again.
+  # unlink $iorfile;
 
-    if ($giopliteflag) {
-        print STDERR "\nRunning IDL_Cubit with the a UIOP lite ORB protocol.\n\n";
-        $SV->Arguments ($SV->Arguments () . " -ORBSvcConf $uiop_lite_conf ");
-        $CL->Arguments ($CL->Arugments () . " -ORBSvcConf $uiop_lite_conf ");
-    }
+  sleep 2;
+
+  print stderr "\nRunning IDL_Cubit with the UIOP protocol.\n\n";
+  if ($liteflag eq "uselite")
+  {
+      $svliteflag = "-ORBSvcConf uiop_lite.conf";
+      $clliteflag = "-ORBSvcConf uiop_lite.conf";
+      print stderr "\nRunning IDL_Cubit with the a UIOP lite ORB protocol.\n\n";
+  }
+
+  # Save the original server flags.
+  $save_svflags = $svflags;
+
+  $svflags .= " -ORBEndpoint uiop://";
+
+  $SV = Process::Create ($exepref."server".$EXE_EXT,
+                         $svflags.
+                         $svliteflag.
+                         $svnsflags);
+
+  if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+  }
+
+  $CL = Process::Create ($exepref . "client".$EXE_EXT,
+                         " $quietflag $clflags $clnsflags $clliteflag -x");
 
-    run_test_helper ();
+  $client = $CL->TimedWait (120);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+
+  $server = $SV->TimedWait (30);
+  if ($server == -1) {
+    print STDERR "ERROR: server timedout\n";
+    $SV->Kill (); $SV->TimedWait (1);
+  }
+
+  # Restore the original server flags
+  $svflags = $save_svflags;
+
+  unlink $iorfile;
+
+  if ($server != 0) {
+    print STDERR "ERROR: server error status $server\n";
+  }
+
+  if ($client != 0) {
+    print STDERR "ERROR: client error status $client\n";
+  }
+
+  if ($server != 0 || $client != 0) {
+    exit 1;
+  }
 }
 
-print STDERR "============================================================\n";
-print STDERR "Running IDL_Cubit with the SHMIOP protocol.\n\n";
+# Run the SHMIOP test.
 
-$SV->Arguments ($svflags . $svnsflags 
-                . " -ORBEndpoint shmiop:// -ORBSvcconf $server_shmiop_conf ");
-$CL->Arguments ($clflags . $clnsflags . $quietflag . " -x ");
+Process::Wait();
 
-run_test_helper ();
+# No need to unlink the iorfile again.
+# unlink $iorfile;
+
+sleep 2;
+
+print stderr "\nRunning IDL_Cubit with the SHMIOP protocol.\n\n";
+
+# Save the original server flags.
+$save_svflags = $svflags;
+
+$svflags .= " -ORBEndpoint shmiop:// -ORBSvcconf server_shmiop.conf ";
+
+$SV = Process::Create ($exepref."server".$EXE_EXT,
+                       $svflags.
+                       $svnsflags);
+
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-# Clean up SHMIOP files
-unlink glob ("server_shmiop_*");
+$CL = Process::Create ($exepref . "client".$EXE_EXT,
+                       " $quietflag $clflags $clnsflags -x");
+
+$client = $CL->TimedWait (120);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
+
+$server = $SV->TimedWait (30);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
+
+# Restore the original server flags
+$svflags = $save_svflags;
+
+unlink $iorfile;
+
+if ($server != 0) {
+  print STDERR "ERROR: server error status $server\n";
+}
+
+if ($client != 0) {
+  print STDERR "ERROR: client error status $client\n";
+}
+
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
 
-exit $status;
+exit 0;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf
index 64e8f8656ea..a81e2241f3c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server_shmiop.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
-static SHMIOP_Factory "-MMAPFilePrefix server_shmiop -MMAPFileSize 1000000"
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop -MMAPFileSize 1000000"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 10aa44c96da..9ca12530dec 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -4,7 +4,5 @@
 #
 
 static Advanced_Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null "
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
-static Resource_Factory "-ORBConnectionCacheLock null" 
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock thread -ORBAllowReactivationOfSystemids 0"
-
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
index abc9ba23e2e..c7d3d8c7965 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.st_client.conf
@@ -3,5 +3,5 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW" 
+static Resource_Factory "-ORBReactorType select_st -ORBInputCDRAllocator null"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
index 37b698c2cd7..992b80929aa 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.zero_lock.conf
@@ -7,6 +7,6 @@
 # the only problems are on shutdown.
 #
 
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
index 559bdaac458..25aa493ff3b 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -5,12 +5,14 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-$usage = "run_tests.pl [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
+$usage = "run_tests.pl [-l suppress -ORBGIOPlite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
 
 use lib "../../../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("mtcubit.ior");
+$iorfile = "mtcubit.ior";
+$sleeptime = 3;
+$gioplite = '-ORBSvcConf iiop_lite.conf';
 $iterations = 1000;
 $low_priority_threads = 1;
 $thread_per_rate = '';
@@ -19,7 +21,9 @@ $thread_per_rate = '';
 #### Process command line args.
 ####
 while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
-    if ($ARGV[0] eq '-n') {
+    if ($ARGV[0] eq '-l') {
+        $gioplite = '';
+    } elsif ($ARGV[0] eq '-n') {
         if ($ARGV[1] =~ /^[\da-zA-Z]+$/) {
             $iterations = $ARGV[1]; shift;
         } else {
@@ -50,25 +54,33 @@ $threads = $low_priority_threads + 1;
 # Make sure the file is gone, so we can wait on it.
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "$thread_per_rate -f $iorfile -t $threads");
-$CL = new PerlACE::Process ("client", "$thread_per_rate -f $iorfile -t $threads -n $iterations");
+$SV = Process::Create ('.' . $DIR_SEPARATOR . "server" . $EXE_EXT,
+                       " $gioplite $thread_per_rate -f $iorfile -t $threads");
 
-$SV->Spawn ();
+sleep $sleeptime;
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (180);
-$SV->Kill ();
+$CL = Process::Create ('.' . $DIR_SEPARATOR . "client" . $EXE_EXT .
+                  " $gioplite $thread_per_rate " .
+                  "-f $iorfile -n $iterations -t $threads");
 
-unlink $iorfile;
+$client = $CL->TimedWait (120);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    exit 1;
+$SV->Terminate (); $server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server could not be terminated\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-exit 0;
+unlink $iorfile;
+
+exit $client == 0  ?  0  :  1;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index 861671ff570..0fbba74a93a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null -ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Resource_Factory "-ORBResources tss -ORBInputCDRAllocator null"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
 static Server_Strategy_Factory "-ORBConcurrency thread-per-connection -ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/performance-tests/Latency/client.conf b/TAO/performance-tests/Latency/client.conf
index 0aab8b992f6..1396ec82df2 100644
--- a/TAO/performance-tests/Latency/client.conf
+++ b/TAO/performance-tests/Latency/client.conf
@@ -1,4 +1,4 @@
 # $Id$
 #
 static Advanced_Resource_Factory "-ORBReactorType select_mt"
-#static Client_Strategy_Factory "-ORBclientconnectionhandler LF"
+static Client_Strategy_Factory "-ORBclientconnectionhandler RW"
diff --git a/TAO/performance-tests/Latency/deferred_synch_client.dsp b/TAO/performance-tests/Latency/deferred_synch_client.dsp
index b40b99983b2..d9fa02ab94d 100644
--- a/TAO/performance-tests/Latency/deferred_synch_client.dsp
+++ b/TAO/performance-tests/Latency/deferred_synch_client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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_DynamicInterface.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"../../tao/DynamicInterface" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/Strategies"

+# ADD LINK32 TAO_DynamicInterface.lib ace.lib TAO.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /out:"deferred_synch_client.exe" /libpath:"../../tao/DynamicInterface" /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../tao/Strategies"

 

 !ELSEIF  "$(CFG)" == "Latency Tests Deferred Synch Client - Win32 Debug"

 

diff --git a/TAO/performance-tests/Latency/multi_threaded.pl b/TAO/performance-tests/Latency/multi_threaded.pl
index 62a81e05b40..1fdc3496661 100755
--- a/TAO/performance-tests/Latency/multi_threaded.pl
+++ b/TAO/performance-tests/Latency/multi_threaded.pl
@@ -5,47 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../../bin";
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
-$server_conf = PerlACE::LocalFile ("server.conf");
-$client_conf = PerlACE::LocalFile ("client.conf");
+$iorfile = "test.ior";
 
 print STDERR "================ Multi-threaded test\n";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("st_server",
-                            " -ORBSvcConf $server_conf"
-                            . " -o $iorfile");
+$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ",
+                       " -ORBSvcConf server.conf"
+                       . " -o $iorfile");
 
-$CL = new PerlACE::Process ("st_client",
-                            " -ORBSvcConf $client_conf "
-                            . " -k file://$iorfile "
-                            . " -i 50000");
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-$SV->Spawn ();
+$CL = Process::Create ($EXEPREFIX."st_client$EXE_EXT ",
+                       " -ORBSvcConf client.conf "
+                       . " -k file://$iorfile "
+                       . " -i 50000");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (10);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/performance-tests/Latency/run_test.pl b/TAO/performance-tests/Latency/run_test.pl
index bbda039337d..5bd06dca430 100755
--- a/TAO/performance-tests/Latency/run_test.pl
+++ b/TAO/performance-tests/Latency/run_test.pl
@@ -5,122 +5,124 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../../bin";
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
 
-$status = 0;
+$client_conf="client.conf";
+$server_conf="server.conf";
+$threads='4';
 
-$threads = '4';
+$iorfile = "test.ior";
 
-$iorfile = PerlACE::LocalFile ("test.ior");
-$server_conf = PerlACE::LocalFile ("server.conf");
-$client_conf = PerlACE::LocalFile ("client.conf");
-$st_server_conf = PerlACE::LocalFile ("st_server.conf");
-$st_client_conf = PerlACE::LocalFile ("st_client.conf");
-$client_st_muxed_conf = PerlACE::LocalFile ("client-st-muxed.conf");
+print STDERR "================ Multi-threaded test\n";
 
 unlink $iorfile;
 
-print STDERR "================ Multi-threaded test\n";
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBSvcConf server.conf"
+                       . " -o $iorfile -n $threads");
 
-$SV = new PerlACE::Process ("server",
-                            " -ORBSvcConf $server_conf -o $iorfile"
-                            . " -n $threads");
-$CL = new PerlACE::Process ("client",
-                            " -ORBSvcConf $client_conf -k file://$iorfile "
-                            . " -n $threads -i 1000");
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-$SV->Spawn ();
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -ORBSvcConf client.conf "
+                       . " -k file://$iorfile "
+                       . " -n $threads -i 1000");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
 print STDERR "================ Single-threaded test\n";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("st_server",
-                            " -ORBSvcConf $st_server_conf"
-                            . " -o $iorfile");
-$CL = new PerlACE::Process ("st_client",
-                            " -ORBSvcConf $st_client_conf "
-                            . " -k file://$iorfile "
-                            . " -i 1000");
+$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ",
+                       " -ORBSvcConf st_server.conf"
+                       . " -o $iorfile");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (5);
+$CL = Process::Create ($EXEPREFIX."st_client$EXE_EXT ",
+                       " -ORBSvcConf st_client.conf "
+                       . " -k file://$iorfile "
+                       . " -i 1000");
 
-unlink $iorfile;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+unlink $iorfile;
+
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
 print STDERR "================ Deferred synchronous test\n";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("st_server",
-                            " -ORBSvcConf $st_server_conf"
-                            . " -o $iorfile");
-$CL = new PerlACE::Process ("deferred_synch_client",
-                            " -ORBSvcConf $client_st_muxed_conf "
-                            . " -k file://$iorfile "
-                            . " -i 1000");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ",
+                       " -ORBSvcConf st_server.conf"
+                       . " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (5);
+$CL = Process::Create ($EXEPREFIX."deferred_synch_client$EXE_EXT ",
+                       " -ORBSvcConf client-st-muxed.conf "
+                       . " -k file://$iorfile "
+                       . " -i 1000");
 
-unlink $iorfile;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+unlink $iorfile;
+
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/performance-tests/Latency/scalability.pl b/TAO/performance-tests/Latency/scalability.pl
index b3a235cf32f..9d31258417c 100755
--- a/TAO/performance-tests/Latency/scalability.pl
+++ b/TAO/performance-tests/Latency/scalability.pl
@@ -5,81 +5,85 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
 
-$status = 0;
-$server_conf = PerlACE::LocalFile ("server.conf");
-$client_conf = PerlACE::LocalFile ("client.conf");
+$client_conf="client.conf";
+$server_conf="server.conf";
 $iterations = 10000;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-$JSV = new PerlACE::Process ("vbj",
-                             "java_server"
-                             . " -D -OAid TPool"
-                             . " -D -OAthreadMax 0"
-                             . " -D -OAthreadMin 16");
-
-$JSV->IgnoreExeSubDir (1);
-
-$SV = new PerlACE::Process ("server",
-                            " -ORBSvcConf $server_conf"
-                            . " -o $iorfile -n 16");
-
-
-$CL = new PerlACE::Process ("client");
+$iorfile = "test.ior";
 
 print STDERR "================ Java server test\n";
 
 unlink $iorfile;
 
-$JSV->Spawn ();
+$SV = Process::Create ("vbj",
+		       "java_server",
+                       " -D -OAid TPool"
+                       ." -D -OAthreadMax 0"
+                       ." -D -OAthreadMin 16");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $JSV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
 for ($i = 1; $i < 40; $i += 4) {
-    $CL->Arguments ("-ORBSvcConf $client_conf "
-                    . " -k file://$iorfile "
-                    . " -n $i -i $iterations -p 10 -x");
-
-    if ($CL->SpawnWaitKill (120) != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			 " -ORBSvcConf client.conf "
+			 . " -k file://$iorfile "
+			 . " -n $i -i $iterations -p 10 -x");
+
+  # Each iteration should take 100 seconds
+  $client = $CL->Wait ();
+  if ($client == -1) {
+    print STDERR "ERROR: client <$i> timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
 }
 
-$JSV->Kill ();
+$server = $SV->Terminate (); $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 print STDERR "================ C++ server test\n";
 
 unlink $iorfile;
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBSvcConf $server_conf"
+                       . " -o $iorfile -n 16");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
 for ($i = 1; $i < 40; $i += 4) {
-    $CL->Arguments (" -ORBSvcConf $client_conf "
-                    . " -k file://$iorfile "
-                    . " -n $i -i $iterations -p 10 -x");
-
-    if ($CL->SpawnWaitKill (120) != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			 " -ORBSvcConf client.conf "
+			 . " -k file://$iorfile "
+			 . " -n $i -i $iterations -p 10 -x");
+
+  # Each iteration should take 100 seconds
+  $client = $CL->Wait ();
+  if ($client == -1) {
+    print STDERR "ERROR: client <$i> timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
 }
 
-$SV->Kill ();
+$server = $SV->Terminate (); $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
-exit $status;
+exit 0;
diff --git a/TAO/performance-tests/Latency/single_threaded.pl b/TAO/performance-tests/Latency/single_threaded.pl
index 6ef0f33ec7e..6a2c12f4ab3 100755
--- a/TAO/performance-tests/Latency/single_threaded.pl
+++ b/TAO/performance-tests/Latency/single_threaded.pl
@@ -5,48 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../../bin";
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-$st_server_conf = PerlACE::LocalFile ("st_server.conf");
-$st_client_conf = PerlACE::LocalFile ("st_client.conf");
+$iorfile = "test.ior";
 
 print STDERR "================ Single-threaded test\n";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("st_server",
-                            " -ORBSvcConf $st_server_conf"
-                            . " -o $iorfile");
+$SV = Process::Create ($EXEPREFIX."st_server$EXE_EXT ",
+                       " -ORBSvcConf st_server.conf"
+                       . " -o $iorfile");
 
-$CL = new PerlACE::Process ("st_client",
-                            " -ORBSvcConf $st_client_conf "
-                            . " -k file://$iorfile "
-                            . " -i 50000");
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-$SV->Spawn ();
+$CL = Process::Create ($EXEPREFIX."st_client$EXE_EXT ",
+                       " -ORBSvcConf st_client.conf "
+                       . " -k file://$iorfile "
+                       . " -i 50000");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (10);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/performance-tests/Latency/st_client.conf b/TAO/performance-tests/Latency/st_client.conf
index 50db6eab3d9..974da8731c6 100644
--- a/TAO/performance-tests/Latency/st_client.conf
+++ b/TAO/performance-tests/Latency/st_client.conf
@@ -4,6 +4,4 @@
 #
 
 static Advanced_Resource_Factory "-ORBresources global -ORBInputCDRAllocator null -ORBReactorType select_st"
-static Resource_Factory "-ORBConnectionCacheLock null"
-static Client_Strategy_Factory "-ORBProfileLock null"
-#  -ORBClientConnectionHandler RW
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
diff --git a/TAO/performance-tests/Latency/st_client.cpp b/TAO/performance-tests/Latency/st_client.cpp
index ee8b4ea1278..d6fe4826b61 100644
--- a/TAO/performance-tests/Latency/st_client.cpp
+++ b/TAO/performance-tests/Latency/st_client.cpp
@@ -160,6 +160,9 @@ main (int argc, char *argv[])
           server->shutdown (ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
+
+      orb->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index b9f3e59ce4d..303ccb4fb73 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -471,7 +471,13 @@ Demux_Test_Server::run (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      if (this->orb_->run (ACE_TRY_ENV) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) Demux_Test_Server::run - "
+                             "orb run failed\n"),
+                            -1);
+        }
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
index edb693dbf93..1c23e2a8df2 100755
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
@@ -5,16 +5,20 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
 
-$T = new PerlACE::Process ("registration");
+$T = Process::Create ($EXEPREFIX."registration".$EXE_EXT, "");
 
-$test = $T->SpawnWaitKill (60);
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp
index 4e6dca6bd58..d1a93d437c9 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp
index 8273d2aa2cc..cab64ea3608 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"

 

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

 

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl
index 830c4f8a718..76dd7418d19 100755
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/run-test.pl
@@ -5,46 +5,53 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-$client_conf = PerlACE::LocalFile ("client.conf");
-$server_conf = PerlACE::LocalFile ("server.conf");
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-$SV = new PerlACE::Process ("server",
-                            " -ORBSvcConf $server_conf "
-                            . " -ORBEndPoint iiop://localhost:0/priority=1 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=2 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=3 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=4 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=5 "
-                            . " -o $iorfile");
-$CL = new PerlACE::Process ("client",
-                            " -ORBSvcConf $client_conf "
-                            . " -i file://$iorfile "
-                            . " -t 1 -t 2 -t 3 -t 4 -t 5 -n 4000");
-                             
+unshift @INC, '../../../../../bin';
+require ACEutils;
+
+$client_conf="client.conf";
+$server_conf="server.conf";
+$iorfile = "test.ior";
+
 print STDERR "================ Endpoint Per Priority Test\n";
 
 unlink $iorfile;
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBSvcConf server.conf"
+		       . " -ORBEndPoint iiop://localhost:0/priority=1 "
+		       . " -ORBEndPoint iiop://localhost:0/priority=2 "
+		       . " -ORBEndPoint iiop://localhost:0/priority=3 "
+                       . " -ORBEndPoint iiop://localhost:0/priority=4 "
+                       . " -ORBEndPoint iiop://localhost:0/priority=5 "
+                       . " -o $iorfile");
+
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -ORBSvcConf client.conf "
+                       . " -i file://$iorfile "
+                       . " -t 1 -t 2 -t 3 -t 4 -t 5 -n 4000");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$client = $CL->SpawnWaitKill(60);
-$SV->Kill ();
+$server = $SV->TimedWait (30);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    exit 1;
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp
index 7761d2a4772..e1bff30e19d 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp
index 435718c0cbd..66d80158c3f 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/Server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"

 

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

 

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl
index 17b493a1953..60c13e346db 100755
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/run-test.pl
@@ -5,23 +5,13 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-$client_conf = PerlACE::LocalFile ("client.conf");
-$server_conf = PerlACE::LocalFile ("server.conf");
-$iorfile = PerlACE::LocalFile ("ior");
-
-$SV = new PerlACE::Process ("server",
-                            " -ORBSvcConf $server_conf"
-                            . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 "
-                            . " -o $iorfile");
-
-$CL = new PerlACE::Process ("client",
-                            " -ORBSvcConf $client_conf "
-                            . " -i file://$iorfile "
-                            . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 -n 40000");
-                       
+unshift @INC, '../../../../../bin';
+require ACEutils;
+
+$client_conf="client.conf";
+$server_conf="server.conf";
+$iorfile = "test.ior";
+
 print STDERR "================ ORB Per Priority Test\n";
 
 unlink $iorfile."_1";
@@ -31,16 +21,33 @@ unlink $iorfile."_4";
 unlink $iorfile."_5";
 unlink $iorfile."_30";
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBSvcConf server.conf"
+                       . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 "
+                       . " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile."_1", 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile."_1", 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
-$SV->Kill (10);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -ORBSvcConf client.conf "
+                       . " -i file://$iorfile "
+                       . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30 -n 40000");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
+
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile."_1";
 unlink $iorfile."_2";
@@ -49,9 +56,9 @@ unlink $iorfile."_4";
 unlink $iorfile."_5";
 unlink $iorfile."_30";
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    exit 1;
+
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp
index b1c7f4b7e7a..8107b74ac2b 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp
index 30de49bfac9..e6864b9a68c 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib RTCORBA_Common.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\Common"

 

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

 

diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl
index e85431f372e..f1de2e49498 100755
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/run-test.pl
@@ -5,52 +5,51 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$client_conf = PerlACE::LocalFile ("client.conf");
-$server_conf = PerlACE::LocalFile ("server.conf");
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-$SV = new PerlACE::Process ("server",
-                            " -ORBSvcConf $server_conf"
-                            . " -o $iorfile");
-
-# Run client with 5 threads of low priority and 1 thread of high priority.
-
-$CL = new PerlACE::Process ("client",
-                            " -ORBSvcConf $client_conf "
-                            . " -i file://$iorfile "
-                            . " -n 10000 "
-                            . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30");
+unshift @INC, '../../../../../bin';
+require ACEutils;
 
+$client_conf="client.conf";
+$server_conf="server.conf";
+$iorfile="test.ior";
 
 print STDERR "================ Single Endpoint Test\n";
 
 unlink $iorfile;
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBSvcConf server.conf"
+                       . " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (10);
+# Run client with 5 threads of low priority and 1 thread of high priority.
 
-unlink $iorfile;
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -ORBSvcConf client.conf "
+                       . " -i file://$iorfile "
+                       . " -n 10000 "
+                       . " -t 1 -t 2 -t 3 -t 4 -t 5 -t 30");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+unlink $iorfile;
+
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 97c1a9d380b..2a6556b837a 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -233,8 +233,8 @@ oneway_payload_test (Test_ptr server,
   QuantifyStartRecordingData ();
 #endif /* USING_QUANTIFY */
 
-  Test::data the_data (payload_size);
-  the_data.length (payload_size);
+  Test::data data (payload_size);
+  data.length (payload_size);
 
   for (CORBA::ULong i = 0; i != iterations; ++i)
     {
@@ -242,7 +242,7 @@ oneway_payload_test (Test_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->oneway_payload_test (the_data,
+      server->oneway_payload_test (data,
                                    ACE_TRY_ENV);
       ACE_CHECK;
 
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
index 6eaee2dc1bb..47d09784e9e 100755
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client_test.pl
@@ -5,17 +5,62 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
+$iorfile = "test.ior";
 $iterations = 4000;
 $bufsize = 4000;
 $work = 10;
+$transport = "";
 $type = "";
+$shutdown = "";
 $all = 1;
 $other = "";
-$status = 0;
+
+sub run_test
+{
+  my $type = shift(@_);
+
+  if ($type == "none" || $type == "transport") {
+    $transport = "-ORBNodelay 0";
+  }
+  else {
+    $transport = "";
+  }
+
+  if ($all == 0) {
+    $shutdown = "-x";
+  }
+
+  print STDERR "\n***************** STARTING TEST ******************\n";
+
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                         " $transport -t $type -i $iterations "
+			 . "-m $bufsize -w $work $shutdown ");
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+}
+
+sub run_buffered
+{
+  my $bufsize = shift (@_);
+
+  print STDERR "\n***************** STARTING TEST ******************\n";
+
+  $CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                         "-ORBNodelay 0 -t none -i $iterations -m $bufsize");
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+}
 
 # Parse the arguments
 
@@ -23,81 +68,64 @@ $status = 0;
 
 @bufsizes = (10, 40, 100, 400, 1000, 2000);
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for TAO Reliable Oneways Test\n\n";
-        print "run_test [-t test type] [-i iterations] [-m buffer size]\n";
-        print "\n";
-        print "-t test type      -- runs only one type of oneway test\n";
-        print "-i iterations     -- number of calls in each test\n";
-        print "-m buffer size    -- queue size for buffered oneways\n";
-        print "-w servant work   -- number of loops of 1000 by servant\n";
-        exit 0;
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+      print "Run_Test Perl script for TAO Reliable Oneways Test\n\n";
+      print "run_test [-t test type] [-i iterations] [-m buffer size]\n";
+      print "\n";
+      print "-t test type        -- runs only one type of oneway test\n";
+      print "-i iterations       -- number of calls in each test\n";
+      print "-m buffer size      -- queue size for buffered oneways\n";
+      print "-w servant work	 -- number of loops of 1000 by servant\n";
+      exit 0;
     }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-m") {
-        $bufsize = $ARGV[$i + 1];
-        $i++;
-        last SWITCH;
+    if ($ARGV[$i] eq "-m")
+    {
+      $bufsize = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-w") {
-        $work = $ARGV[$i + 1];
-        $i++;
-        last SWITCH;
+    if ($ARGV[$i] eq "-w")
+    {
+      $work = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-t") {
-        @types = split (',', $ARGV[$i + 1]);
-        $all = 0;
-        $i++;
-    }
-    else {
-        $other .= $ARGV[$i];
+    if ($ARGV[$i] eq "-t")
+    {
+      @types = split (',', $ARGV[$i + 1]);
+      $all = 0;
+      $i++;
+      last SWITCH;
     }
+    $other .= $ARGV[$i];
+  }
 }
 
-$CL = new PerlACE::Process ("client");
-
 if ($all == 1) {
-    foreach $bufsize (@bufsizes) {
-        print STDERR "\n***************** STARTING TEST ******************\n";
-        $CL->Arguments ("-ORBNodelay 0 -t none -i $iterations -m $bufsize");
-
-        my $client = $CL->SpawnWaitKill (60);
-        
-        if ($client != 0) {
-            print STDERR "ERROR: client returned $client\n";
-            $status = 1;
-        }
-    }
+  foreach $bufsize (@bufsizes) {
+    run_buffered ($bufsize);
+  }
 }
 
 foreach $type (@types) {
-    my $transport = "";
-    my $shutdown = "";
-    
-    if ($type == "none" || $type == "transport") {
-        $transport = "-ORBNodelay 0";
-    }
-
-    if ($all == 0) {
-        $shutdown = "-x";
-    }
-
-    print STDERR "\n***************** STARTING TEST ******************\n";
-
-    $CL->Arguments ("$transport -t $type -i $iterations -m $bufsize -w $work $shutdown");
-
-    my $client = $CL->SpawnWaitKill (60);
-    
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
+  run_test ($type);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl b/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl
index 70f1649babe..05165d051df 100755
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl
@@ -5,134 +5,158 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../../../../bin";
-use PerlACE::Run_Test;
+unshift @INC, '../../../../../bin';
+require ACEutils;
 
+$iorfile = "test.ior";
 $iterations = 4000;
 $bufsize = 4000;
 $work = 10;
+$transport = "";
 $type = "";
 $level = "object";
 $shutdown = "";
 $all = 1;
 $other = "";
 
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("test.ior");
 unlink $iorfile;
 
+sub run_test
+{
+  my $type = shift(@_);
+
+  if ($type == "none" || $type == "transport") {
+    $transport = "-ORBNodelay 0";
+  }
+  else {
+    $transport = "";
+  }
+
+  if ($all == 0) {
+    $shutdown = "-x";
+  }
+
+  print STDERR "\n***************** STARTING TEST ******************\n";
+
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                         " $transport -t $type -i $iterations -l $level"
+			 . " -m $bufsize -w $work $shutdown ");
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+}
+
+sub run_buffered
+{
+  my $bufsize = shift (@_);
+
+  print STDERR "\n***************** STARTING TEST ******************\n";
+
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                         " -ORBNodelay 0 -l $level "
+			 . " -t none -i $iterations -m $bufsize");
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+}
+
 # Parse the arguments
 
 @types = ("none", "transport", "server", "target", "twoway -x");
 
 @bufsizes = (10, 40, 100, 400, 1000, 2000);
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for TAO Reliable Oneways Test\n\n";
-        print "run_test [-t test type] [-i iterations] [-m buffer size]\n";
-        print "\n";
-        print "-t test type        -- runs only one type of oneway test\n";
-        print "-i iterations       -- number of calls in each test\n";
-        print "-l level      -- level at which policy is set\n";
-        print "-m buffer size      -- queue size for buffered oneways\n";
-        print "-w servant work   -- number of loops of 1000 by servant\n";
-        exit 0;
-    }
-    elsif ($ARGV[$i] eq "-i") {
-        $iterations = $ARGV[$i + 1];
-        $i++;
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") 
+    {
+      print "Run_Test Perl script for TAO Reliable Oneways Test\n\n";
+      print "run_test [-t test type] [-i iterations] [-m buffer size]\n";
+      print "\n";
+      print "-t test type        -- runs only one type of oneway test\n";
+      print "-i iterations       -- number of calls in each test\n";
+      print "-l level		 -- level at which policy is set\n";
+      print "-m buffer size      -- queue size for buffered oneways\n";
+      print "-w servant work	 -- number of loops of 1000 by servant\n";
+      exit 0;
     }
-    elsif ($ARGV[$i] eq "-m") {
-        $bufsize = $ARGV[$i + 1];
-        $i++;
-        last SWITCH;
+    if ($ARGV[$i] eq "-i")
+    {
+      $iterations = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-w") {
-        $work = $ARGV[$i + 1];
-        $i++;
-        last SWITCH;
+    if ($ARGV[$i] eq "-m")
+    {
+      $bufsize = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-t") {
-        @types = split (',', $ARGV[$i + 1]);
-        $all = 0;
-        $i++;
+    if ($ARGV[$i] eq "-w")
+    {
+      $work = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-l") {
-        $level = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-t")
+    {
+      @types = split (',', $ARGV[$i + 1]);
+      $all = 0;
+      $i++;
+      last SWITCH;
     }
-    else {
-        $other .= $ARGV[$i];
+    if ($ARGV[$i] eq "-l")
+    {
+      $level = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+    $other .= $ARGV[$i];
+  }
 }
 
-###############################################################################
-
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-###############################################################################
-
 if ($all == 1) {
-    foreach $bufsize (@bufsizes) {
-        print STDERR "\n***************** STARTING TEST ******************\n";
-        
-        $CL->Arguments ("-ORBNodelay 0 -l $level -t none -i $iterations -m $bufsize");
-
-        my $client = $CL->SpawnWaitKill (60);
-        if ($client != 0) {
-            print STDERR "ERROR: client returned $client\n";
-            $status = 1;
-        }
-    }
+  foreach $bufsize (@bufsizes) {
+    run_buffered ($bufsize);
+  }
 }
 
-###############################################################################
-
-print STDERR "\nSyncScope policy set at the $level level\n";
+print STDERR "\nSyncScope policy set at the ";
+print STDERR $level;
+print STDERR " level\n";
 
 foreach $type (@types) {
-    print STDERR "\n***************** STARTING TEST ******************\n";
-
-    my $transport = "";
-    
-    if ($type == "none" || $type == "transport") {
-        $transport = "-ORBNodelay 0";
-    }
-
-    if ($all == 0) {
-        $shutdown = "-x";
-    }
-
-    $CL->Arguments (" $transport -t $type -i $iterations -l $level -m $bufsize -w $work $shutdown ");
-
-    my $client = $CL->SpawnWaitKill (60);
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
+  run_test ($type);
 }
 
-###############################################################################
-
-$server = $SV->WaitKill (5);
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index a3679dfd5b6..ed8013a7a6f 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -72,7 +72,7 @@ set_rt_mode (void)
     ACE_ERROR ((LM_ERROR,
 		"server (%P|%t):thr_setprio failed %p\n",
 		"set_rt_mode"));
-
+  
   // Do a sanity check.
   if (ACE_OS::thr_getprio (self, priority) == 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -151,7 +151,11 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run (ACE_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "orb->run"),
+                          -1);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/performance-tests/Thruput/TAO/server.cpp b/TAO/performance-tests/Thruput/TAO/server.cpp
index e85995bca84..7c7fa6ba0c5 100644
--- a/TAO/performance-tests/Thruput/TAO/server.cpp
+++ b/TAO/performance-tests/Thruput/TAO/server.cpp
@@ -193,8 +193,8 @@ main (int argc, char **argv)
 
       // Handle requests for this object until we're killed, or one of the
       // methods asks us to exit.
-      orb_var->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb_var->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
     }
   ACE_CATCHANY
     {
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 95a082fae91..5a4907d8bb5 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -40,19 +40,7 @@ endif # COMSPEC
 TAO_BASE_LIBS=-lTAO $(ACELIB) $(LIBS)
 TAO_SRVR_LIBS=-lTAO_PortableServer $(TAO_BASE_LIBS)
 TAO_CLNT_LIBS=-lTAO $(TAO_BASE_LIBS)
-#
-# The following simbols has been defined to overcome a 
-# problem with the current QNX RTP linker. In fact for 
-# that platform the relative platform macro file takes 
-# care of adding a number of additional library that are
-# not usually needed on other platforms.
-#
-TAO_DYNAMIC_LIBS+=-lTAO_DynamicInterface
-TAO_COS_NAMING_LIBS+=-lTAO_CosNaming
-TAO_COS_NOTIFICATION_LIBS+=-lTAO_CosNotification
-TAO_RT_SCHED_LIBS+=-lTAO_RTSched
-TAO_FAULT_TOLERANCE_LIBS+=-lTAO_FaultTolerance
-TAO_COS_TRADING_LIBS+=-lTAO_CosTrading
+TAO_DYNAMIC_LIBS=-lTAO_DynamicInterface
 
 ####
 #### Macro customization.
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 6d126659cf9..9b94071da57 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -45,22 +45,14 @@ CORBA_Any::type (CORBA::TypeCode_ptr tc,
     }
 }
 
-// This method is deprecated and will eventually be removed from the
-// spec. It is included here for backward compatibility and its return
-// value may NOT be cast to anything useful. It will only tell whether the
-// Any contains a value or not. Use of >>= is recommended for anything else.
+// TAO doesn't give any guarantees if the value returned by value can
+// be cast to the desired type. This is a deprecated routine and its
+// use must be avoided. Use the >>= operators.
 
 const void *
 CORBA_Any::value (void) const
 {
-  if (this->any_owns_data_)
-    {
-      return this->value_;
-    }
-  else
-    {
-      return this->cdr_;
-    }
+  return this->value_;
 }
 
 // Default "Any" constructor -- initializes to nulls per the
diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp
index c9bef0fdc4e..ff6b9d72eae 100644
--- a/TAO/tao/Asynch_Invocation.cpp
+++ b/TAO/tao/Asynch_Invocation.cpp
@@ -9,9 +9,7 @@ ACE_RCSID(tao, Asynch_Invocation, "$Id$")
 #include "tao/Stub.h"
 #include "tao/Object_KeyC.h"
 #include "tao/Transport_Mux_Strategy.h"
-#include "tao/Transport.h"
-#include "tao/Asynch_Timeout_Handler.h"
-#include "tao/try_macros.h"
+#include "Transport.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Asynch_Invocation.i"
@@ -91,51 +89,20 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
 
   int retval =
     this->transport_->tms ()->bind_dispatcher (this->op_details_.request_id (),
-                                               this->rd_);
+                                                                             this->rd_);
   if (retval == -1)
     {
       // @@ What is the right way to handle this error?
       this->close_connection ();
 
       ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                        TAO_INVOKE_EXCEPTION);
+                                                                       CORBA::COMPLETED_NO),
+                                          TAO_INVOKE_EXCEPTION);
     }
 
-  // AMI Timeout Handling Begin
-
-  if (this->max_wait_time_ != 0)
-    {
-      ACE_Reactor *r = this->orb_core_->reactor ();
-
-      // @@ Michael: Optimization: The timeout handler should actually 
-      //             be allocated on the stack in the reply handler!
-      TAO_Asynch_Timeout_Handler *timeout_handler;
-      ACE_NEW_THROW_EX (timeout_handler,
-                        TAO_Asynch_Timeout_Handler (this->rd_,
-                                                    this->transport_->tms (),
-                                                    this->op_details_.request_id ()),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (TAO_DEFAULT_MINOR_CODE,
-                                                                   ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-      // Let the reply dispatcher remember the timeout_handler
-      this->rd_->timeout_handler (timeout_handler);
-
-      r->schedule_timer (timeout_handler,  // handler
-                         0,                // arg
-                         *this->max_wait_time_);
-    }
-
-  // AMI Timeout Handling End
-
-
-
   // Just send the request, without trying to wait for the reply.
   retval = TAO_GIOP_Invocation::invoke (0,
-                                        ACE_TRY_ENV);
+                                                                      ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
 
   if (retval != TAO_INVOKE_OK)
diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h
index 1ac4ebbd925..c81a99b9ae1 100644
--- a/TAO/tao/Asynch_Invocation.h
+++ b/TAO/tao/Asynch_Invocation.h
@@ -52,8 +52,7 @@ public:
                               const char *operation,
                               CORBA::ULong opname_len,
                               CORBA::Boolean argument_flag,
-                              TAO_ORB_Core *orb_core,
-                              int byte_order = TAO_ENCAP_BYTE_ORDER);
+                              TAO_ORB_Core *orb_core);
 
   /// Send request, without blocking until any reply comes back.
   virtual int invoke (CORBA_Environment &TAO_IN_ENV =
diff --git a/TAO/tao/Asynch_Invocation.i b/TAO/tao/Asynch_Invocation.i
index 657dd6675af..55c806bb4eb 100644
--- a/TAO/tao/Asynch_Invocation.i
+++ b/TAO/tao/Asynch_Invocation.i
@@ -9,15 +9,13 @@ TAO_GIOP_Asynch_Invocation::TAO_GIOP_Asynch_Invocation (
     const char *operation,
     CORBA::ULong opname_len,
     CORBA::Boolean argument_flag,
-    TAO_ORB_Core *orb_core,
-    int byte_order
+    TAO_ORB_Core *orb_core
   )
   : TAO_GIOP_Invocation (stub,
                          operation,
                          opname_len,
                          argument_flag,
-                         orb_core,
-                         byte_order),
+                         orb_core),
     rd_ (0)
 {
 }
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Asynch_Reply_Dispatcher.cpp
index bbc406e5c03..d8177531588 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher.cpp
@@ -8,8 +8,7 @@
 #include "tao/Leader_Follower.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "tao/Transport.h"
-#include "tao/Asynch_Timeout_Handler.h"
+#include "Transport.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Asynch_Reply_Dispatcher.i"
@@ -60,17 +59,6 @@ TAO_Asynch_Reply_Dispatcher_Base::connection_closed (void)
 {
 }
 
-void
-TAO_Asynch_Reply_Dispatcher_Base::reply_timed_out (void)
-{
-}
-
-void
-TAO_Asynch_Reply_Dispatcher_Base::timeout_handler (TAO_Asynch_Timeout_Handler *)
-{
-}
-
-
 // ************************************************************************
 
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
@@ -83,8 +71,7 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher (
   )
   :TAO_Asynch_Reply_Dispatcher_Base (orb_core),
    reply_handler_skel_ (reply_handler_skel),
-   reply_handler_ (Messaging::ReplyHandler::_duplicate (reply_handler)),
-   timeout_handler_ (0)
+   reply_handler_ (Messaging::ReplyHandler::_duplicate (reply_handler))
 {
 }
 
@@ -99,16 +86,6 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (
     TAO_Pluggable_Reply_Params &params
   )
 {
-  // AMI Timeout Handling Begin
-
-  if (this->timeout_handler_)
-    {
-      this->timeout_handler_->cancel ();
-      delete (this->timeout_handler_);
-    }
-
-  // AMI Timeout Handling End
-
   this->reply_status_ = params.reply_status_;
 
   // this->message_state_ = message_state;
@@ -210,61 +187,6 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void)
 
     }
   ACE_ENDTRY;
-
-  // @@ Michael: Shouldn't we commit suicide? I added the delete this.
-  delete this;
 }
 
-// AMI Timeout Handling Begin
-
-void
-TAO_Asynch_Reply_Dispatcher::reply_timed_out (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Generate a fake exception....
-      CORBA::TIMEOUT timeout_failure (
-        CORBA_SystemException::_tao_minor_code (TAO_TIMEOUT_SEND_MINOR_CODE,
-                                                errno),
-         CORBA::COMPLETED_NO);
-
-      TAO_OutputCDR out_cdr;
-
-      timeout_failure._tao_encode (out_cdr, ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      // Turn into an output CDR
-      TAO_InputCDR cdr (out_cdr);
-
-      this->reply_handler_skel_ (cdr,
-                                 this->reply_handler_.in (),
-                                 TAO_AMI_REPLY_SYSTEM_EXCEPTION,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      if (TAO_debug_level >= 4)
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Asynch_Reply_Dispacher::reply_timed_out");
-        }
-
-    }
-  ACE_ENDTRY;
-
-  // This was dynamically allocated. Now the job is done. Commit
-  // suicide here.
-  delete this;
-}
-
-void
-TAO_Asynch_Reply_Dispatcher::timeout_handler (TAO_Asynch_Timeout_Handler *timeout_handler)
-{
-  timeout_handler_ = timeout_handler;
-}
-
-// AMI Timeout Handling End
-
 #endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/Asynch_Reply_Dispatcher.h b/TAO/tao/Asynch_Reply_Dispatcher.h
index 1e26c905518..71fd4cbd9ff 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher.h
@@ -27,7 +27,6 @@
 
 class TAO_Pluggable_Reply_Params;
 class TAO_ORB_Core ;
-class TAO_Asynch_Timeout_Handler;
 
 
 
@@ -58,12 +57,6 @@ public:
 
   virtual void connection_closed (void);
 
-    /// Inform that the reply timed out
-  virtual void reply_timed_out (void);
-
-  /// Install the timeout handler
-  virtual void timeout_handler (TAO_Asynch_Timeout_Handler *timeout_handler);
-
 protected:
   /// The service context list.
   /**
@@ -109,21 +102,12 @@ public:
 
   virtual void connection_closed (void);
 
-  /// Inform that the reply timed out
-  virtual void reply_timed_out (void);
-
-  /// Install the timeout handler
-  virtual void timeout_handler (TAO_Asynch_Timeout_Handler *timeout_handler);
-
 private:
   /// Skeleton for the call back method in the Reply Handler.
   const TAO_Reply_Handler_Skeleton reply_handler_skel_;
 
   /// Reply Handler passed in the Asynchronous Invocation.
   Messaging::ReplyHandler_var reply_handler_;
-
-  /// Timeout Handler in case of AMI timeouts
-  TAO_Asynch_Timeout_Handler *timeout_handler_;
 };
 
 #endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/Asynch_Timeout_Handler.cpp b/TAO/tao/Asynch_Timeout_Handler.cpp
deleted file mode 100644
index e0e03a4ab32..00000000000
--- a/TAO/tao/Asynch_Timeout_Handler.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-
-
-#include "tao/Asynch_Timeout_Handler.h"
-
-#include "ace/Reactor.h"
-#include "tao/Asynch_Reply_Dispatcher.h"
-#include "tao/Transport_Mux_Strategy.h"
-
-
-ACE_RCSID(tao, Asynch_Timeout_Handler, "$Id$")
-
-
-#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
-
-
-TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler (
-  TAO_Asynch_Reply_Dispatcher_Base *rd,
-  TAO_Transport_Mux_Strategy *tms,
-  CORBA::ULong request_id)
-  : rd_ (rd),
-    tms_ (tms),
-    request_id_ (request_id)
-{
-
-}
-
-TAO_Asynch_Timeout_Handler::~TAO_Asynch_Timeout_Handler ()
-{
-
-}
-
-int 
-TAO_Asynch_Timeout_Handler::handle_timeout (const ACE_Time_Value &,
-                                            const void *)
-{
-  tms_->unbind_dispatcher (request_id_);
-
-  rd_->reply_timed_out ();
-
-  errno = 0;
-
-  // let the reactor unregister us.
-  return -1;
-}
-
-int
-TAO_Asynch_Timeout_Handler::handle_close (ACE_HANDLE,
-                                          ACE_Reactor_Mask)
-{
-  // commit suicide, we are a per invocation object.
-  delete this;
-
-  // @@ Michael: We should avoid dynamic creation of the timeout
-  //             handler, so that it is statically allocated 
-  //             in the asynch reply dispatcher. Thanks to Carlos
-  //             for this hint.
-
-  return 0;
-}
-
-
-
-void
-TAO_Asynch_Timeout_Handler::cancel ()
-{
-  this->reactor ()->cancel_timer (this);
-
-  // The reply handler, which invokes this operation is going
-  // to delete this object.
-}
-
-#endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
diff --git a/TAO/tao/Asynch_Timeout_Handler.h b/TAO/tao/Asynch_Timeout_Handler.h
deleted file mode 100644
index 2eccee1ddda..00000000000
--- a/TAO/tao/Asynch_Timeout_Handler.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Asynch_Timeout_Handler.h
- *
- *  $Id$
- *
- *  Timeout Handler for AMI timeouts
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
-
-#ifndef TAO_ASYNCH_TIMEOUT_HANDLER_H
-#define TAO_ASYNCH_TIMEOUT_HANDLER_H
-#include "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#  pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
-
-#include "ace/Event_Handler.h"
-#include "tao/TAO_Export.h"
-#include "tao/corbafwd.h"
-
-class TAO_Asynch_Reply_Dispatcher_Base;
-class TAO_Transport_Mux_Strategy;
-
-
-class TAO_Export TAO_Asynch_Timeout_Handler
-  : public ACE_Event_Handler
-{
-  // = TITLE
-  //    TAO_Asynch_Timeout_Handler
-  //
-  // = DESCRIPTION
-  //    Handler registered with the reactor in case of AMI 
-  //    timeouts.
-  //
-public:
-  TAO_Asynch_Timeout_Handler (TAO_Asynch_Reply_Dispatcher_Base *rd,
-                              TAO_Transport_Mux_Strategy *tms,
-                              CORBA::ULong request_id);
-
-  ~TAO_Asynch_Timeout_Handler ();
-
-  /// Invoked by the reactor on timeout
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act);
-
-  /// Invoked by the reactor on unregistration
-  virtual int handle_close (ACE_HANDLE,
-                            ACE_Reactor_Mask);
-
-  /// Cancel this timer, remove it from the reactor
-  virtual void cancel ();
-
-public:
-  /// The reply dispatcher expecting the reply
-  TAO_Asynch_Reply_Dispatcher_Base *rd_;
-
-  /// The transport mux strategy dispatching the reply
-  TAO_Transport_Mux_Strategy *tms_;
-
-  /// Remember the ID of the request.
-  CORBA::ULong request_id_;
-};
-
-#endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */
-
-#include "ace/post.h"
-#endif /* TAO_ASYNCH_TIMEOUT_HANDLER_H */
diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp
new file mode 100644
index 00000000000..bd49b02ad86
--- /dev/null
+++ b/TAO/tao/Block_Flushing_Strategy.cpp
@@ -0,0 +1,33 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Block_Flushing_Strategy.h"
+#include "Transport.h"
+#include "Queued_Message.h"
+
+ACE_RCSID(tao, Block_Flushing_Strategy, "$Id$")
+
+int
+TAO_Block_Flushing_Strategy::schedule_output (TAO_Transport *)
+{
+  return 0;
+}
+
+int
+TAO_Block_Flushing_Strategy::cancel_output (TAO_Transport *)
+{
+  return 0;
+}
+
+int
+TAO_Block_Flushing_Strategy::flush_message (TAO_Transport *transport,
+                                            TAO_Queued_Message *msg)
+{
+  while (!msg->done ())
+    {
+      int result = transport->handle_output ();
+      if (result == -1)
+        return -1;
+    }
+  return 0;
+}
diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h
new file mode 100644
index 00000000000..82af3a0cd3e
--- /dev/null
+++ b/TAO/tao/Block_Flushing_Strategy.h
@@ -0,0 +1,38 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Block_Flushing_Strategy.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_BLOCK_FLUSHING_STRATEGY_H
+#define TAO_BLOCK_FLUSHING_STRATEGY_H
+#include "ace/pre.h"
+
+#include "Flushing_Strategy.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Block_Flushing_Strategy
+ *
+ * @brief Implement a flushing strategy that blocks on write to flush
+ */
+class TAO_Export TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy
+{
+public:
+  virtual int schedule_output (TAO_Transport *transport);
+  virtual int cancel_output (TAO_Transport *transport);
+  virtual int flush_message (TAO_Transport *transport,
+                             TAO_Queued_Message *msg);
+};
+
+#include "ace/post.h"
+#endif  /* TAO_BLOCK_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp
deleted file mode 100644
index 211a9cb1d7c..00000000000
--- a/TAO/tao/CDR_Encaps_Codec.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "CDR.h"
-#include "OctetSeqC.h"
-#include "Any.h"
-#include "Typecode.h"
-#include "Marshal.h"
-
-#include "CDR_Encaps_Codec.h"
-
-ACE_RCSID (TAO_CodecFactory,
-           CDR_Encaps_Codec,
-           "$Id$")
-
-
-TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major,
-					    CORBA::Octet minor)
-  : major_ (major),
-    minor_ (minor)
-{
-}
-
-TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
-{
-}
-
-CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data,
-			      CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::InvalidTypeForEncoding))
-{
-  this->check_type_for_encoding (data,
-				 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // ----------------------------------------------------------------
-
-  TAO_OutputCDR cdr;
-  if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-      && (cdr << data))
-    {
-      CORBA::OctetSeq * octet_seq = 0;
-
-      ACE_NEW_THROW_EX (octet_seq,
-                        CORBA::OctetSeq,
-                        CORBA::NO_MEMORY (
-                          CORBA_SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::OctetSeq_var safe_octet_seq = octet_seq;
-
-      octet_seq->length (cdr.total_length ());
-      CORBA::Octet *buf = octet_seq->get_buffer ();
-
-      for (const ACE_Message_Block *i = cdr.begin ();
-           i != 0;
-           i = i->cont ())
-        {
-          size_t len = i->length ();
-          ACE_OS_String::memcpy (buf, i->rd_ptr (), len);
-          buf += len;
-        }
-
-      return safe_octet_seq._retn ();
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-}
-
-CORBA::Any *
-TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data,
-			      CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::FormatMismatch))
-{
-  // @todo How do we check for a format mismatch so that we can throw
-  //       a IOP::Codec::FormatMismatch exception?
-  // @todo Is this the best way to extract the Any from the OctetSeq?
-
-  // Notice that we need to extract the TypeCode and the value from
-  // the octet sequence, and place them into the Any.  We can't just
-  // insert the octet sequence into the Any.
-
-  TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                          data.get_buffer ()),
-                    data.length ());
-
-  CORBA::Boolean byte_order;
-  if (cdr >> TAO_InputCDR::to_boolean (byte_order))
-    {
-      cdr.reset_byte_order (ACE_static_cast (int, byte_order));
-
-      CORBA::Any * any = 0;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY (
-                          CORBA_SystemException::_tao_minor_code (
-                           TAO_DEFAULT_MINOR_CODE,
-                           ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any = any;
-
-      if (cdr >> (*any))
-        return safe_any._retn ();
-    }
-
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (), 0);
-}
-
-CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data,
-				    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::InvalidTypeForEncoding))
-{
-  this->check_type_for_encoding (data,
-				 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // ----------------------------------------------------------------
-  TAO_OutputCDR cdr;
-
-  if ((cdr << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
-    {
-      CORBA::TypeCode_var tc = data.type ();
-
-      TAO_InputCDR input (data._tao_get_cdr (),
-                          data._tao_byte_order ());
-
-      TAO_Marshal_Object::perform_append (tc.in (),
-                                          &input,
-                                          &cdr,
-                                          ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // TAO extension: replace the contents of the octet sequence with
-      // the CDR stream.
-      CORBA::OctetSeq * octet_seq = 0;
-
-      ACE_NEW_THROW_EX (octet_seq,
-                        CORBA::OctetSeq,
-                        CORBA::NO_MEMORY (
-                          CORBA_SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (0);
-
-      CORBA::OctetSeq_var safe_octet_seq = octet_seq;
-
-      octet_seq->length (cdr.total_length ());
-      CORBA::Octet *buf = octet_seq->get_buffer ();
-
-      for (const ACE_Message_Block *i = cdr.begin ();
-           i != 0;
-           i = i->cont ())
-        {
-          size_t len = i->length ();
-          ACE_OS_String::memcpy (buf, i->rd_ptr (), len);
-          buf += len;
-        }
-
-      return safe_octet_seq._retn ();
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (), 0);  
-}
-
-CORBA::Any *
-TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
-				    CORBA::TypeCode_ptr tc,
-				    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::Codec::FormatMismatch,
-		   IOP::Codec::TypeMismatch))
-{
-  // @todo How do we check for a type mismatch so that we can
-  //       throw a IOP::Codec::TypeMismatch exception?
-  //       @@ I added a check below.  See the comment.  I'm not sure
-  //          if it is a valid check.
-  //             -Ossama
-
-  // @todo Most of this code was copied from
-  //         operator>> (TAO_InputCDR &cdr, CORBA::Any &x)
-  //       in Any.cpp.  Rather than copy the code, the code should be
-  //       refactored to make it possible to use the given TypeCode
-  //       rather than attempt to extract it from the CDR
-  //       encapsulation.
-
-  CORBA::ULong sequence_length = data.length ();
-  TAO_InputCDR cdr (ACE_reinterpret_cast (const char*,
-                                          data.get_buffer ()),
-                    sequence_length);
-
-  CORBA::Boolean byte_order;
-  if (cdr >> TAO_InputCDR::to_boolean (byte_order))
-    {
-      cdr.reset_byte_order (ACE_static_cast (int, byte_order));
-
-      // @@ (JP) The following code depends on the fact that
-      //         TAO_InputCDR does not contain chained message blocks,
-      //         otherwise <begin> and <end> could be part of
-      //         different buffers!
-
-      // This will be the start of a new message block.
-      char *begin = cdr.rd_ptr ();
-
-      // Skip over the next argument.
-      CORBA::TypeCode::traverse_status status =
-        TAO_Marshal_Object::perform_skip (tc, &cdr, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);  // @@ Should we throw a
-                             //    IOP::Codec::TypeMismatch exception
-                             //    here if this fails?
-
-      if (status == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          // This will be the end of the new message block.
-          char *end = cdr.rd_ptr ();
-
-          size_t size = end - begin;
-
-          // @@ I added the following check, but I'm not sure if it is
-          //    a valid check.  Can someone verify this?
-          //          -Ossama
-
-          // If the unaligned buffer size is not equal to the octet
-          // sequence length (minus the "byte order byte") then the
-          // TypeCode does not correspond to the data in the CDR
-          // encapsulation.  However, even if they do match it is
-          // still uncertain if the TypeCode corresponds to the data
-          // in the octet sequence.  With this test, it is only
-          // possible to determine if the TypeCode does *not* match
-          // the data, not if it does match.
-          if (size != sequence_length - 1)
-            ACE_THROW_RETURN (IOP::Codec::TypeMismatch (), 0);
-
-          ACE_Message_Block mb (size + ACE_CDR::MAX_ALIGNMENT);
-          ACE_CDR::mb_align (&mb);
-          ptr_arith_t offset =
-            ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-          mb.rd_ptr (offset);
-          mb.wr_ptr (offset + size);
-
-          ACE_OS::memcpy (mb.rd_ptr (), begin, size);
-
-          CORBA::Any * any = 0;
-          ACE_NEW_THROW_EX (any,
-                            CORBA::Any,
-                            CORBA::NO_MEMORY (
-                              CORBA_SystemException::_tao_minor_code (
-                                TAO_DEFAULT_MINOR_CODE,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
-          ACE_CHECK_RETURN (0);
-
-          CORBA::Any_var safe_any = any;
-
-          // Stick it into the Any.  It gets duplicated there.
-          any->_tao_replace (tc,
-                             cdr.byte_order (),
-                             &mb);
-
-          return safe_any._retn ();
-        }
-      else
-        ACE_THROW_RETURN (IOP::Codec::TypeMismatch (), 0);
-    }
-
-  ACE_THROW_RETURN (IOP::Codec::FormatMismatch (), 0);
-}
-
-void
-TAO_CDR_Encaps_Codec::check_type_for_encoding (
-  const CORBA::Any & data,
-  CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ TODO: Are there any other conditions we need to check?
-
-  CORBA::TypeCode_var typecode = data.type ();
-  if (this->major_ == 1
-      && this->minor_ == 0
-      && typecode->equivalent (CORBA::_tc_wstring))
-    ACE_THROW (IOP::Codec::InvalidTypeForEncoding ());
-}
diff --git a/TAO/tao/CDR_Encaps_Codec.h b/TAO/tao/CDR_Encaps_Codec.h
deleted file mode 100644
index bf8189983e0..00000000000
--- a/TAO/tao/CDR_Encaps_Codec.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file CDR_Encaps_Codec.h
- *
- * $Id$
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CDR_ENCAPS_CODEC_H
-#define TAO_CDR_ENCAPS_CODEC_H
-
-#include "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IOPC.h"
-#include "LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/**
- * @class TAO_CDR_Encaps_Codec
- *
- * @brief Implementation of a CDR encapsulation coder/decoder
- * (Codec).
- *
- * This coder/decoder (Codec) class encodes and decodes data to and
- * from a CDR encapsulation, respectively.  It is useful for creation
- * of octet sequences that contain CDR encapsulations.  Those octet
- * sequences can then be placed in a IOP::ServiceContext or an
- * IOP::TaggedComponent, for example.
- *
- * @note This Codec should not be used for operations internal to the
- * ORB core since it uses interpretive marshaling rather than compiled
- * marshaling.
- */
-class TAO_Export TAO_CDR_Encaps_Codec
-  : public virtual IOP::Codec,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /// Constructor.
-  TAO_CDR_Encaps_Codec (CORBA::Octet major, CORBA::Octet minor);
-
-  /// Encode the given data, including the TypeCode, into an octet
-  /// sequence.
-  virtual CORBA::OctetSeq * encode (const CORBA::Any & data,
-				    CORBA::Environment &ACE_TRY_ENV =
-				      TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::Codec::InvalidTypeForEncoding));
-
-  // Extract the TypeCode and the value from the octet sequence and
-  // place them into an Any.
-  virtual CORBA::Any * decode (const CORBA::OctetSeq & data,
-			       CORBA::Environment &ACE_TRY_ENV =
-			         TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::Codec::FormatMismatch));
-
-  /// Encode the given data, excluding the TypeCode, into an octet
-  /// sequence.
-  virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data,
-					  CORBA::Environment &ACE_TRY_ENV =
-					    TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::Codec::InvalidTypeForEncoding));
-
-  // Extract the value from the octet sequence, based on the given
-  // TypeCode,  and place it into an Any.
-  virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data,
-				     CORBA::TypeCode_ptr tc,
-				     CORBA::Environment &ACE_TRY_ENV =
-				       TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::Codec::FormatMismatch,
-		     IOP::Codec::TypeMismatch));
-
-protected:
-
-  /// Destructor.
-  /**
-   * Only allow this class to be instantiated on the heap since it is
-   * reference counted.
-   */
-  ~TAO_CDR_Encaps_Codec (void);
-
-  /// Verify that it is possible to encode the given data using this
-  /// Codec.
-  /**
-   * Typical reasons for failure include attempting to encode a type
-   * that isn't supported for the version of GIOP associated with this
-   * Codec.
-   */
-  void check_type_for_encoding (const CORBA::Any & data,
-				CORBA::Environment &ACE_TRY_ENV);
-
-private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CDR_Encaps_Codec &))
-
-private:
-
-  /// The major GIOP version associated with this Codec.
-  CORBA::Octet major_;
-
-  /// The minor GIOP version associated with this Codec.
-  CORBA::Octet minor_;
-
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-
-#endif  /* TAO_CDR_ENCAPS_CODEC_H */
-
diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp
index c607c4cfa68..e5db10dbeef 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -3,16 +3,14 @@
 #include "CORBALOC_Parser.h"
 #include "ORB_Core.h"
 #include "Stub.h"
-#include "MProfile.h"
 #include "Connector_Registry.h"
 
+#include "tao/IIOP_Endpoint.h"
 #if !defined(__ACE_INLINE__)
 #include "CORBALOC_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO,
-           CORBALOC_Parser,
-           "$Id$")
+ACE_RCSID(tao, CORBALOC_Parser, "$Id$")
 
 TAO_CORBALOC_Parser::~TAO_CORBALOC_Parser (void)
 {
@@ -54,9 +52,9 @@ TAO_CORBALOC_Parser::parse_string_count_helper (const char * &corbaloc_name,
             {
               ACE_ERROR((LM_ERROR,
                          ACE_TEXT ("TAO (%P|%t) Invalid Syntax\n")));
-
+              
               ACE_THROW (CORBA::BAD_PARAM (TAO_OMG_VMCID |
-                                           TAO_OMG_MINOR_BAD_PARAM_10,
+                            TAO_OMG_MINOR_BAD_PARAM_10,
                                            CORBA::COMPLETED_NO));
             }
         }
@@ -83,7 +81,7 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
                                         ACE_CString &key_string,
                                         CORBA::ULong
                                         &addr_list_length,
-                                        CORBA::ORB_ptr orb,
+                                        CORBA::ORB_ptr orb_var,
                                         TAO_MProfile &mprofile,
                                         CORBA::Environment
                                         &ACE_TRY_ENV)
@@ -108,7 +106,7 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
 
   if (ACE_OS::strncmp (cloc_name_ptr,
                        protocol_prefix,
-                       sizeof (protocol_prefix) - 1) == 0)
+                       sizeof (protocol_prefix)-1) == 0)
     {
       // If there is no protocol explicitly specified, it defaults
       // down to <iiop:> ... so allocate memory even for that and
@@ -129,10 +127,8 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
       ACE_OS::strcat (end_point,
                       protocol_suffix_append);
 
-      ACE_CString host_name_port =
-        cloc_name_cstring.substring (pos_colon + 1,
-                                     -1);
-
+      ACE_CString host_name_port = cloc_name_cstring.substring (pos_colon+1,
+                                                                -1);
       ACE_OS::strcat (end_point,
                       host_name_port.c_str ());
 
@@ -141,7 +137,7 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
     {
       // The case where the protocol to be used is explicitly
       // specified.
-
+ 
       // Allocate memory for the end_point.
       end_point = CORBA::string_alloc (addr_list_length +
                                        1 + // For the seperator
@@ -153,7 +149,7 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
 
       // Form the End_Point
 
-      // Example:
+      // Example: 
       // prot_name.c_str () = iiop
       ACE_OS::strcpy (end_point,
                       prot_name.c_str ());;
@@ -167,16 +163,15 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
 
       // The End_point will now be 'iiop://'
 
-      ACE_CString host_name_port =
-        cloc_name_cstring.substring (pos_colon + 1, -1);
+      ACE_CString host_name_port = cloc_name_cstring.substring (pos_colon+1,
+                                                                -1);
 
       ACE_OS::strcat (end_point,
                       host_name_port.c_str ());
 
       // Example:
-      // The End_point will now be of the form
-      // 'iiop://1.0@doc.ece.uci.edu:12345'
-
+      // The End_point will now be 'iiop://doc.ece.uci.edu:12345'
+      
     }
 
   if (ACE_OS::strncmp (cloc_name_ptr,
@@ -199,13 +194,13 @@ TAO_CORBALOC_Parser::assign_key_string (char * &cloc_name_ptr,
   ACE_OS::strcat (end_point,
                   key_string.c_str ());
 
-  // Example: The End_point will now be of the form:
-  // 'iiop://1.0@doc.ece.uci.edu:12345/object_name'
+  // Example: The End_point will now be 
+  // 'iiop://doc.ece.uci.edu:12345/object_name'
 
   // Call the mprofile helper which makes an mprofile for this
   // endpoint and adds it to the big mprofile.
-  this->parse_string_mprofile_helper (end_point.in (),
-                                      orb,
+  this->parse_string_mprofile_helper (end_point,
+                                      orb_var,
                                       mprofile,
                                       ACE_TRY_ENV);
   ACE_CHECK;
@@ -215,8 +210,9 @@ void
 TAO_CORBALOC_Parser::parse_string_assign_helper (CORBA::ULong
                                                  &addr_list_length,
                                                  ACE_CString &key_string,
-                                                 ACE_CString &cloc_name,
-                                                 CORBA::ORB_ptr orb,
+                                                 ACE_CString
+                                                 &cloc_name,
+                                                 CORBA::ORB_ptr orb_var,
                                                  TAO_MProfile &mprofile,
                                                  CORBA::Environment
                                                  &ACE_TRY_ENV)
@@ -235,12 +231,12 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (CORBA::ULong
   while (cloc_name_ptr != 0)
     {
       // Forms the endpoint and calls the mprofile_helper.
-      this->assign_key_string (cloc_name_ptr,
-                               key_string,
-                               addr_list_length,
-                               orb,
-                               mprofile,
-                               ACE_TRY_ENV);
+      assign_key_string (cloc_name_ptr,
+                         key_string,
+                         addr_list_length,
+                         orb_var,
+                         mprofile,
+                         ACE_TRY_ENV);
       ACE_CHECK;
 
       // Get the next token.
@@ -252,24 +248,26 @@ TAO_CORBALOC_Parser::parse_string_assign_helper (CORBA::ULong
 
 
 void
-TAO_CORBALOC_Parser::parse_string_mprofile_helper (
-    const char * end_point,
-    CORBA::ORB_ptr orb,
-    TAO_MProfile &mprofile,
-    CORBA::Environment &ACE_TRY_ENV)
+TAO_CORBALOC_Parser::parse_string_mprofile_helper (CORBA::String_var
+                                                   end_point,
+                                                   CORBA::ORB_ptr orb_var,
+                                                   TAO_MProfile &mprofile,
+                                                   CORBA::Environment
+                                                   &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  /// = new TAO_MProfile;
   TAO_MProfile jth_mprofile;
 
   int retv =
-    orb->orb_core ()->connector_registry ()->make_mprofile (end_point,
-                                                            jth_mprofile,
-                                                            ACE_TRY_ENV);
-  ACE_CHECK;
+    orb_var->orb_core ()->connector_registry ()->make_mprofile(
+                                                    end_point.in (),
+                                                    jth_mprofile,
+                                                    ACE_TRY_ENV);
 
   if (retv != 0)
     {
-      ACE_THROW (CORBA::INV_OBJREF (
+      ACE_THROW(CORBA::INV_OBJREF (
                    CORBA_SystemException::_tao_minor_code (
                       TAO_DEFAULT_MINOR_CODE,
                       EINVAL),
@@ -289,36 +287,38 @@ TAO_CORBALOC_Parser::parse_string_mprofile_helper (
 }
 
 CORBA::Object_ptr
-TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
+TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb_var,
                                               TAO_MProfile &mprofile,
                                               CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Create a TAO_Stub.
+  CORBA::Object_ptr obj = CORBA::Object::_nil ();
+
+  // Now make the TAO_Stub.
   TAO_Stub *data = 0;
   ACE_NEW_THROW_EX (data,
                     TAO_Stub ((const char *) 0,
                               mprofile,
-                              orb->orb_core ()),
-                    CORBA::NO_MEMORY (
-                      CORBA_SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
+                              orb_var->orb_core ()),
+                        CORBA::NO_MEMORY (
+                          CORBA_SystemException::_tao_minor_code (
+                            TAO_DEFAULT_MINOR_CODE,
+                            ENOMEM),
+                          CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   TAO_Stub_Auto_Ptr safe_data (data);
 
-  CORBA::Object_var obj = orb->orb_core ()->create_object (data);
+  obj = orb_var->orb_core ()->create_object (data);
 
-  if (!CORBA::is_nil (obj.in ()))
+  if (!CORBA::is_nil (obj))
     {
       /// All is well, so release the stub object from its
       /// auto_ptr.
       (void) safe_data.release ();
 
       /// Return the object reference to the application.
-      return obj._retn ();
+      return obj;
     }
 
   /// Shouldnt come here: if so, return nil reference.
@@ -328,11 +328,11 @@ TAO_CORBALOC_Parser::make_stub_from_mprofile (CORBA::ORB_ptr orb,
 CORBA::Object_ptr
 TAO_CORBALOC_Parser::parse_string_rir_helper (const char *
                                               &corbaloc_name,
-                                              CORBA::ORB_ptr orb,
+                                              CORBA::ORB_ptr orb_var,
                                               CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-
+  CORBA::Object_ptr rir_obj = CORBA::Object::_nil ();
 
   // "rir" protocol. Pass the key string as an
   // argument to the resolve_initial_references.
@@ -345,12 +345,11 @@ TAO_CORBALOC_Parser::parse_string_rir_helper (const char *
       key_string =  "NameService";
     }
 
-  CORBA::Object_var rir_obj =
-    orb->resolve_initial_references (key_string,
-                                     ACE_TRY_ENV);
+  rir_obj = orb_var->resolve_initial_references (key_string,
+                                             ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return rir_obj._retn ();
+  return rir_obj;
 }
 
 int
@@ -384,17 +383,19 @@ TAO_CORBALOC_Parser::parse_string (const char *ior,
                                    CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  /// MProfile which consists of the profiles for each endpoint.
+  CORBA::ORB_var orb_var = CORBA::ORB::_duplicate (orb);
+
+  /// One big mprofile which consists the profiles of all the endpoints.
   TAO_MProfile mprofile;
 
-  // Skip the prefix.  We know it is there because this method is only
-  // called if match_prefix() returns 1.
+  // Skip the prefix, we know it is there because this method in only
+  // called if <match_prefix> returns 1.
   const char *corbaloc_name =
     ior + sizeof corbaloc_prefix - 1;
 
   CORBA::Object_ptr object = CORBA::Object::_nil ();
 
-  // Number of endpoints
+  // No of endpoints
   CORBA::ULong count_addr = 1;
 
   // Length of obj_addr_list
@@ -411,12 +412,12 @@ TAO_CORBALOC_Parser::parse_string (const char *ior,
                                        ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-      // Convert corbaloc_name to an ACE_CString
+      // Convert corbaloc_name as a ACE_CString
       ACE_CString corbaloc_name_str (corbaloc_name, 0, 1);
 
       // Get the key_string which is a substring of corbaloc_name_str
       ACE_CString key_string =
-        corbaloc_name_str.substring ((addr_list_length + 1), -1);
+        corbaloc_name_str.substring ((addr_list_length+1), -1);
 
       // Copy the <obj_addr_list> to cloc_name.
       ACE_CString cloc_name (corbaloc_name,
@@ -424,20 +425,20 @@ TAO_CORBALOC_Parser::parse_string (const char *ior,
                              0,
                              1);
 
-      // Get each endpoint: For each endpoint, make a MProfile and add
-      // it to the main MProfile whose reference is passed to the
+      // Get each endpoint: For each endpoint, make a mprofile and add
+      // it to the one big mprofile whose reference is passed to the
       // application
       this->parse_string_assign_helper (addr_list_length,
                                         key_string,
                                         cloc_name,
-                                        orb,
+                                        orb_var.in (),
                                         mprofile,
                                         ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
       // Create the stub for the mprofile and get the object reference
       // to it which is to be returned to the client application.
-      object = this->make_stub_from_mprofile (orb,
+      object = this->make_stub_from_mprofile (orb_var.in (),
                                               mprofile,
                                               ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -446,7 +447,7 @@ TAO_CORBALOC_Parser::parse_string (const char *ior,
     {
       // RIR case:
       object = this->parse_string_rir_helper (corbaloc_name,
-                                              orb,
+                                              orb_var.in (),
                                               ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
@@ -466,5 +467,5 @@ ACE_FACTORY_DEFINE (TAO, TAO_CORBALOC_Parser)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Array_Base<char *>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Array_Base<char *>
+pragma instantiate ACE_Array_Base<char *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index 579de3bfdf1..d4399129950 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,14 +17,19 @@
 
 #include "tao/IOR_Parser.h"
 
+// @@ Priyanka: notice how many includes I was able to remove.  In
+// general you should try to minimize the number of #includes in your
+// .h files.  In fact, I believe that once you remove the orb_ and
+// mprofile_ fields below these two includes can go away too!
+#include "tao/ORB.h"
+#include "tao/MProfile.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
 
-class TAO_MProfile;
-
 /**
  * @class TAO_CORBALOC_Parser
  *
@@ -74,10 +78,11 @@ private:
    * the Object represented by the key_string is obtained and passed
    * to the application.
    */
-  virtual void parse_string_mprofile_helper (const char * end_point,
-                                             CORBA::ORB_ptr orb,
-                                             TAO_MProfile &mprofile,
-                                             CORBA::Environment &)
+  virtual void
+    parse_string_mprofile_helper (CORBA::String_var end_point,
+                                  CORBA::ORB_ptr orb,
+                                  TAO_MProfile &mprofile,
+                                  CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
@@ -103,7 +108,7 @@ private:
   virtual void parse_string_assign_helper (CORBA::ULong &addr_list_length,
                                            ACE_CString &key_string,
                                            ACE_CString &cloc_name,
-                                           CORBA::ORB_ptr orb,
+                                           CORBA::ORB_ptr orb_var,
                                            TAO_MProfile &mprofile,
                                            CORBA::Environment &)
     ACE_THROW_SPEC ((CORBA::SystemException));
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index db257d5819c..2d9938e2a3a 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -7,9 +7,7 @@
 #include "Stub.h"
 #include "Tagged_Components.h"
 
-ACE_RCSID (TAO,
-           ClientRequestInfo,
-           "$Id$")
+ACE_RCSID (tao, ClientRequestInfo, "$Id$")
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -20,7 +18,7 @@ ACE_RCSID (TAO,
 TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO_GIOP_Invocation *inv,
                                               CORBA::Object_ptr target)
   : invocation_ (inv),
-    target_ (target), // No need to duplicate.
+    target_ (CORBA::Object::_duplicate (target)),
     caught_exception_ (0),
     response_expected_ (1),
     reply_status_ (-1)
@@ -31,14 +29,25 @@ CORBA::Object_ptr
 TAO_ClientRequestInfo::target (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return CORBA::Object::_duplicate (this->target_);
+  if (this->reply_status_ ==
+      PortableInterceptor::LOCATION_FORWARD_PERMANENT)
+    {
+      // TAO_GIOP_Invocation::forward_reference() already duplicates
+      // the reference before returning it so there is no need to
+      // duplicate it here.
+      return this->invocation_->forward_reference ();
+    }
+
+  return CORBA::Object::_duplicate (this->target_.in ());
 }
 
 CORBA::Object_ptr
 TAO_ClientRequestInfo::effective_target (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
+  if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD
+      || this->reply_status_ ==
+           PortableInterceptor::LOCATION_FORWARD_PERMANENT)
     {
       // TAO_GIOP_Invocation::forward_reference() already duplicates
       // the reference before returning it so there is no need to
@@ -46,7 +55,7 @@ TAO_ClientRequestInfo::effective_target (CORBA::Environment &)
       return this->invocation_->forward_reference ();
     }
 
-  return CORBA::Object::_duplicate (this->target_);
+  return CORBA::Object::_duplicate (this->target_.in ());
 }
 
 IOP::TaggedProfile *
@@ -84,12 +93,13 @@ TAO_ClientRequestInfo::received_exception (CORBA::Environment &ACE_TRY_ENV)
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
       && this->reply_status_ != PortableInterceptor::USER_EXCEPTION)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO), 0);
+      // @@ Need the minor code once it is available.
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
     }
 
   // The spec says that if it is a user exception which can't be
   // inserted then the UNKNOWN exception needs to be thrown with minor
-  // code 1.
+  // code TBD_U.
 
   CORBA::Any * temp = 0;
 
@@ -127,9 +137,9 @@ TAO_ClientRequestInfo::received_exception_id (
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
       && this->reply_status_ != PortableInterceptor::USER_EXCEPTION)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      // Need the minor code from the PI spec once it becomes
+      // available.
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
     }
 
   return CORBA::string_dup (this->caught_exception_->_id ());
@@ -141,96 +151,32 @@ TAO_ClientRequestInfo::get_effective_component (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_Tagged_Components &ecs =
-    this->target_->_stubobj ()->profile_in_use ()->tagged_components ();
-
-  IOP::MultipleComponentProfile &components = ecs.components ();
-
-  CORBA::ULong len = components.length ();
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      if (components[i].tag == id)
-        {
-          IOP::TaggedComponent *tagged_component = 0;
-
-          // Only allocate a sequence if we have a tagged component
-          // that matches the given IOP::ComponentId.
-          ACE_NEW_THROW_EX (tagged_component,
-                            IOP::TaggedComponent,
-                            CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                TAO_DEFAULT_MINOR_CODE,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
-          ACE_CHECK_RETURN (0);
-
-          IOP::TaggedComponent_var safe_tagged_component =
-            tagged_component;
-
-          (*tagged_component) = components[i];  // Deep copy
-
-          return safe_tagged_component._retn ();
-        }
-    }
+  IOP::TaggedComponent *tagged_component = 0;
+  ACE_NEW_THROW_EX (tagged_component,
+                    IOP::TaggedComponent,
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO_DEFAULT_MINOR_CODE,
+                        ENOMEM),
+                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (0);
 
-  // No tagged component was found that matched the given
-  // IOP::ComponentId.
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (25, CORBA::COMPLETED_NO),
-                    0);
-}
+  IOP::TaggedComponent_var safe_tagged_component = tagged_component;
 
-IOP::TaggedComponentSeq *
-TAO_ClientRequestInfo::get_effective_components (
-    IOP::ComponentId id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Tagged_Components &ecs =
+  const TAO_Tagged_Components &ecs = 
     this->target_->_stubobj ()->profile_in_use ()->tagged_components ();
 
-  IOP::MultipleComponentProfile &components = ecs.components ();
+  tagged_component->tag = id;
 
-  IOP::TaggedComponentSeq *tagged_components = 0;
-  IOP::TaggedComponentSeq_var safe_tagged_components;
+  if (!ecs.get_component (*tagged_component))
+    ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                        CORBA::SystemException::_tao_minor_code (
+                          TAO_DEFAULT_MINOR_CODE,
+                          EINVAL),  // @@ Need minor code from PI spec!
+                        CORBA::COMPLETED_NO),
+                      0);
 
-  CORBA::ULong len = components.length ();
-  for (CORBA::ULong i = 0; i < len; ++i)
-    {
-      if (components[i].tag == id)
-        {
-          if (tagged_components == 0)
-            {
-              // Only allocate a sequence if we have tagged components
-              // to place into the sequence.
-              ACE_NEW_THROW_EX (tagged_components,
-                                IOP::TaggedComponentSeq,
-                                CORBA::NO_MEMORY (
-                                  CORBA::SystemException::_tao_minor_code (
-                                    TAO_DEFAULT_MINOR_CODE,
-                                    ENOMEM),
-                                  CORBA::COMPLETED_NO));
-              ACE_CHECK_RETURN (0);
-
-              safe_tagged_components = tagged_components;
-            }
-
-          CORBA::ULong old_len = safe_tagged_components->length ();
-          safe_tagged_components->length (old_len + 1);
-
-          safe_tagged_components[old_len] = components[i];  // Deep copy
-        }
-    }
-
-  if (tagged_components == 0)
-    {
-      // No tagged component sequence was allocated, meaning no tagged
-      // components were found that matched the given
-      // IOP::ComponentId.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (25, CORBA::COMPLETED_NO),
-                        0);
-    }
-
-  return safe_tagged_components._retn ();
+  return safe_tagged_component._retn ();
 }
 
 CORBA::Policy_ptr
@@ -239,20 +185,8 @@ TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // @@ Do we need to look anywhere else for the request policies?
-
-#if TAO_HAS_CORBA_MESSAGING == 1
   return this->target_->_get_policy (type,
                                      ACE_TRY_ENV);
-#else
-  ACE_UNUSED_ARG (type);
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    0);
-#endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 }
 
 void
@@ -280,7 +214,8 @@ TAO_ClientRequestInfo::add_request_service_context (
               return;
             }
           else
-            ACE_THROW (CORBA::BAD_INV_ORDER (11, CORBA::COMPLETED_NO));
+            // @@ Need the minor code once it becomes available.
+            ACE_THROW (CORBA::BAD_INV_ORDER ());
         }
     }
 
@@ -308,40 +243,40 @@ Dynamic::ParameterList *
 TAO_ClientRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 Dynamic::ExceptionList *
 TAO_ClientRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 Dynamic::ContextList *
 TAO_ClientRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 Dynamic::RequestContext *
 TAO_ClientRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+{ 
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 CORBA::Any *
 TAO_ClientRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 CORBA::Boolean
@@ -369,8 +304,8 @@ TAO_ClientRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
   if (inv != 0 && this->response_expected_ == 0)
     return inv->sync_scope ();
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    -1);
+  // @@ Need the minor once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), -1);
 }
 #endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -380,7 +315,7 @@ TAO_ClientRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->reply_status_ == -1)
     // A reply hasn't been received yet.
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO), -1);
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), -1);
 
   return this->reply_status_;
 }
@@ -389,8 +324,11 @@ CORBA::Object_ptr
 TAO_ClientRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
+  // @@ Need the minor code once it becomes available.
+  if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD
+      && this->reply_status_ !=
+           PortableInterceptor::LOCATION_FORWARD_PERMANENT)
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
                       CORBA::Object::_nil ());
 
   // TAO_GIOP_Invocation::forward_reference() already duplicates the
@@ -443,7 +381,11 @@ TAO_ClientRequestInfo::get_request_service_context (
         return safe_service_context._retn ();
       }
 
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (23, CORBA::COMPLETED_NO),
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO_DEFAULT_MINOR_CODE,
+                        EINVAL), // @@ Need minor code from PI spec!
+                      CORBA::COMPLETED_NO),
                     0);
 }
 
@@ -477,7 +419,11 @@ TAO_ClientRequestInfo::get_reply_service_context (
         return safe_service_context._retn ();
       }
 
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (23, CORBA::COMPLETED_NO),
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO_DEFAULT_MINOR_CODE,
+                        EINVAL), // @@ Need minor code from PI spec!
+                      CORBA::COMPLETED_NO),
                     0);
 }
 
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index 357811b7194..4704fed93ff 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -144,11 +144,6 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual IOP::TaggedComponentSeq * get_effective_components (
-      IOP::ComponentId id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual CORBA::Policy_ptr get_request_policy (
       CORBA::PolicyType type,
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
@@ -181,7 +176,7 @@ protected:
 
   TAO_GIOP_Invocation *invocation_;
 
-  CORBA::Object_ptr target_;
+  CORBA::Object_var target_;
   CORBA::Exception *caught_exception_;
 
   CORBA::Boolean response_expected_;
diff --git a/TAO/tao/ClientRequestInfo.inl b/TAO/tao/ClientRequestInfo.inl
index 0fed4cfe47c..50bd99d0a2c 100644
--- a/TAO/tao/ClientRequestInfo.inl
+++ b/TAO/tao/ClientRequestInfo.inl
@@ -46,7 +46,7 @@ TAO_ClientRequestInfo::reply_status (int invoke_status)
 
 ACE_INLINE void
 TAO_ClientRequestInfo::forward_reference (
-  PortableInterceptor::ForwardRequest &)
+  PortableInterceptor::ForwardRequest &exc)
 {
   // Note that we're converting the ForwardRequest exception in to a
   // LOCATION_FORWARD reply, so we do not set the exception status.
@@ -55,5 +55,10 @@ TAO_ClientRequestInfo::forward_reference (
   // handled by the TAO_GIOP_Invocation object so that its profiles
   // can be added to the list of forward profiles.
 
-  this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
+  if (exc.permanent)
+    this->reply_status_ =
+      PortableInterceptor::LOCATION_FORWARD_PERMANENT;
+  else
+    this->reply_status_ = 
+      PortableInterceptor::LOCATION_FORWARD;
 }
diff --git a/TAO/tao/Client_Priority_Policy.h b/TAO/tao/Client_Priority_Policy.h
index c5e0ba8ae49..4e9c3725c7b 100644
--- a/TAO/tao/Client_Priority_Policy.h
+++ b/TAO/tao/Client_Priority_Policy.h
@@ -34,13 +34,16 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-/**
- * @class TAO_Client_Priority_Policy
- */
 class TAO_Export TAO_Client_Priority_Policy
   : public TAO::ClientPriorityPolicy,
     public TAO_Local_RefCounted_Object
 {
+  // = TITLE
+  //
+  //
+  // = DESCRIPTION
+  //
+  //
 public:
   /// Constructor.
   TAO_Client_Priority_Policy (const TAO::PrioritySpecification &priority_spec);
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp
deleted file mode 100644
index 9a4b57e4dfa..00000000000
--- a/TAO/tao/CodecFactory.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "CodecFactory.h"
-#include "CDR_Encaps_Codec.h"
-
-ACE_RCSID (TAO_CodecFactory,
-           CodecFactory,
-           "$Id$")
-
-TAO_CodecFactory::TAO_CodecFactory (void)
-{
-}
-
-IOP::Codec_ptr
-TAO_CodecFactory::create_codec (const IOP::Encoding & enc,
-				CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-		   IOP::CodecFactory::UnknownEncoding))
-{
-  // @todo: Ideally we should have some sort of CodecFactory
-  //        registry to make it possible to add factories
-  //        dynamically.  However, there currently isn't a need to
-  //        support anything other than CDR encapsulations yet so we
-  //        hardcode its Codec.  This may change once TAO starts to
-  //        support messaging formats other than GIOP.
-
-  IOP::Codec_ptr codec = IOP::Codec::_nil ();
-
-  switch (enc.format)
-    {
-
-      // @@ MSVC 6 gets confused and thinks that
-      //    IOP::ENCODING_CDR_ENCAPS is not a constant, so its actual
-      //    value (0) is used instead.
-    case 0 /* IOP::ENCODING_CDR_ENCAPS */:
-      if (enc.major_version < 1)
-	{
-	  // There is no such thing as a "0.x" CDR encapsulation.
-	  ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                              CORBA_SystemException::_tao_minor_code (
-				TAO_DEFAULT_MINOR_CODE,
-				EINVAL),
-			      CORBA::COMPLETED_NO),
-			    IOP::Codec::_nil ());
-	}
-
-      ACE_NEW_THROW_EX (codec,
-			TAO_CDR_Encaps_Codec (enc.major_version,
-					      enc.minor_version),
-			CORBA::NO_MEMORY (
-                          CORBA_SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-			    ENOMEM),
-			  CORBA::COMPLETED_MAYBE));
-      ACE_CHECK_RETURN (IOP::Codec::_nil ());
-      break;
-
-    default:
-      ACE_THROW_RETURN (IOP::CodecFactory::UnknownEncoding (),
-			IOP::Codec::_nil ());
-
-    }
-
-  return codec;
-}
diff --git a/TAO/tao/CodecFactory.h b/TAO/tao/CodecFactory.h
deleted file mode 100644
index 63f76a7dae1..00000000000
--- a/TAO/tao/CodecFactory.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file CodecFactory.h
- *
- * $Id$
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#ifndef TAO_CODEC_FACTORY_H
-#define TAO_CODEC_FACTORY_H
-
-#include "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "IOPC.h"
-#include "LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/**
- * @class TAO_CodecFactory
- *
- * @brief Implementation of the IOP::CodecFactory interface.
- *
- * This class can be used to create Codec of a given type, such as a
- * CDR encapsulation Codec.
- */
-class TAO_Export TAO_CodecFactory
-  : public virtual IOP::CodecFactory,
-    public virtual CORBA::LocalObject
-{
-public:
-
-  /// Constructor
-  TAO_CodecFactory (void);
-
-  /// Create a Coder/Decoder for the given type of encoding.
-  virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc,
-				       CORBA::Environment &ACE_TRY_ENV = 
-				         TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,
-		     IOP::CodecFactory::UnknownEncoding));
-
-private:
-
-  /// Prevent copying through the copy constructor and the assignment
-  /// operator.
-  ACE_UNIMPLEMENTED_FUNC (
-    TAO_CodecFactory (const TAO_CodecFactory &))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &))
-
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-
-#endif  /* TAO_CODEC_FACTORY_H */
-
diff --git a/TAO/tao/CodecFactory_ORBInitializer.cpp b/TAO/tao/CodecFactory_ORBInitializer.cpp
deleted file mode 100644
index 1e386c94d55..00000000000
--- a/TAO/tao/CodecFactory_ORBInitializer.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "CodecFactory_ORBInitializer.h"
-#include "CodecFactory.h"
-
-ACE_RCSID (TAO_CodecFactory,
-           CodecFactory_ORBInitializer,
-           "$Id$")
-
-void
-TAO_CodecFactory_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ENV_ARG_DEFN;
-
-  // The CodecFactory is stateless and reentrant, so share a single
-  // instance between all ORBs.
-  info->register_initial_reference ("CodecFactory",
-                                    &(this->codec_factory_),
-                                    ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-TAO_CodecFactory_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
diff --git a/TAO/tao/CodecFactory_ORBInitializer.h b/TAO/tao/CodecFactory_ORBInitializer.h
deleted file mode 100644
index bbaf3fc8f0e..00000000000
--- a/TAO/tao/CodecFactory_ORBInitializer.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CodecFactory_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author  Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_CODEC_FACTORY_ORB_INITIALIZER_H
-#define TAO_CODEC_FACTORY_ORB_INITIALIZER_H
-
-#include "ace/pre.h"
-
-#include "TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "PortableInterceptorC.h"
-#include "LocalObject.h"
-#include "CodecFactory.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-/**
- * @class TAO_CodecFactory_ORBInitializer
- *
- * @brief ORBInitializer for the CodecFactory support.
- *
- * This class simply registers the CodecFactory object with the ORB
- * resolve_initial_references() mechanism.
- */
-class TAO_Export TAO_CodecFactory_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// Instance of the IOP::CodecFactory.
-  /// The CodecFactory is stateless and reentrant, so share a single
-  /// instance between all ORBs.
-  TAO_CodecFactory codec_factory_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-
-#endif /* TAO_CODEC_FACTORY_ORB_INITIALIZER_H */
diff --git a/TAO/tao/Connection_Cache_Manager.cpp b/TAO/tao/Connection_Cache_Manager.cpp
index 0b7056861ea..4517ef283c1 100644
--- a/TAO/tao/Connection_Cache_Manager.cpp
+++ b/TAO/tao/Connection_Cache_Manager.cpp
@@ -12,14 +12,12 @@
 #endif /* __ACE_INLINE__ */
 
 
-ACE_RCSID (TAO,
-           Connection_Cache_Manager,
-           "$Id$")
+ACE_RCSID(tao, Connection_Cache_Manager, "$Id$")
 
 
-TAO_Connection_Cache_Manager::TAO_Connection_Cache_Manager (void)
-  : cache_map_ (),
-    cache_lock_ (0)
+TAO_Connection_Cache_Manager::
+    TAO_Connection_Cache_Manager (void)
+      : cache_map_ ()
 {
 }
 
diff --git a/TAO/tao/Connection_Cache_Manager.inl b/TAO/tao/Connection_Cache_Manager.inl
index c89ace68cc3..5af394f464f 100644
--- a/TAO/tao/Connection_Cache_Manager.inl
+++ b/TAO/tao/Connection_Cache_Manager.inl
@@ -144,13 +144,6 @@ TAO_Connection_Cache_Manager::make_idle (HASH_MAP_ENTRY *&entry)
 ACE_INLINE int
 TAO_Connection_Cache_Manager::close (ACE_Handle_Set &handle_Set)
 {
-  // The cache lock pointer should only be zero if
-  // Connection_Cache_Manager::open() was never called.  Note that
-  // only one thread opens the Connection_Cache_Manager at any given
-  // time, so it is safe to check for a non-zero lock pointer.
-  if (this->cache_lock_ == 0)
-    return -1;
-
   ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
                             guard,
                             *this->cache_lock_,
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 85897954427..2702a2ff655 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -39,8 +39,6 @@ TAO_Connection_Handler::purge_entry (void)
   int retval =
     this->orb_core_->connection_cache ().purge_entry (this->cache_map_entry_);
 
-  this->cache_map_entry_ = 0;
-
   // Decrement our reference count as we have been removed from the
   // cache map.
   this->decr_ref_count ();
@@ -48,15 +46,6 @@ TAO_Connection_Handler::purge_entry (void)
   return retval;
 }
 
-void
-TAO_Connection_Handler::mark_invalid (void)
-{
-  if (this->cache_map_entry_)
-    this->cache_map_entry_->int_id_.recycle_state
-      (ACE_RECYCLABLE_PURGABLE_BUT_NOT_IDLE);
-}
-
-
 int
 TAO_Connection_Handler::make_idle (void)
 {
@@ -96,9 +85,6 @@ TAO_Connection_Handler::set_socket_option (ACE_SOCK &sock,
                             sizeof (int)) == -1
            && errno != ENOTSUP)
     return -1;
-#else
-   ACE_UNUSED_ARG (snd_size);
-   ACE_UNUSED_ARG (rcv_size);
 #endif /* !ACE_LACKS_SOCKET_BUFSIZ */
 
   (void) sock.enable (ACE_CLOEXEC);
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index a1ca6551ab8..840c292754d 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -99,9 +99,6 @@ public:
   /// Purge our entry from the Connection Cache
   int purge_entry (void);
 
-  /// Mark an entry unusable
-  void mark_invalid (void);
-
 protected:
 
   /// Return our TAO_ORB_Core pointer
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index cadc729911f..e79d07a513c 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -43,6 +43,7 @@ TAO_Connection_Handler::decr_ref_count (void)
       // <cache_map_entry_>
       if (this->cache_map_entry_)
         {
+
           // Now mark the Ext_Id for us as closed
           this->cache_map_entry_->int_id_.recycle_state
             (ACE_RECYCLABLE_CLOSED);
diff --git a/TAO/tao/Domain/Makefile b/TAO/tao/Domain/Makefile
index cf921ed1603..499a4e227ef 100644
--- a/TAO/tao/Domain/Makefile
+++ b/TAO/tao/Domain/Makefile
@@ -290,8 +290,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile
index ee73d7ab481..7d247d0dad9 100644
--- a/TAO/tao/DynamicAny/Makefile
+++ b/TAO/tao/DynamicAny/Makefile
@@ -73,7 +73,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -161,15 +160,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -189,6 +187,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -318,8 +318,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -379,7 +394,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -467,15 +481,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -495,6 +508,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -624,8 +639,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -689,7 +719,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -777,15 +806,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -805,6 +833,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -934,8 +964,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -995,7 +1040,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1083,15 +1127,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -1111,6 +1154,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1240,8 +1285,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1319,7 +1379,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS.i DynamicAny.h \
  dynamicany_export.h \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1391,15 +1450,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -1419,6 +1477,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1548,8 +1608,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1611,7 +1686,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1699,15 +1773,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -1727,6 +1800,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1856,8 +1931,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1917,7 +2007,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -2005,15 +2094,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -2033,6 +2121,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -2162,8 +2252,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -2225,7 +2330,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -2313,15 +2417,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -2341,6 +2444,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -2470,8 +2575,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -2533,7 +2653,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -2621,15 +2740,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -2649,6 +2767,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -2778,8 +2898,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.h b/TAO/tao/DynamicInterface/DII_Invocation.h
index e25d13956b6..1309a7008b2 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -49,8 +49,7 @@ public:
                            const char *operation,
                            CORBA::ULong opname_len,
                            CORBA::Boolean argument_flag,
-                           TAO_ORB_Core *orb_core,
-                           int byte_order = TAO_ENCAP_BYTE_ORDER);
+                           TAO_ORB_Core *orb_core);
   // Constructor.
 
   int invoke (CORBA::ExceptionList_ptr exceptions,
@@ -76,8 +75,7 @@ public:
   TAO_GIOP_DII_Deferred_Invocation (TAO_Stub *data,
                                     TAO_ORB_Core* orb_core,
                                     CORBA::Boolean argument_flag,
-                                    const CORBA::Request_ptr req,
-                                    int byte_order = TAO_ENCAP_BYTE_ORDER);
+                                    const CORBA::Request_ptr req);
   // Constructor.
 
   int invoke (CORBA_Environment &TAO_IN_ENV =
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.inl b/TAO/tao/DynamicInterface/DII_Invocation.inl
index ce9cb080b4e..5f1b33028d1 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.inl
+++ b/TAO/tao/DynamicInterface/DII_Invocation.inl
@@ -8,14 +8,12 @@ TAO_GIOP_DII_Invocation::TAO_GIOP_DII_Invocation (TAO_Stub *data,
                                                   const char *operation,
                                                   CORBA::ULong opname_len,
                                                   CORBA::Boolean argument_flag,
-                                                  TAO_ORB_Core *orb_core,
-                                                  int byte_order)
+                                                  TAO_ORB_Core *orb_core)
   : TAO_GIOP_Twoway_Invocation (data,
                                 operation,
                                 opname_len,
                                 argument_flag,
-                                orb_core,
-                                byte_order)
+                                orb_core)
 {
 }
 
@@ -24,15 +22,13 @@ TAO_GIOP_DII_Deferred_Invocation::TAO_GIOP_DII_Deferred_Invocation (
     TAO_Stub *stub,
     TAO_ORB_Core *orb_core,
     CORBA::Boolean argument_flag,
-    const CORBA::Request_ptr req,
-    int byte_order
+    const CORBA::Request_ptr req
   )
   : TAO_GIOP_Asynch_Invocation (stub,
                                 req->operation (),
                                 ACE_OS::strlen (req->operation ()),
                                 argument_flag,
-                                orb_core,
-                                byte_order)
+                                orb_core)
 {
   // New reply dispatcher on the heap, because
   // we will go out of scope and hand over the
diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile
index f6304a0b32b..34115662927 100644
--- a/TAO/tao/DynamicInterface/Makefile
+++ b/TAO/tao/DynamicInterface/Makefile
@@ -316,13 +316,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
@@ -333,6 +326,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -374,6 +372,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -433,8 +433,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -483,27 +498,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Transport_Mux_Strategy.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Transport.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Transport.inl
 
 .obj/DII_Reply_Dispatcher.o .obj/DII_Reply_Dispatcher.so .shobj/DII_Reply_Dispatcher.o .shobj/DII_Reply_Dispatcher.so: DII_Reply_Dispatcher.cpp \
@@ -538,7 +532,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -613,20 +606,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -634,14 +613,29 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
  $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
@@ -746,8 +740,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1017,8 +1026,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1293,8 +1317,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1685,8 +1724,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1850,23 +1904,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.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.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1874,6 +1915,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
@@ -1884,9 +1927,20 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Service_Context.h \
  $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
  Server_Request.inl \
  $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/GIOP_Utils.h \
  $(TAO_ROOT)/tao/GIOP_Utils.i \
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index aa261099450..e14522f0bcd 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -76,8 +76,7 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
     ctx_ (CORBA::Context::_nil ()),
     refcount_ (1),
     lazy_evaluation_ (0),
-    response_received_ (0),
-    byte_order_ (TAO_ENCAP_BYTE_ORDER)
+    response_received_ (0)
 {
   this->target_ = CORBA::Object::_duplicate (obj);
   this->opname_ = CORBA::string_dup (op);
@@ -103,8 +102,7 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
     ctx_ (CORBA::Context::_nil ()),
     refcount_ (1),
     lazy_evaluation_ (0),
-    response_received_ (0),
-    byte_order_ (TAO_ENCAP_BYTE_ORDER)
+    response_received_ (0)
 {
   this->target_ = CORBA::Object::_duplicate (obj);
   this->opname_ = CORBA::string_dup (op);
@@ -149,8 +147,7 @@ CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
                                 this->opname_,
                                 ACE_OS::strlen (this->opname_),
                                 argument_flag,
-                                this->orb_->orb_core (),
-                                this->byte_order_);
+                                this->orb_->orb_core ());
 
   // Loop as needed for forwarding.
   for (;;)
@@ -201,12 +198,6 @@ CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
       break;
     }
 
-  // If this request was created by a gateway, then result_
-  // and/or args_ are shared by a CORBA::ServerRequest, whose
-  // reply must be in the same byte order as the reply we are
-  // handling here. So we set the member to be accessed later.
-  this->byte_order_ = call.inp_stream ().byte_order ();
-
   // Now, get all the "return", "out", and "inout" parameters
   // from the response message body ... return parameter is
   // first, the rest are in the order defined in the IDL spec
@@ -235,8 +226,7 @@ CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
                                    this->opname_,
                                    ACE_OS::strlen (this->opname_),
                                    argument_flag,
-                                   this->orb_->orb_core (),
-                                   this->byte_order_);
+                                   this->orb_->orb_core ());
 
   // Loop as needed for forwarding.
   for (;;)
@@ -302,8 +292,7 @@ CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
   TAO_GIOP_DII_Deferred_Invocation call (this->target_->_stubobj (),
                                          this->orb_->orb_core (),
                                          argument_flag,
-                                         this,
-                                         this->byte_order_);
+                                         this);
 
   // Loop as needed for forwarding.
   for (;;)
@@ -378,12 +367,6 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming,
                                 CORBA::ULong reply_status,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  // If this request was created by a gateway, then result_
-  // and/or args_ are shared by a CORBA::ServerRequest, whose
-  // reply must be in the same byte order as the reply we are
-  // handling here. So we set the member to be accessed later.
-  this->byte_order_ = incoming.byte_order ();
-
   switch (reply_status)
   {
     case TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION:
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 9d3740fea7a..bb6975e77d6 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -141,12 +141,6 @@ public:
   void _tao_lazy_evaluation (int lazy_evaluation);
   // Set the lazy evaluation flag.
 
-  int _tao_byte_order (void) const;
-  // Get the byte order member.
-
-  void _tao_byte_order (int byte_order);
-  // Set the byte order member.
-
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA_Request_ptr _ptr_type;
   typedef CORBA_Request_var _var_type;
@@ -218,9 +212,6 @@ private:
   CORBA::Boolean response_received_;
   // Set to TRUE upon completion of invoke() or
   // handle_response().
-
-  int byte_order_;
-  // Can be reset by a gateway when passing along a request.
 };
 
 typedef CORBA_Request* CORBA_Request_ptr;
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index 9b217fd664c..a4b2024e3bd 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -135,18 +135,6 @@ CORBA_Request::_tao_lazy_evaluation (int lazy_evaluation)
   this->lazy_evaluation_ = lazy_evaluation;
 }
 
-ACE_INLINE int
-CORBA_Request::_tao_byte_order (void) const
-{
-  return this->byte_order_;
-}
-
-ACE_INLINE void
-CORBA_Request::_tao_byte_order (int byte_order)
-{
-  this->byte_order_ = byte_order;
-}
-
 // *************************************************************
 // Inline operations for class CORBA_Request_var
 // *************************************************************
diff --git a/TAO/tao/DynamicInterface/Server_Request.h b/TAO/tao/DynamicInterface/Server_Request.h
index a42bdabc259..f312c8bdbd8 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -110,12 +110,6 @@ public:
   void _tao_lazy_evaluation (int lazy_evaluation);
   // Set the lazy evaluation flag.
 
-  int _tao_incoming_byte_order (void) const;
-  // Get the byte order of the incoming CDR stream.
-
-  void _tao_reply_byte_order (int byte_order);
-  // Set the byte order of the outgoing CDR stream.
-
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
   typedef CORBA::ServerRequest_ptr _ptr_type;
 #endif /* __GNUC__ */
diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl
index 22742b0922f..e79890ee8cf 100644
--- a/TAO/tao/DynamicInterface/Server_Request.inl
+++ b/TAO/tao/DynamicInterface/Server_Request.inl
@@ -42,15 +42,3 @@ CORBA_ServerRequest::_tao_lazy_evaluation (int lazy_evaluation)
   this->lazy_evaluation_ = lazy_evaluation;
 }
 
-ACE_INLINE int
-CORBA_ServerRequest::_tao_incoming_byte_order (void) const
-{
-  return this->orb_server_request_.incoming ().byte_order ();
-}
-
-ACE_INLINE void
-CORBA_ServerRequest::_tao_reply_byte_order (int byte_order)
-{
-  this->orb_server_request_.outgoing ().reset_byte_order (byte_order);
-}
-
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index da9d2f99b15..8b7bc826617 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -443,8 +443,8 @@ CORBA_SystemException::_info (void) const
         case TAO_TIMEOUT_RECV_MINOR_CODE:
           location = "timeout during recv";
           break;
-        case TAO_IMPLREPO_MINOR_CODE:
-          location = "implrepo server exception";
+        case TAO_IMPLREPO_SERVER_MANUAL_ACTIVATION:
+          location = "implrepo server specified manual startup";
           break;
         case TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE:
           location = "endpoint initialization failure in Acceptor Registry";
diff --git a/TAO/tao/Exclusive_TMS.cpp b/TAO/tao/Exclusive_TMS.cpp
index adfb720853f..63f9dbdb434 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -71,9 +71,6 @@ TAO_Exclusive_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("(%P|%t) TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n"),
                     this->request_id_, params.request_id_));
-
-      // The return value 0 informs the transport that the mux strategy
-      // did not find the right reply handler.
       return 0;
     }
 
@@ -83,8 +80,9 @@ TAO_Exclusive_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
   this->rd_ = 0;
 
   // Dispatch the reply.
-  // Returns 1 on success, -1 on failure.
-  return rd->dispatch_reply (params);
+  int result = rd->dispatch_reply (params);
+
+  return result;
 }
 
 /*TAO_GIOP_Message_State *
diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp
new file mode 100644
index 00000000000..82a66ec1427
--- /dev/null
+++ b/TAO/tao/Flushing_Strategy.cpp
@@ -0,0 +1,10 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Flushing_Strategy.h"
+
+ACE_RCSID(tao, Flushing_Strategy, "$Id$")
+
+TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void)
+{
+}
diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
new file mode 100644
index 00000000000..11d6cda2983
--- /dev/null
+++ b/TAO/tao/Flushing_Strategy.h
@@ -0,0 +1,65 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Flushing_Strategy.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_FLUSHING_STRATEGY_H
+#define TAO_FLUSHING_STRATEGY_H
+#include "ace/pre.h"
+
+#include "corbafwd.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_Transport;
+class TAO_Queued_Message;
+
+/**
+ * @class TAO_Flushing_Strategy
+ *
+ * @brief Define the interface for the flushing strategy, i.e. the
+ *        algorithm that controls how does the ORB flush outgoing
+ *        data.
+ *
+ * Please read the documentation in the TAO_Transport class to find
+ * out more about the design of the outgoing data path.
+ *
+ * Some applications can block the current thread whenever they are
+ * sending out data.  In those cases they can obtain better
+ * performance by blocking in calls to write() than by participating
+ * in the Leader/Followers protocol to shared the ORB Reactor.
+ *
+ * This strategy controls how does the ORB schedule and cancel
+ * reactive I/O, if there is no reactive I/O the strategy is just a
+ * no-op.
+ *
+ */
+class TAO_Export TAO_Flushing_Strategy
+{
+public:
+  /// Destructor
+  virtual ~TAO_Flushing_Strategy (void);
+
+  /// Schedule the transport argument to be flushed
+  virtual int schedule_output (TAO_Transport *transport) = 0;
+
+  /// Cancel all scheduled output for the transport argument
+  virtual int cancel_output (TAO_Transport *transport) = 0;
+
+  /// Wait until msg is sent out.  Potentially other messages are
+  /// flushed too, for example, because there are ahead in the queue.
+  virtual int flush_message (TAO_Transport *transport,
+                             TAO_Queued_Message *msg) = 0;
+};
+
+#include "ace/post.h"
+#endif  /* TAO_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 2aaaf4d7a7e..ab0dd9677a9 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -19,36 +19,36 @@ ACE_RCSID(tao, GIOP_Message_Base, "$Id$")
 
 TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core)
   : message_handler_ (orb_core,
-		      this),
+                      this),
     output_ (0),
     cdr_buffer_alloc_ (
-	orb_core->resource_factory ()->output_cdr_buffer_allocator ()
+        orb_core->resource_factory ()->output_cdr_buffer_allocator ()
       ),
     cdr_dblock_alloc_ (
-	orb_core->resource_factory ()->output_cdr_dblock_allocator ()
+        orb_core->resource_factory ()->output_cdr_dblock_allocator ()
       ),
     generator_parser_ (0)
 {
 #if defined(ACE_HAS_PURIFY)
-  (void) ACE_OS::memset	(this->repbuf_,
-			 '\0',
-			 sizeof	this->repbuf_);
+  (void) ACE_OS::memset (this->repbuf_,
+                         '\0',
+                         sizeof this->repbuf_);
 #endif /* ACE_HAS_PURIFY */
   ACE_NEW (this->output_,
-	   TAO_OutputCDR (this->repbuf_,
-			  sizeof this->repbuf_,
-			  TAO_ENCAP_BYTE_ORDER,
-			  this->cdr_buffer_alloc_,
-			  this->cdr_dblock_alloc_,
-			  orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-			  orb_core->to_iso8859 (),
-			  orb_core->to_unicode ()));
+           TAO_OutputCDR (this->repbuf_,
+                          sizeof this->repbuf_,
+                          TAO_ENCAP_BYTE_ORDER,
+                          this->cdr_buffer_alloc_,
+                          this->cdr_dblock_alloc_,
+                          orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+                          orb_core->to_iso8859 (),
+                          orb_core->to_unicode ()));
 }
 
 
 TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void)
 {
-  // Explicitly	call the destructor of the output CDR first. They need
+  // Explicitly call the destructor of the output CDR first. They need
   // the allocators during destruction.
   delete this->output_;
 
@@ -65,11 +65,11 @@ TAO_GIOP_Message_Base::~TAO_GIOP_Message_Base (void)
 
 void
 TAO_GIOP_Message_Base::init (CORBA::Octet major,
-			     CORBA::Octet minor)
+                             CORBA::Octet minor)
 {
   // Set the state
   this->set_state (major,
-		   minor);
+                   minor);
 }
 
 
@@ -89,27 +89,28 @@ TAO_GIOP_Message_Base::generate_request_header (
 {
   // Write the GIOP header first
   if (!this->write_protocol_header (TAO_GIOP_REQUEST,
-				    cdr))
+                                    cdr))
     {
       if (TAO_debug_level > 3)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")),
-			   -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")),
+                           -1);
 
     }
 
   // Now call the implementation for the rest of the header
   if (!this->generator_parser_->write_request_header (op,
-						      spec,
-						      cdr))
+                                                      spec,
+                                                      cdr))
     {
       if (TAO_debug_level > 4)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   ACE_TEXT ("(%P|%t) Error in writing request header \n")),
-			   -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("(%P|%t) Error in writing request header \n")),
+                           -1);
     }
 
   return 0;
+
 }
 
 int
@@ -121,12 +122,12 @@ TAO_GIOP_Message_Base::generate_locate_request_header (
 {
   // Write the GIOP header first
   if (!this->write_protocol_header (TAO_GIOP_LOCATEREQUEST,
-				    cdr))
+                                    cdr))
     {
       if (TAO_debug_level > 3)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")),
-			   -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")),
+                           -1);
 
     }
 
@@ -137,9 +138,9 @@ TAO_GIOP_Message_Base::generate_locate_request_header (
        cdr))
     {
       if (TAO_debug_level > 4)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   ACE_TEXT ("(%P|%t) Error in writing locate request header \n")),
-			   -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("(%P|%t) Error in writing locate request header \n")),
+                           -1);
     }
 
   return 0;
@@ -154,22 +155,22 @@ TAO_GIOP_Message_Base::generate_reply_header (
 {
   // Write the GIOP header first
   if (!this->write_protocol_header (TAO_GIOP_REPLY,
-				    cdr))
+                                    cdr))
     {
       if (TAO_debug_level > 3)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")),
-			   -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("(%P|%t) Error in writing GIOP header \n")),
+                           -1);
     }
 
   // Now call the implementation for the rest of the header
   if (!this->generator_parser_->write_reply_header (cdr,
-						    params))
+                                                    params))
     {
       if (TAO_debug_level > 4)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   ACE_TEXT ("(%P|%t) Error in writing reply header \n")),
-			   -1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ACE_TEXT ("(%P|%t) Error in writing reply header \n")),
+                           -1);
     }
 
   return 0;
@@ -178,23 +179,23 @@ TAO_GIOP_Message_Base::generate_reply_header (
 
 int
 TAO_GIOP_Message_Base::read_message (TAO_Transport *transport,
-				     int /*block */,
-				     ACE_Time_Value * /*max_wait_time*/)
+                                     int /*block */,
+                                     ACE_Time_Value * /*max_wait_time*/)
 {
   // Call the handler to read and do a simple parse of the header of
   // the message.
-  if (this->message_handler_.read_parse_message	(transport) == -1)
+  if (this->message_handler_.read_parse_message (transport) == -1)
     return -1;
 
   // Get the message state
-  TAO_GIOP_Message_State &state	=
+  TAO_GIOP_Message_State &state =
     this->message_handler_.message_state ();
 
   // Set the state internally for parsing and generating messages
   this->set_state (state.giop_version.major,
-		   state.giop_version.minor);
+                   state.giop_version.minor);
 
-  int retval =	this->message_handler_.is_message_ready	(transport);
+  int retval =  this->message_handler_.is_message_ready ();
 
   return retval;
 }
@@ -204,48 +205,48 @@ int
 TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
 {
   // Get the header length
-  const	size_t header_len = TAO_GIOP_MESSAGE_HEADER_LEN	;
+  const size_t header_len = TAO_GIOP_MESSAGE_HEADER_LEN ;
 
   // Get the message size offset
-  const	size_t offset =	TAO_GIOP_MESSAGE_SIZE_OFFSET;
+  const size_t offset = TAO_GIOP_MESSAGE_SIZE_OFFSET;
 
   // Ptr to first buffer.
   char *buf = (char *) stream.buffer ();
 
   // Length of all buffers.
   size_t total_len =
-    stream.total_length	();
+    stream.total_length ();
 
-  // 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
+  // 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).
+  // this particular environment and that isn't handled by the
+  // networking infrastructure (e.g., IPSEC).
 
   CORBA::ULong bodylen = total_len - header_len;
 
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-  *ACE_reinterpret_cast	(CORBA::ULong *, buf + offset) = bodylen;
+  *ACE_reinterpret_cast (CORBA::ULong *, buf + offset) = bodylen;
 #else
   if (!stream.do_byte_swap ())
-    *ACE_reinterpret_cast (CORBA::ULong	*,
-			   buf + offset) = bodylen;
+    *ACE_reinterpret_cast (CORBA::ULong *,
+                           buf + offset) = bodylen;
   else
-    ACE_CDR::swap_4 (ACE_reinterpret_cast (char	*,
-					   &bodylen),
-		     buf + offset);
+    ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
+                                           &bodylen),
+                     buf + offset);
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
 
-  // Strictly speaking,	should not need	to loop	here because the
-  // socket never gets set to a	nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs	little.
-  if (TAO_debug_level >	2)
+  // Strictly speaking, should not need to loop here because the
+  // socket never gets set to a nonblocking mode ... some Linux
+  // versions seem to need it though.  Leaving it costs little.
+  if (TAO_debug_level > 2)
     {
       this->dump_msg ("send",
-		      ACE_reinterpret_cast (u_char *,
-					    buf),
-		      bodylen);
+                      ACE_reinterpret_cast (u_char *,
+                                            buf),
+                      bodylen);
     }
 
   return 0;
@@ -271,11 +272,11 @@ TAO_GIOP_Message_Base::message_type (void)
     case TAO_GIOP_CANCELREQUEST:
     case TAO_GIOP_MESSAGERROR:
     case TAO_GIOP_FRAGMENT:
-      // Never happens:	why??
+      // Never happens: why??
     default:
-	ACE_ERROR ((LM_ERROR,
-		    ACE_TEXT ("TAO (%P|%t) %N:%l	message_type : ")
-		    ACE_TEXT ("wrong message.\n")));
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("TAO (%P|%t) %N:%l        message_type : ")
+                    ACE_TEXT ("wrong message.\n")));
 
 
     }
@@ -288,7 +289,7 @@ TAO_GIOP_Message_Base::message_type (void)
 
 int
 TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
-						TAO_ORB_Core *orb_core)
+                                                TAO_ORB_Core *orb_core)
 {
   // Set the upcall thread
   orb_core->leader_follower ().set_upcall_thread ();
@@ -298,57 +299,57 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
   this->output_->reset ();
 
   /************************************************************/
-  // @@	This comment was there when we were using multiple reads. Let
-  // it	be here	 till a	point it doesn't make sense _ bala
+  // @@ This comment was there when we were using multiple reads. Let
+  // it be here  till a point it doesn't make sense _ bala
 
   // Take out all the information from the <message_state> and reset
-  // it	so that	nested upcall on the same transport can	be handled.
+  // it so that nested upcall on the same transport can be handled.
   //
   // Notice that the message_state is only modified in one thread at a
   // time because the reactor does not call handle_input() for the
-  // same Event_Handler	in two threads at the same time.
+  // same Event_Handler in two threads at the same time.
   /************************************************************/
 
-  // Create a message block by stealing	the data block
+  // Create a message block by stealing the data block
   ACE_Message_Block msg_block (this->message_handler_.data_block_dup ());
 
-  // Move the wr_ptr ()	and rd_ptr in the message block. This is not
-  // generally required	as we are not going to write anything. But
-  // this is *important* for checking the length of the	CDR streams
+  // Move the wr_ptr () and rd_ptr in the message block. This is not
+  // generally required as we are not going to write anything. But
+  // this is *important* for checking the length of the CDR streams
   msg_block.wr_ptr (this->message_handler_.wr_pos ());
   msg_block.rd_ptr (this->message_handler_.rd_pos ());
 
   // Steal the input CDR from the message block
   TAO_InputCDR input_cdr (&msg_block,
-			  this->message_handler_.message_state ().byte_order,
-			  orb_core);
+                          this->message_handler_.message_state ().byte_order,
+                          orb_core);
 
 
-  // Send the message state for	the service layer like FT to log the
+  // Send the message state for the service layer like FT to log the
   // messages
-  // @@@ Needed	for DOORS
+  // @@@ Needed for DOORS
   //  orb_core->services_log_msg_rcv (this->message_state_);
 
   // Reset the message handler to receive upcalls if any
   this->message_handler_.reset (0);
 
 
-  // We	know we	have some request message. Check whether it is a
+  // We know we have some request message. Check whether it is a
   // GIOP_REQUEST or GIOP_LOCATE_REQUEST to take action.
   switch (this->message_handler_.message_state ().message_type)
     {
     case TAO_GIOP_REQUEST:
-      // Should	be taken care by the state specific invocations. They
-      // could raise an	exception or write things in the output	CDR
+      // Should be taken care by the state specific invocations. They
+      // could raise an exception or write things in the output CDR
       // stream
       return this->process_request (transport,
-				    orb_core,
-				    input_cdr);
+                                    orb_core,
+                                    input_cdr);
 
     case TAO_GIOP_LOCATEREQUEST:
       return this->process_locate_request (transport,
-					   orb_core,
-					   input_cdr);
+                                           orb_core,
+                                           input_cdr);
     default:
     return -1;
     }
@@ -359,70 +360,70 @@ TAO_GIOP_Message_Base::process_reply_message (
     TAO_Pluggable_Reply_Params &params
   )
 {
-  // Create a message block by stealing	the data block
+  // Create a message block by stealing the data block
   ACE_Message_Block msg_block (this->message_handler_.data_block_dup ());
 
-  // Move the wr_ptr ()	and rd_ptr in the message block. This is not
-  // generally required	as we are not going to write anything. But
-  // this is *important* for checking the length of the	CDR streams
+  // Move the wr_ptr () and rd_ptr in the message block. This is not
+  // generally required as we are not going to write anything. But
+  // this is *important* for checking the length of the CDR streams
   size_t n = this->message_handler_.message_state ().message_size;
-  msg_block.wr_ptr (n +	TAO_GIOP_MESSAGE_HEADER_LEN);
+  msg_block.wr_ptr (n + TAO_GIOP_MESSAGE_HEADER_LEN);
   msg_block.rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
 
   // Steal the input CDR from the message block
-  int byte_order = this->message_handler_.message_state	().byte_order;
+  int byte_order = this->message_handler_.message_state ().byte_order;
   TAO_InputCDR input_cdr (&msg_block, byte_order);
 
-  // Reset the message state. Now, we are ready	for the	next nested
+  // Reset the message state. Now, we are ready for the next nested
   // upcall if any.
   this->message_handler_.reset (0);
 
-  // We	know we	have some reply	message. Check whether it is a
-  // GIOP_REPLY	or GIOP_LOCATE_REPLY to	take action.
+  // We know we have some reply message. Check whether it is a
+  // GIOP_REPLY or GIOP_LOCATE_REPLY to take action.
   switch (this->message_handler_.message_state ().message_type)
     {
     case TAO_GIOP_REPLY:
-      // Should	be taken care by the state specific parsing
+      // Should be taken care by the state specific parsing
       return this->generator_parser_->parse_reply (input_cdr,
-						   params);
+                                                   params);
 
 
     case TAO_GIOP_LOCATEREPLY:
       return this->generator_parser_->parse_locate_reply (input_cdr,
-							  params);
+                                                          params);
       default:
-	return -1;
+        return -1;
     }
 }
 
 int
-TAO_GIOP_Message_Base::generate_exception_reply	(
+TAO_GIOP_Message_Base::generate_exception_reply (
     TAO_OutputCDR &cdr,
     TAO_Pluggable_Reply_Params &params,
     CORBA::Exception &x
   )
 {
-  // A new try/catch block, but	if something goes wrong	now we have no
-  // hope, just	abort.
+  // A new try/catch block, but if something goes wrong now we have no
+  // hope, just abort.
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Make the GIOP & reply header.
       this->generate_reply_header (cdr,
-				   params);
+                                   params);
       x._tao_encode (cdr, 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.
+      // Now we know that while handling the error an other error
+      // happened -> no hope, close connection.
 
       // Close the handle.
-      ACE_DEBUG	((LM_DEBUG,
-		  ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ")
-		  ACE_TEXT ("generate_exception_reply ()")));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ")
+                  ACE_TEXT ("generate_exception_reply ()")));
       return -1;
     }
   ACE_ENDTRY;
@@ -442,7 +443,7 @@ TAO_GIOP_Message_Base::write_protocol_header (
 
   static CORBA::Octet magic[] =
   {
-    // The following works on non-ASCII	platforms, such	as MVS (which
+    // The following works on non-ASCII platforms, such as MVS (which
     // uses EBCDIC).
     0x47, // 'G'
     0x49, // 'I'
@@ -450,21 +451,21 @@ TAO_GIOP_Message_Base::write_protocol_header (
     0x50, // 'P'
   };
 
-  static int magic_size	= sizeof (magic)/sizeof	(magic[0]);
+  static int magic_size = sizeof (magic)/sizeof (magic[0]);
 
-  msg.write_octet_array	(magic,	magic_size);
+  msg.write_octet_array (magic, magic_size);
   msg.write_octet (this->generator_parser_->major_version ());
   msg.write_octet (this->generator_parser_->minor_version ());
 
-  // We	are putting the	byte order. But	at a later date	if we support
+  // We are putting the byte order. But at a later date if we support
   // fragmentation and when we want to use the other 6 bits in this
   // octet we can have a virtual function do this for us as the
   // version info , Bala
-  msg.write_octet (TAO_ENCAP_BYTE_ORDER ^ msg.do_byte_swap ());
+  msg.write_octet (TAO_ENCAP_BYTE_ORDER);
 
   msg.write_octet ((CORBA::Octet) t);
 
-  // Write a dummy <size> later	it is set to the right value...
+  // Write a dummy <size> later it is set to the right value...
   CORBA::ULong size = 0;
   msg.write_ulong (size);
 
@@ -475,16 +476,16 @@ TAO_GIOP_Message_Base::write_protocol_header (
 
 int
 TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
-					TAO_ORB_Core *orb_core,
-					TAO_InputCDR &cdr)
+                                        TAO_ORB_Core *orb_core,
+                                        TAO_InputCDR &cdr)
 {
   // This will extract the request header, set <response_required>
   // and <sync_with_server> as appropriate.
   TAO_ServerRequest request (this,
-			     cdr,
-			     *this->output_,
-			     transport,
-			     orb_core);
+                             cdr,
+                             *this->output_,
+                             transport,
+                             orb_core);
 
   CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
 
@@ -497,158 +498,158 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
   ACE_TRY
     {
       parse_error =
-	this->generator_parser_->parse_request_header (request);
+        this->generator_parser_->parse_request_header (request);
 
 
       // Throw an exception if the
       if (parse_error != 0)
-	ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
-				       CORBA::COMPLETED_NO));
+        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+                                       CORBA::COMPLETED_NO));
       request_id = request.request_id ();
 
-      response_required	= request.response_expected ();
+      response_required = request.response_expected ();
 
-      CORBA::Object_var	forward_to;
+      CORBA::Object_var forward_to;
 
 
-      // Do this before	the reply is sent.
+      // Do this before the reply is sent.
       orb_core->adapter_registry ()->dispatch (request.object_key (),
-					       request,
-					       0,
-					       forward_to,
-					       ACE_TRY_ENV);
+                                               request,
+                                               0,
+                                               forward_to,
+                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (!CORBA::is_nil (forward_to.in	()))
-	{
-	  // We	should forward to another object...
-	  TAO_Pluggable_Reply_Params reply_params (orb_core);
-	  reply_params.request_id_ = request_id;
-	  reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
-	  reply_params.svc_ctx_.length (0);
-
-	  // Sending back the same service context list	we received in the
-	  // Request.  (Important for RT CORBA).
-	  reply_params.service_context_notowned	(&request.service_info ());
-
-	  // Make the GIOP header and Reply header
-	  this->generate_reply_header (*this->output_,
-				       reply_params);
-
-	  *this->output_ << forward_to.in ();
-
-	  int result = transport->send_message (*this->output_);
-	  if (result ==	-1)
-	    {
-	      if (TAO_debug_level > 0)
-		{
-		  // No	exception but some kind	of error, yet a
-		  // response is required.
-		  ACE_ERROR ((LM_ERROR,
-			      ACE_TEXT ("TAO: (%P|%t|%N|%l) %p:	")
-			      ACE_TEXT ("cannot	send reply\n"),
-			      ACE_TEXT ("TAO_GIOP::process_server_message")));
-		}
-	    }
-	  return result;
-	}
+      if (!CORBA::is_nil (forward_to.in ()))
+        {
+          // We should forward to another object...
+          TAO_Pluggable_Reply_Params reply_params (orb_core);
+          reply_params.request_id_ = request_id;
+          reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
+          reply_params.svc_ctx_.length (0);
+
+          // Sending back the same service context list we received in the
+          // Request.  (Important for RT CORBA).
+          reply_params.service_context_notowned (&request.service_info ());
+
+          // Make the GIOP header and Reply header
+          this->generate_reply_header (*this->output_,
+                                       reply_params);
+
+          *this->output_ << forward_to.in ();
+
+          int result = transport->send_message (*this->output_);
+          if (result == -1)
+            {
+              if (TAO_debug_level > 0)
+                {
+                  // No exception but some kind of error, yet a
+                  // response is required.
+                  ACE_ERROR ((LM_ERROR,
+                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
+                              ACE_TEXT ("cannot send reply\n"),
+                              ACE_TEXT ("TAO_GIOP::process_server_message")));
+                }
+            }
+          return result;
+        }
     }
-  // Only CORBA	exceptions are caught here.
+  // Only CORBA exceptions are caught here.
   ACE_CATCHANY
     {
       int result = 0;
 
       if (response_required)
-	{
-	  result = this->send_reply_exception (transport,
-					       orb_core,
-					       request_id,
-					       &request.service_info (),
-					       &ACE_ANY_EXCEPTION);
-	  if (result ==	-1)
-	    {
-	      if (TAO_debug_level > 0)
-		{
-		  ACE_ERROR ((LM_ERROR,
-			      ACE_TEXT ("TAO: (%P|%t|%N|%l) %p:	")
-			      ACE_TEXT ("cannot	send exception\n"),
-			      ACE_TEXT ("process_connector_request ()")));
-		}
-
-	      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-				   "TAO: ");
-	    }
-
-	}
+        {
+          result = this->send_reply_exception (transport,
+                                               orb_core,
+                                               request_id,
+                                               &request.service_info (),
+                                               &ACE_ANY_EXCEPTION);
+          if (result == -1)
+            {
+              if (TAO_debug_level > 0)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
+                              ACE_TEXT ("cannot send exception\n"),
+                              ACE_TEXT ("process_connector_request ()")));
+                }
+
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                                   "TAO: ");
+            }
+
+        }
       else if (TAO_debug_level > 0)
-	{
-	  // 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.
+        {
+          // 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.
 
-	  ACE_ERROR ((LM_ERROR,
-		      ACE_TEXT ("(%P|%t) exception thrown ")
-		      ACE_TEXT ("but client is not waiting a response\n")));
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t) exception thrown ")
+                      ACE_TEXT ("but client is not waiting a response\n")));
 
-	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			       "TAO: ");
-	}
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "TAO: ");
+        }
 
       return result;
     }
 #if defined (TAO_HAS_EXCEPTIONS)
   ACE_CATCHALL
     {
-      // @@ TODO some c++ exception or another,	but what do we do with
+      // @@ TODO some c++ exception or another, but what do we do with
       //    it?
-      // We are	supposed to map	it into	a CORBA::UNKNOWN exception.
+      // 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!
+      // 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!
       int result = 0;
 
       if (response_required)
-	{
-	  CORBA::UNKNOWN exception (
-	      CORBA::SystemException::_tao_minor_code (
-		  TAO_UNHANDLED_SERVER_CXX_EXCEPTION,
-		  0
-		),
-	      CORBA::COMPLETED_MAYBE
-	    );
-
-	  result = this->send_reply_exception (transport,
-					       orb_core,
-					       request_id,
-					       &request.service_info (),
-					       &exception);
-	  if (result ==	-1)
-	    {
-	      if (TAO_debug_level > 0)
-		{
-		  ACE_ERROR ((LM_ERROR,
-			      ACE_TEXT ("TAO: (%P|%t|%N|%l) %p:	")
-			      ACE_TEXT ("cannot	send exception\n"),
-			      ACE_TEXT ("process_connector_request ()")));
-		}
-
-	      ACE_PRINT_EXCEPTION (exception, "TAO: ");
-	    }
-	}
+        {
+          CORBA::UNKNOWN exception (
+              CORBA::SystemException::_tao_minor_code (
+                  TAO_UNHANDLED_SERVER_CXX_EXCEPTION,
+                  0
+                ),
+              CORBA::COMPLETED_MAYBE
+            );
+
+          result = this->send_reply_exception (transport,
+                                               orb_core,
+                                               request_id,
+                                               &request.service_info (),
+                                               &exception);
+          if (result == -1)
+            {
+              if (TAO_debug_level > 0)
+                {
+                  ACE_ERROR ((LM_ERROR,
+                              ACE_TEXT ("TAO: (%P|%t|%N|%l) %p: ")
+                              ACE_TEXT ("cannot send exception\n"),
+                              ACE_TEXT ("process_connector_request ()")));
+                }
+
+              ACE_PRINT_EXCEPTION (exception, "TAO: ");
+            }
+        }
       else if (TAO_debug_level > 0)
-	{
-	  // 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.
-	  ACE_ERROR ((LM_ERROR,
-		      ACE_TEXT ("(%P|%t|%N|%l) exception thrown	")
-		      ACE_TEXT ("but client is not waiting a response\n")));
-	}
+        {
+          // 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.
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("(%P|%t|%N|%l) exception thrown ")
+                      ACE_TEXT ("but client is not waiting a response\n")));
+        }
 
       return result;
     }
@@ -661,13 +662,13 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
 
 int
 TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
-					       TAO_ORB_Core* orb_core,
-					       TAO_InputCDR &input)
+                                               TAO_ORB_Core* orb_core,
+                                               TAO_InputCDR &input)
 {
   // This will extract the request header, set <response_required> as
   // appropriate.
-  TAO_GIOP_Locate_Request_Header locate_request	(input,
-						 orb_core);
+  TAO_GIOP_Locate_Request_Header locate_request (input,
+                                                 orb_core);
 
   TAO_GIOP_Locate_Status_Msg status_info;
 
@@ -680,119 +681,119 @@ TAO_GIOP_Message_Base::process_locate_request (TAO_Transport *transport,
   ACE_TRY
     {
       int parse_error =
-	this->generator_parser_->parse_locate_header (locate_request);
+        this->generator_parser_->parse_locate_header (locate_request);
 
       if (parse_error != 0)
-	{
-	  ACE_TRY_THROW	(CORBA::MARSHAL	(TAO_DEFAULT_MINOR_CODE,
-					 CORBA::COMPLETED_NO));
-	}
+        {
+          ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+                                         CORBA::COMPLETED_NO));
+        }
 
-      // Execute a fake	request	to find	out if the object is there or
-      // if the	POA can	activate it on demand...
+      // Execute a fake request to find out if the object is there or
+      // if the POA can activate it on demand...
       char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
       TAO_OutputCDR dummy_output (repbuf,
-				  sizeof repbuf);
-      // This output CDR is not	used!
+                                  sizeof repbuf);
+      // This output CDR is not used!
 
       TAO_ObjectKey tmp_key (locate_request.object_key ().length (),
-			     locate_request.object_key ().length (),
-			     locate_request.object_key ().get_buffer (),
-			     0);
+                             locate_request.object_key ().length (),
+                             locate_request.object_key ().get_buffer (),
+                             0);
 
-      // Set it	to an error state
+      // Set it to an error state
       parse_error = 1;
       CORBA::ULong req_id = locate_request.request_id ();
 
       // We will send the reply. The ServerRequest class need not send
       // the reply
       CORBA::Boolean deferred_reply = 1;
-      TAO_ServerRequest	server_request (this,
-					req_id,
-					response_required,
-					deferred_reply,
-					tmp_key,
-					"_non_existent",
-					dummy_output,
-					transport,
-					orb_core,
-					parse_error);
+      TAO_ServerRequest server_request (this,
+                                        req_id,
+                                        response_required,
+                                        deferred_reply,
+                                        tmp_key,
+                                        "_non_existent",
+                                        dummy_output,
+                                        transport,
+                                        orb_core,
+                                        parse_error);
 
       if (parse_error != 0)
-	{
-	  ACE_TRY_THROW	(CORBA::MARSHAL	(TAO_DEFAULT_MINOR_CODE,
-					 CORBA::COMPLETED_NO));
-	}
+        {
+          ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+                                         CORBA::COMPLETED_NO));
+        }
 
-      CORBA::Object_var	forward_to;
+      CORBA::Object_var forward_to;
 
       orb_core->adapter_registry ()->dispatch (server_request.object_key (),
-					       server_request,
-					       0,
-					       forward_to,
-					       ACE_TRY_ENV);
+                                               server_request,
+                                               0,
+                                               forward_to,
+                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (!CORBA::is_nil (forward_to.in	()))
-	{
-	  status_info.status = TAO_GIOP_OBJECT_FORWARD;
-	  status_info.forward_location_var = forward_to;
-	  ACE_DEBUG ((LM_DEBUG,
-		      ACE_TEXT ("handle_locate has been	called:	forwarding\n")));
-	}
-      else if (server_request.exception_type ()	== TAO_GIOP_NO_EXCEPTION)
-	{
-	  // We	got no exception, so the object	is here.
-	  status_info.status = TAO_GIOP_OBJECT_HERE;
-	  if (TAO_debug_level >	0)
-	    ACE_DEBUG ((LM_DEBUG,
-			ACE_TEXT ("TAO:	(%P|%t)	handle_locate()	: found\n")));
-	}
+      if (!CORBA::is_nil (forward_to.in ()))
+        {
+          status_info.status = TAO_GIOP_OBJECT_FORWARD;
+          status_info.forward_location_var = forward_to;
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("handle_locate has been called: forwarding\n")));
+        }
+      else if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
+        {
+          // We got no exception, so the object is here.
+          status_info.status = TAO_GIOP_OBJECT_HERE;
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("TAO: (%P|%t) handle_locate() : found\n")));
+        }
       else
-	{
-	  status_info.forward_location_var = server_request.forward_location ();
-
-	  if (!CORBA::is_nil (status_info.forward_location_var.in ()))
-	    {
-	      status_info.status = TAO_GIOP_OBJECT_FORWARD;
-	      ACE_DEBUG	((LM_DEBUG,
-			  ACE_TEXT ("handle_locate has been called: forwarding\n")));
-	    }
-	  else
-	    {
-	      // Normal	exception, so the object is not	here
-	      status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
-	      ACE_DEBUG	((LM_DEBUG,
-			  ACE_TEXT ("handle_locate has been called: not	here\n")));
-	    }
-	}
+        {
+          status_info.forward_location_var = server_request.forward_location ();
+
+          if (!CORBA::is_nil (status_info.forward_location_var.in ()))
+            {
+              status_info.status = TAO_GIOP_OBJECT_FORWARD;
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("handle_locate has been called: forwarding\n")));
+            }
+          else
+            {
+              // Normal exception, so the object is not here
+              status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
+              ACE_DEBUG ((LM_DEBUG,
+                          ACE_TEXT ("handle_locate has been called: not here\n")));
+            }
+        }
     }
 
   ACE_CATCHANY
     {
-      // Normal	exception, so the object is not	here
+      // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ")
-		    ACE_TEXT ("CORBA exception raised\n")));
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ")
+                    ACE_TEXT ("CORBA exception raised\n")));
     }
 #if defined (TAO_HAS_EXCEPTIONS)
   ACE_CATCHALL
     {
-      // Normal	exception, so the object is not	here
+      // Normal exception, so the object is not here
       status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ")
-		    ACE_TEXT ("C++ exception raised\n")));
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ")
+                    ACE_TEXT ("C++ exception raised\n")));
     }
 #endif /* TAO_HAS_EXCEPTIONS */
   ACE_ENDTRY;
 
   return this->make_send_locate_reply (transport,
-				       locate_request,
-				       status_info);
+                                       locate_request,
+                                       status_info);
 }
 
 
@@ -804,46 +805,46 @@ TAO_GIOP_Message_Base::make_send_locate_reply (
     TAO_GIOP_Locate_Status_Msg &status_info
   )
 {
-  // Note here we are making the Locate	reply header which is *QUITE*
-  // different from the	reply header made by the make_reply () call..
+  // Note here we are making the Locate reply header which is *QUITE*
+  // different from the reply header made by the make_reply () call..
   // Make the GIOP message header
   this->write_protocol_header (TAO_GIOP_LOCATEREPLY,
-			       *this->output_);
+                               *this->output_);
 
   // This writes the header & body
   this->generator_parser_->write_locate_reply_mesg (*this->output_,
-						    request.request_id (),
-						    status_info);
+                                                    request.request_id (),
+                                                    status_info);
 
   // Send the message
   int result = transport->send_message (*this->output_);
 
-  // Print out message if there	is an error
-  if (result ==	-1)
+  // Print out message if there is an error
+  if (result == -1)
     {
       if (TAO_debug_level > 0)
-	{
-	  ACE_ERROR ((LM_ERROR,
-		      ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"),
-		      ACE_TEXT ("TAO_GIOP::process_server_message")));
-	}
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"),
+                      ACE_TEXT ("TAO_GIOP::process_server_message")));
+        }
     }
 
   return result;
 }
 
-// Send	an "I can't understand you" message -- again, the message is
-// prefabricated for simplicity.  This implies abortive	disconnect (at
-// the application level, if not at the	level of TCP).
+// Send an "I can't understand you" message -- again, the message is
+// prefabricated for simplicity.  This implies abortive disconnect (at
+// the application level, if not at the level of TCP).
 //
-// NOTE	that IIOP will still benefit from TCP's	orderly	disconnect.
+// NOTE that IIOP will still benefit from TCP's orderly disconnect.
 int
 TAO_GIOP_Message_Base::send_error (TAO_Transport *transport)
 {
-  const	char
-    error_message [TAO_GIOP_MESSAGE_HEADER_LEN]	=
+  const char
+    error_message [TAO_GIOP_MESSAGE_HEADER_LEN] =
   {
-    // The following works on non-ASCII	platforms, such	as MVS (which
+    // The following works on non-ASCII platforms, such as MVS (which
     // uses EBCDIC).
     0x47, // 'G'
     0x49, // 'I'
@@ -856,32 +857,33 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport)
     0, 0, 0, 0
   };
 
-  // @@	Q: How does this works with GIOP lite?
-  //	A: It doesn't
+  // @@ Q: How does this works with GIOP lite?
+  //    A: It doesn't
 
   this->dump_msg ("send_error",
-		  (const u_char	*) error_message,
-		  TAO_GIOP_MESSAGE_HEADER_LEN );
+                  (const u_char *) error_message,
+                  TAO_GIOP_MESSAGE_HEADER_LEN );
 
   ACE_HANDLE which = transport->handle ();
 
   ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN,
-			     ACE_Message_Block::MB_DATA,
-			     error_message,
-			     0,
-			     0,
-			     ACE_Message_Block::DONT_DELETE,
-			     0);
+                             ACE_Message_Block::MB_DATA,
+                             error_message,
+                             0,
+                             0,
+                             ACE_Message_Block::DONT_DELETE,
+                             0);
   ACE_Message_Block message_block(&data_block);
   message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
 
-  int result = transport->send (&message_block);
-  if (result ==	-1)
+  size_t bt;
+  int result = transport->send_message_block_chain (&message_block, bt);
+  if (result == -1)
     {
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to	%d\n"),
-		    which));
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to %d\n"),
+                    which));
     }
 
   return result;
@@ -890,39 +892,39 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport)
 
 void
 TAO_GIOP_Message_Base::set_state (CORBA::Octet def_major,
-				  CORBA::Octet def_minor)
+                                  CORBA::Octet def_minor)
 {
   // @@Bala Need to find a better way
-  // @@	Bala: what about a table:
+  // @@ Bala: what about a table:
   // Accept_State implementations[] = {
   //   Version_10,
   //   Version_11
   // };
   // this->accept_state_ = &implementations[def_minor];
-  // @@	of course it requires range checking and the array must	be in
-  // some place	where it is not	detroyed too soon...
-  // @@	I'm not	sure if	this implementations should be dynamically
+  // @@ of course it requires range checking and the array must be in
+  // some place where it is not detroyed too soon...
+  // @@ I'm not sure if this implementations should be dynamically
   // loaded.
   switch (def_major)
     {
     case 1:
       switch (def_minor)
-	{
-	case 0:
-	  this->generator_parser_ =
-	    &this->tao_giop_impl_.tao_giop_10;
-	  break;
-	case 1:
-	  this->generator_parser_ =
-	    &this->tao_giop_impl_.tao_giop_11;
-	  break;
-	case 2:
-	  this->generator_parser_ =
-	    &this->tao_giop_impl_.tao_giop_12;
-	  break;
-	default:
-	  break;
-	}
+        {
+        case 0:
+          this->generator_parser_ =
+            &this->tao_giop_impl_.tao_giop_10;
+          break;
+        case 1:
+          this->generator_parser_ =
+            &this->tao_giop_impl_.tao_giop_11;
+          break;
+        case 2:
+          this->generator_parser_ =
+            &this->tao_giop_impl_.tao_giop_12;
+          break;
+        default:
+          break;
+        }
       break;
     default:
       break;
@@ -930,34 +932,34 @@ TAO_GIOP_Message_Base::set_state (CORBA::Octet def_major,
 }
 
 
-// Server sends	an "I'm	shutting down now, any requests	you've sent me
+// Server sends an "I'm shutting down now, any requests you've sent me
 // can be retried" message to the server.  The message is prefab, for
 // simplicity.
 //
 // NOTE: this is IIOP-specific though it doesn't look like it is.  It
-// relies on a TCP-ism:	orderly	disconnect, which doesn't exist	in all
-// transport protocols.	 Versions of GIOP atop some transport that's
+// relies on a TCP-ism: orderly disconnect, which doesn't exist in all
+// transport protocols.  Versions of GIOP atop some transport that's
 // lacking orderly disconnect must define some transport-specific
-// handshaking (e.g. the XNS/SPP handshake convention) in order	to
-// know	that the same transport	semantics are provided when shutdown
+// handshaking (e.g. the XNS/SPP handshake convention) in order to
+// know that the same transport semantics are provided when shutdown
 // is begun with messages "in flight". (IIOP doesn't report false
-// errors in the case of "clean	shutdown", because it relies on
-// orderly disconnect as provided by TCP.  This	quality	of service is
-// required to write robust distributed	systems.)
+// errors in the case of "clean shutdown", because it relies on
+// orderly disconnect as provided by TCP.  This quality of service is
+// required to write robust distributed systems.)
 
 void
 TAO_GIOP_Message_Base::
-  send_close_connection	(const TAO_GIOP_Version	&version,
-			 TAO_Transport *transport,
-			 void *)
+  send_close_connection (const TAO_GIOP_Version &version,
+                         TAO_Transport *transport,
+                         void *)
 {
 
   // static CORBA::Octet
-  // I hate  this in every method. Till	the time I figure out a	way
+  // I hate  this in every method. Till the time I figure out a way
   // around  I will have them here hanging around.
-  const	char close_message [TAO_GIOP_MESSAGE_HEADER_LEN] =
+  const char close_message [TAO_GIOP_MESSAGE_HEADER_LEN] =
   {
-    // The following works on non-ASCII	platforms, such	as MVS (which
+    // The following works on non-ASCII platforms, such as MVS (which
     // uses EBCDIC).
     0x47, // 'G'
     0x49, // 'I'
@@ -970,48 +972,50 @@ TAO_GIOP_Message_Base::
     0, 0, 0, 0
   };
 
-  // It's important that we use	a reliable shutdown after we send this
+  // It's important that we use a reliable shutdown after we send this
   // message, so we know it's received.
   //
-  // @@	should recv and	discard	queued data for	portability; note
-  // that this won't block (long) since	we never set SO_LINGER
+  // @@ should recv and discard queued data for portability; note
+  // that this won't block (long) since we never set SO_LINGER
 
   this->dump_msg ("send_close_connection",
-		  (const u_char	*) close_message,
-		  TAO_GIOP_MESSAGE_HEADER_LEN);
+                  (const u_char *) close_message,
+                  TAO_GIOP_MESSAGE_HEADER_LEN);
 
   ACE_HANDLE which = transport->handle ();
   if (which == ACE_INVALID_HANDLE)
     {
       if (TAO_debug_level > 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "TAO (%P|%t) TAO_GIOP::send_close_connection -"
-		    " connection already closed\n"));
+        ACE_DEBUG ((LM_DEBUG,
+                    "TAO (%P|%t) TAO_GIOP::send_close_connection -"
+                    " connection already closed\n"));
       return;
     }
 
   ACE_Data_Block data_block (TAO_GIOP_MESSAGE_HEADER_LEN,
-			     ACE_Message_Block::MB_DATA,
-			     close_message,
-			     0,
-			     0,
-			     ACE_Message_Block::DONT_DELETE,
-			     0);
+                             ACE_Message_Block::MB_DATA,
+                             close_message,
+                             0,
+                             0,
+                             ACE_Message_Block::DONT_DELETE,
+                             0);
   ACE_Message_Block message_block(&data_block);
   message_block.wr_ptr (TAO_GIOP_MESSAGE_HEADER_LEN);
 
-  if (transport->send (&message_block) == -1)
+  size_t bt;
+  int result = transport->send_message_block_chain (&message_block, bt);
+  if (result == -1)
     {
       if (TAO_orbdebug)
-	ACE_ERROR ((LM_ERROR,
-		    "(%P|%t) error closing connection %d\n",
-		    which));
+        ACE_ERROR ((LM_ERROR,
+                    "(%P|%t) error closing connection %d\n",
+                    which));
     }
 
   transport->close_connection ();
   ACE_DEBUG ((LM_DEBUG,
-	      "(%P|%t) shut down transport, handle %d\n",
-	      which));
+              "(%P|%t) shut down transport, handle %d\n",
+              which));
 
 }
 
@@ -1028,51 +1032,51 @@ TAO_GIOP_Message_Base::send_reply_exception (
   // Create a new output CDR stream
   char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
 #if defined(ACE_HAS_PURIFY)
-  (void) ACE_OS::memset	(repbuf,
-			 '\0',
-			 sizeof	repbuf);
+  (void) ACE_OS::memset (repbuf,
+                         '\0',
+                         sizeof repbuf);
 #endif /* ACE_HAS_PURIFY */
-  TAO_OutputCDR	output (repbuf,
-			sizeof repbuf,
-			TAO_ENCAP_BYTE_ORDER,
-			orb_core->output_cdr_buffer_allocator (),
-			orb_core->output_cdr_dblock_allocator (),
-			orb_core->orb_params ()->cdr_memcpy_tradeoff (),
-			orb_core->to_iso8859 (),
-			orb_core->to_unicode ());
+  TAO_OutputCDR output (repbuf,
+                        sizeof repbuf,
+                        TAO_ENCAP_BYTE_ORDER,
+                        orb_core->output_cdr_buffer_allocator (),
+                        orb_core->output_cdr_dblock_allocator (),
+                        orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+                        orb_core->to_iso8859 (),
+                        orb_core->to_unicode ());
 
   TAO_Pluggable_Reply_Params reply_params (orb_core);
   reply_params.request_id_ = request_id;
   reply_params.svc_ctx_.length (0);
 
-  // We	are going to send some data
-  reply_params.argument_flag_ =	1;
+  // We are going to send some data
+  reply_params.argument_flag_ = 1;
 
-  // Send back the service context we received.	 (RTCORBA relies on
+  // Send back the service context we received.  (RTCORBA relies on
   // this).
-  reply_params.service_context_notowned	(svc_info);
+  reply_params.service_context_notowned (svc_info);
 
   reply_params.reply_status_ = TAO_GIOP_USER_EXCEPTION;
 
-  if (CORBA::SystemException::_downcast	(x) != 0)
+  if (CORBA::SystemException::_downcast (x) != 0)
     {
       reply_params.reply_status_ = TAO_GIOP_SYSTEM_EXCEPTION;
     }
 
   if (this->generate_exception_reply (output,
-				      reply_params,
-				      *x) == -1)
+                                      reply_params,
+                                      *x) == -1)
     return -1;
 
   return transport->send_message (output);
 }
 
 void
-TAO_GIOP_Message_Base::dump_msg	(const char *label,
-				 const u_char *ptr,
-				 size_t	len)
+TAO_GIOP_Message_Base::dump_msg (const char *label,
+                                 const u_char *ptr,
+                                 size_t len)
 {
-  static const char digits [] =	"0123456789ABCD";
+  static const char digits [] = "0123456789ABCD";
   static const char *names [] =
   {
     "Request",
@@ -1090,8 +1094,8 @@ TAO_GIOP_Message_Base::dump_msg	(const char *label,
       // Message name.
       const char *message_name = "UNKNOWN MESSAGE";
       u_long slot = ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET];
-      if (slot < sizeof	(names)/sizeof(names[0]))
-	message_name = names [slot];
+      if (slot < sizeof (names)/sizeof(names[0]))
+        message_name = names [slot];
 
       // Byte order.
       int byte_order = ptr[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & 0x01;
@@ -1100,40 +1104,40 @@ TAO_GIOP_Message_Base::dump_msg	(const char *label,
       CORBA::ULong tmp = 0;
       CORBA::ULong *id = &tmp;
 
-      if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST	||
-	  ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY)
-	{
-	  // @@	Only works if ServiceContextList is empty....
-	  if (this->generator_parser_->minor_version ()	< 2)
-	    {
-	      id = ACE_reinterpret_cast	(CORBA::ULong *,
-					 (char * ) (ptr	+ TAO_GIOP_MESSAGE_HEADER_LEN  + 4));
-
-	    }
-	  else
-	    {
-	      id = ACE_reinterpret_cast	(CORBA::ULong *,
-					 (char * ) (ptr	+ TAO_GIOP_MESSAGE_HEADER_LEN));
-	    }
-	}
+      if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST ||
+          ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY)
+        {
+          // @@ Only works if ServiceContextList is empty....
+          if (this->generator_parser_->minor_version () < 2)
+            {
+              id = ACE_reinterpret_cast (CORBA::ULong *,
+                                         (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN  + 4));
+
+            }
+          else
+            {
+              id = ACE_reinterpret_cast (CORBA::ULong *,
+                                         (char * ) (ptr + TAO_GIOP_MESSAGE_HEADER_LEN));
+            }
+        }
 
       // Print.
-      ACE_DEBUG	((LM_DEBUG,
-		  ACE_TEXT ("(%P | %t):%s GIOP v%c.%c msg, ")
-		  ACE_TEXT ("%d	data bytes, %s endian, %s = %d\n"),
-		  label,
-		  digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
-		  digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
-		  len -	TAO_GIOP_MESSAGE_HEADER_LEN ,
-		  (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" :	"other",
-		  message_name,
-		  *id));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P | %t):%s GIOP v%c.%c msg, ")
+                  ACE_TEXT ("%d data bytes, %s endian, %s = %d\n"),
+                  label,
+                  digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
+                  digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
+                  len - TAO_GIOP_MESSAGE_HEADER_LEN ,
+                  (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
+                  message_name,
+                  *id));
 
       if (TAO_debug_level >= 10)
-	ACE_HEX_DUMP ((LM_DEBUG,
-		       (const char *) ptr,
-		       len,
-		       ACE_TEXT	("GIOP message")));
+        ACE_HEX_DUMP ((LM_DEBUG,
+                       (const char *) ptr,
+                       len,
+                       ACE_TEXT ("GIOP message")));
 
 
     }
@@ -1153,32 +1157,32 @@ TAO_GIOP_Message_Base::generate_locate_reply_header (
 int
 TAO_GIOP_Message_Base::is_ready_for_bidirectional (void)
 {
-  // We	dont really know.. So ask the enerator and parser objects that
-  // we	know.
+  // We dont really know.. So ask the enerator and parser objects that
+  // we know.
   return this->generator_parser_->is_ready_for_bidirectional ();
 }
 
 int
 TAO_GIOP_Message_Base::more_messages (void)
 {
-  // Does the handler have more	messages for processing?
-  int retval  =	this->message_handler_.more_messages ();
+  // Does the handler have more messages for processing?
+  int retval  = this->message_handler_.more_messages ();
 
-  if (retval ==	TAO_MESSAGE_BLOCK_COMPLETE ||
-      retval ==	TAO_MESSAGE_BLOCK_INCOMPLETE)
+  if (retval == TAO_MESSAGE_BLOCK_COMPLETE ||
+      retval == TAO_MESSAGE_BLOCK_INCOMPLETE)
     return 1;
 
   // Get the message state
-  TAO_GIOP_Message_State &state	=
+  TAO_GIOP_Message_State &state =
     this->message_handler_.message_state ();
 
   // Set the state internally for parsing and generating messages
   this->set_state (state.giop_version.major,
-		   state.giop_version.minor);
+                   state.giop_version.minor);
 
   // retval =  this->message_handler_.is_message_ready ();
 
-  if (retval ==	1)
+  if (retval == 1)
     {
       return TAO_MESSAGE_BLOCK_NEEDS_PROCESSING;
     }
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp
index fc431c2436b..9d53560d613 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -24,21 +24,21 @@ TAO_GIOP_Message_Generator_Parser::parse_reply (
   if (!stream.read_ulong (params.request_id_))
     {
       if (TAO_debug_level > 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
+	ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply, \n ")
                            ACE_TEXT ("extracting request id")),
                           -1);
     }
 
-  // and the reply status type.  status can be NO_EXCEPTION,
+  // and the reply status type.	 status	can be NO_EXCEPTION,
   // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
 
   // Cannot handle LOCATION_FORWARD_PERM here
-  CORBA::ULong rep_stat = 0;
+  CORBA::ULong rep_stat	= 0;
   if (!stream.read_ulong (rep_stat))
     {
       if (TAO_debug_level > 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
+	ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply, \n ")
                            ACE_TEXT ("extracting reply status")),
                           -1);
@@ -46,48 +46,48 @@ TAO_GIOP_Message_Generator_Parser::parse_reply (
     }
 
 
-  // Pass the right Pluggable interface code to the transport layer
+  // Pass the right Pluggable interface	code to	the transport layer
   switch (rep_stat)
     {
       // Request completed successfully
     case TAO_GIOP_NO_EXCEPTION:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
+	TAO_PLUGGABLE_MESSAGE_NO_EXCEPTION;
       break;
 
       // Request terminated with user exception
     case TAO_GIOP_USER_EXCEPTION:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION;
+	TAO_PLUGGABLE_MESSAGE_USER_EXCEPTION;
       break;
-      // Request terminated with system exception
+      // Request terminated with system	exception
     case TAO_GIOP_SYSTEM_EXCEPTION:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION;
+	TAO_PLUGGABLE_MESSAGE_SYSTEM_EXCEPTION;
       break;
       // Reply is a location forward type
     case TAO_GIOP_LOCATION_FORWARD:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
+	TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
       break;
       // Reply is a location forward perm type
-      // @@For the time being the behaviour of the
-      // LOCATION_FORWARD_PERM would be similar to the
-      // LOCATION_FORWARD as there is a controversy surrounding the
+      // @@For the time	being the behaviour of the
+      // LOCATION_FORWARD_PERM would be	similar	to the
+      // LOCATION_FORWARD as there is a	controversy surrounding	the
       // usage of this in the OMG.
     case TAO_GIOP_LOCATION_FORWARD_PERM:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
+	TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
       break;
       // Reply is a location forward type
     case TAO_GIOP_NEEDS_ADDRESSING_MODE:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE;
+	TAO_PLUGGABLE_MESSAGE_NEEDS_ADDRESSING_MODE;
       break;
     default:
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%N|%l) Unknown reply status \n")));
+	ACE_DEBUG ((LM_DEBUG,
+		    ACE_TEXT ("(%N|%l) Unknown reply status \n")));
     }
 
   return 0;
@@ -103,26 +103,26 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply (
   if (!cdr.read_ulong (params.request_id_))
     {
       if (TAO_debug_level > 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
+	ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("TAO (%P|%t|%N|%l):parse_locate_reply, ")
                            ACE_TEXT ("extracting request id \n")),
                           -1);
     }
 
-  // and the reply status type.  status can be NO_EXCEPTION,
+  // and the reply status type.	 status	can be NO_EXCEPTION,
   // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
 
   // Cannot handle LOCATION_FORWARD_PERM here
 
-  // Please note here that we are NOT converting to the Pluggable
+  // Please note here that we are NOT converting to the	Pluggable
   // messaging layer exception as this is GIOP specific. Not many
   // messaging protocols have the locate_* messages.
   if (!cdr.read_ulong (params.reply_status_))
     {
       if (TAO_debug_level > 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
+	ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("TAO N|(%P|%t|l) parse_locate_reply, ")
-                           ACE_TEXT ("extracting reply  status\n")),
+                           ACE_TEXT ("extracting reply	status\n")),
                           -1);
     }
 
@@ -217,67 +217,17 @@ TAO_GIOP_Message_Generator_Parser::unmarshall_ref_addr (
   CORBA::Boolean hdr_status =
     (CORBA::Boolean) input.good_bit ();
 
-  /*
-   * The GIOP::IORAddressingInfo is defined as follows
-   *   struct IORAddressingInfo
-   *     {
-   *       unsigned long selected_profile_index;
-   *       IOP::IOR ior;
-   *     };
-   *
-   * and the IOP::IOR is defined to be
-   *   struct IOR
-   *      {
-   *        string type_id;
-   *        sequence<TaggedProfile>   profiles;
-   *      };
-   */
-
-  // First read the profile index
-  CORBA::ULong prof_index =  0;
-
-  hdr_status =
-    hdr_status && input.read_ulong (prof_index);
-
-  // Set the value in TAO_Tagged_Profile
-  if (hdr_status)
-    profile_addr.profile_index (prof_index);
-
-  // Get the length of the type_id
-  CORBA::Long id_length = 0;
-  hdr_status = hdr_status && input.read_long (id_length);
-
-  if (hdr_status)
-    {
-      // Get the type_id
-      ACE_CString &type_id =
-        profile_addr.type_id ();
-
-      type_id.set (input.rd_ptr (),
-                   0);
-
-      input.skip_bytes (id_length);
-    }
+    // Get the IOP::Tagged profile.
+  GIOP::IORAddressingInfo &addr_info =
+    profile_addr.addressing_info ();
 
-  // Unmarshall the sequnce of TaggedProfiles
-  IOP::IOR::_tao_seq_TaggedProfile ior_profiles;
+  hdr_status &= input>> addr_info;
 
-  hdr_status &= input >> ior_profiles;
-
-  // Get the IOP::Tagged profile.
-  IOP::TaggedProfile &tagged_profile =
-    profile_addr.tagged_profile ();
-
-  // Get the right TaggedProfile from the <ior_profiles>
-  if (hdr_status)
-    {
-      tagged_profile =
-        ior_profiles [prof_index];
-    }
+  IOP::TaggedProfile &tag =
+    addr_info.ior.profiles [addr_info.selected_profile_index];
 
   // Extract the object key from the TaggedProfile.
-  hdr_status &=
-    profile_addr.extract_object_key (tagged_profile);
+  hdr_status &= profile_addr.extract_object_key (tag);
 
   return hdr_status;
 }
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index 50eaaf230da..a09f92202f4 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -3,7 +3,7 @@
 #include "GIOP_Message_Generator_Parser_10.h"
 #include "GIOP_Utils.h"
 
-#include "GIOP_Message_Locate_Header.h"
+#include "GIOP_Message_Headers.h"
 
 #include "operation_details.h"
 #include "CDR.h"
@@ -29,52 +29,52 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header (
     TAO_OutputCDR &msg)
 {
   // Write the service context list
-  msg << opdetails.service_info ();
+  msg << opdetails.service_info	();
 
   // The request ID
   msg << opdetails.request_id ();
 
-  const CORBA::Octet response_flags = opdetails.response_flags ();
+  const	CORBA::Octet response_flags = opdetails.response_flags ();
 
   // Write the response flags
-  if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
-    msg << CORBA::Any::from_octet (1);
+  if (response_flags ==	TAO_TWOWAY_RESPONSE_FLAG)
+    msg	<< CORBA::Any::from_octet (1);
   else
-    msg << CORBA::Any::from_octet (0);
+    msg	<< CORBA::Any::from_octet (0);
 
-  // In this case we cannot recognise anything other than the Object
-  // key as the address disposition variable. But we do a sanity check
+  // In	this case we cannot recognise anything other than the Object
+  // key as the	address	disposition variable. But we do	a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const	TAO_ObjectKey *key = spec.object_key ();
   if (key)
     {
-      // Put in the object key
+      // Put in	the object key
       msg << *key;
     }
   else
     {
       if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%N |%l) Unable to handle this request \n")));
+	ACE_DEBUG ((LM_DEBUG,
+		    ACE_TEXT ("(%N |%l)	Unable to handle this request \n")));
       return 0;
     }
 
   msg.write_string (opdetails.opname_len (),
-                    opdetails.opname ());
+		    opdetails.opname ());
 
   // Last element of request header is the principal; no portable way
-  // to get it, we just pass empty principal (convention: indicates
-  // "anybody").  Steps upward in security include passing an
-  // unverified user ID, and then verifying the message (i.e. a dummy
-  // service context entry is set up to hold a digital signature for
-  // this message, then patched shortly before it's sent).
+  // to	get it,	we just	pass empty principal (convention: indicates
+  // "anybody").  Steps	upward in security include passing an
+  // unverified	user ID, and then verifying the	message	(i.e. a	dummy
+  // service context entry is set up to	hold a digital signature for
+  // this message, then	patched	shortly	before it's sent).
 
   /***** This has been deprecated in the 2.4 spec ******/
-  //static CORBA::Principal_ptr principal = 0;
-  //msg << principal;
+  //static CORBA::Principal_ptr	principal = 0;
+  //msg	<< principal;
 
   // This is now introduced in 2.4 spec
-  CORBA::OctetSeq req_principal (0);
+  CORBA::OctetSeq req_principal	(0);
   req_principal.length (0);
   msg << req_principal;
 
@@ -92,10 +92,10 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_request_header (
 {
   msg << request_id;
 
-  // In this case we cannot recognise anything other than the Object
-  // key as the address disposition variable. But we do a sanity check
+  // In	this case we cannot recognise anything other than the Object
+  // key as the	address	disposition variable. But we do	a sanity check
   // anyway.
-  const TAO_ObjectKey *key = spec.object_key ();
+  const	TAO_ObjectKey *key = spec.object_key ();
   if (key)
     {
       // Everything is fine
@@ -104,8 +104,8 @@ TAO_GIOP_Message_Generator_Parser_10::write_locate_request_header (
   else
     {
       if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("(%N | %l) Unable to handle this request \n")));
+	ACE_DEBUG ((LM_DEBUG,
+		    ACE_TEXT ("(%N | %l) Unable	to handle this request \n")));
       return 0;
     }
 
@@ -413,7 +413,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_reply (
   // Read the service context list first
   if ((stream >> params.svc_ctx_) == 0)
     {
-      if (TAO_debug_level >     0)
+      if (TAO_debug_level >	0)
         ACE_DEBUG ((LM_DEBUG,
                     ACE_TEXT ("TAO (%P|%t) parse_reply, ")
                     ACE_TEXT ("extracting context\n")));
@@ -453,7 +453,7 @@ CORBA::Octet
 TAO_GIOP_Message_Generator_Parser_10::major_version (void)
 {
   // Any harm in hardcoding??
-  return (CORBA::Octet) 1;
+  return (CORBA::Octet)	1;
 }
 
 CORBA::Octet
diff --git a/TAO/tao/GIOP_Message_Handler.cpp b/TAO/tao/GIOP_Message_Handler.cpp
index 965e73cb2ea..b6ba9cea4b2 100644
--- a/TAO/tao/GIOP_Message_Handler.cpp
+++ b/TAO/tao/GIOP_Message_Handler.cpp
@@ -36,7 +36,6 @@ TAO_GIOP_Message_Handler::read_parse_message (TAO_Transport *transport)
   // Read the message from the transport. The size of the message read
   // is the maximum size of the buffer that we have less the amount of
   // data that has already been read in to the buffer.
-
   ssize_t n = transport->recv (this->current_buffer_.wr_ptr (),
                                this->current_buffer_.space ());
 
@@ -44,7 +43,17 @@ TAO_GIOP_Message_Handler::read_parse_message (TAO_Transport *transport)
     {
       if (errno == EWOULDBLOCK)
         return 0;
-
+     else if (errno == ECONNRESET)
+       {
+         // @@ Is this OK??
+
+         // We got a connection reset (TCP RSET) from the other side,
+         // i.e., they didn't initiate a proper shutdown.
+         //
+         // Make it look like things are OK to the upper layer.
+         errno = 0;
+         return 0;
+       }
       return -1;
     }
   // @@ What are the other error handling here??
@@ -58,7 +67,7 @@ TAO_GIOP_Message_Handler::read_parse_message (TAO_Transport *transport)
 
   if (TAO_debug_level > 8)
     {
-      ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - received %d bytes 1\n", n));
+      ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - received %d bytes\n", n));
     }
 
   // Check what message are we waiting for and take suitable action
@@ -270,7 +279,7 @@ TAO_GIOP_Message_Handler::read_ulong (const char *ptr)
 }
 
 int
-TAO_GIOP_Message_Handler::is_message_ready (TAO_Transport *transport)
+TAO_GIOP_Message_Handler::is_message_ready (void)
 {
   if (this->message_status_ == TAO_GIOP_WAITING_FOR_PAYLOAD)
     {
@@ -330,43 +339,6 @@ TAO_GIOP_Message_Handler::is_message_ready (TAO_Transport *transport)
 
           return this->message_state_.is_complete (this->current_buffer_);
         }
-      // @@ This is the ultimate hack for SHMIOP and related protocols
-      // @@ that uses the reactor for signalling rather than for data
-      // @@ transfer. This hack was done in the at the last minute for
-      // @@ the beta 1.1.13. This hack needs to be removed for the
-      // @@ next beta - Bala
-      else if (transport->reactor_signalling ())
-        {
-          // If the reactor is used by the transport for signalling,
-          // then do the rest of the read here.
-          ssize_t n = transport->recv (this->current_buffer_.wr_ptr (),
-                                       this->current_buffer_.space ());
-
-          if (n == -1)
-            {
-              if (errno == EWOULDBLOCK)
-                return 0;
-
-              return -1;
-            }
-          // @@ What are the other error handling here??
-          else if (n == 0)
-            {
-              return -1;
-            }
-
-          // Now we have a succesful read. First adjust the write pointer
-          this->current_buffer_.wr_ptr (n);
-
-          if (TAO_debug_level > 8)
-          {
-            ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - received %d bytes\n", n));
-          }
-
-          // By now we should be having the whole message read in.
-          this->message_status_ = TAO_GIOP_WAITING_FOR_HEADER;
-          return this->message_state_.is_complete (this->current_buffer_);
-        }
     }
 
   // Just return allowing the reactor to call us back to get the rest
@@ -412,19 +384,7 @@ TAO_GIOP_Message_Handler::more_messages (void)
 
           return this->get_message ();
         }
-      else
-        {
-          // We have smaller than the header size left here. We
-          // just copy the rest of the stuff and reset things so that
-          // we can read the rest of the stuff from the socket.
-          this->current_buffer_.copy (
-              this->supp_buffer_.rd_ptr (),
-              len);
 
-          // Reset the supp buffer now
-          this->supp_buffer_.reset ();
-          this->message_status_ = TAO_GIOP_WAITING_FOR_HEADER;
-        }
 
     }
 
@@ -488,15 +448,6 @@ TAO_GIOP_Message_Handler::get_message (void)
           this->supp_buffer_.rd_ptr (this->message_state_.message_size);
           return this->message_state_.is_complete (this->current_buffer_);
         }
-      else
-        {
-          // The remaining message in the supp buffer
-          this->current_buffer_.copy (this->supp_buffer_.rd_ptr (),
-                                      this->supp_buffer_.length ());
-
-          // Reset the supp buffer now
-          this->supp_buffer_.reset ();
-        }
     }
 
   return TAO_MESSAGE_BLOCK_INCOMPLETE;
diff --git a/TAO/tao/GIOP_Message_Handler.h b/TAO/tao/GIOP_Message_Handler.h
index 2b9295cf9bc..ad00c012359 100644
--- a/TAO/tao/GIOP_Message_Handler.h
+++ b/TAO/tao/GIOP_Message_Handler.h
@@ -1,4 +1,4 @@
-// This	may look like C, but it's really -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
 // ===================================================================
 /**
@@ -10,14 +10,14 @@
  **/
 // ===================================================================
 
-#ifndef	TAO_GIOP_MESSAGE_HANDLER_H
-#define	TAO_GIOP_MESSAGE_HANDLER_H
+#ifndef TAO_GIOP_MESSAGE_HANDLER_H
+#define TAO_GIOP_MESSAGE_HANDLER_H
 #include "ace/pre.h"
 #include "ace/Message_Block.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE	*/
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/GIOP_Message_State.h"
 
@@ -27,10 +27,10 @@ class TAO_GIOP_Message_Base;
 
 enum TAO_GIOP_Message_Status
 {
-  /// The buffer is waiting for	the header of the message yet
-  TAO_GIOP_WAITING_FOR_HEADER =	0,
+  /// The buffer is waiting for the header of the message yet
+  TAO_GIOP_WAITING_FOR_HEADER = 0,
 
-  /// The buffer is waiting for	the payload to appear on the socket
+  /// The buffer is waiting for the payload to appear on the socket
   TAO_GIOP_WAITING_FOR_PAYLOAD,
 
   /// The buffer has got multiple messages
@@ -39,26 +39,26 @@ enum TAO_GIOP_Message_Status
 
 enum TAO_Message_Block_Content_Status
 {
-  /// The buffer has nomore info for processing	ie. all	information
-  /// have been	processed
+  /// The buffer has nomore info for processing ie. all information
+  /// have been processed
   TAO_MESSAGE_BLOCK_COMPLETE = 3,
 
   /// The buffer has something meaningful and needs processing
   TAO_MESSAGE_BLOCK_NEEDS_PROCESSING,
 
-  /// The buffer has nothing meaningful. Need to read more data	from
-  /// the socket to make the reamaining	data meaningful
+  /// The buffer has nothing meaningful. Need to read more data from
+  /// the socket to make the reamaining data meaningful
   TAO_MESSAGE_BLOCK_INCOMPLETE
 };
 
 /**
  * @class TAO_GIOP_Message_Handler
  *
- * @brief GIOP specific	message	handler	class
+ * @brief GIOP specific message handler class
  *
- * This	class does some	of the message handling	for GIOP. This class
+ * This class does some of the message handling for GIOP. This class
  * reads the message from the socket, splits the messages to create a
- * CDR stream out of it	and passes that	to the higher layers of	the ORB.
+ * CDR stream out of it and passes that to the higher layers of the ORB.
  * The read from the socket is done using a single 'read' instead of
  * reading the header and the payload seperately.
  */
@@ -68,93 +68,93 @@ class TAO_GIOP_Message_Handler
 public:
   /// Ctor
   TAO_GIOP_Message_Handler (TAO_ORB_Core *orb_core,
-			    TAO_GIOP_Message_Base *base);
+                            TAO_GIOP_Message_Base *base);
 
-  /// Read the message from the	transport in to	the
+  /// Read the message from the transport in to the
   /// <current_buffer_>. This method delegates responsibility of
   /// parsing to some of the helper methods.
-  int read_parse_message (TAO_Transport	*transport);
+  int read_parse_message (TAO_Transport *transport);
 
-  /// Check whether we have atleast one	complete message ready for
+  /// Check whether we have atleast one complete message ready for
   /// processing.
-  int is_message_ready (TAO_Transport *transport);
+  int is_message_ready (void);
 
   /// Do we have more messages for processing?
   int more_messages (void);
 
-  /// Reset the	contents of the	<current_buffer_> if no	more requests
+  /// Reset the contents of the <current_buffer_> if no more requests
   /// need to be processed. We reset the contents of the
-  /// <message_state_> to parse	and process the	next request.
+  /// <message_state_> to parse and process the next request.
   void reset (int reset_flag);
 
   /// Return the underlying message state
-  TAO_GIOP_Message_State &message_state	(void);
+  TAO_GIOP_Message_State &message_state (void);
 
-  /// Return the pointer to the	data block within the message block
+  /// Return the pointer to the data block within the message block
   ACE_Data_Block *data_block (void) const;
 
-  /// Return the pointer to the	datablock by duplicating it.
+  /// Return the pointer to the datablock by duplicating it.
   ACE_Data_Block *data_block_dup (void);
 
-  /// Return the rd_ptr	of the <current_buffer_>
+  /// Return the rd_ptr of the <current_buffer_>
   char *rd_ptr (void) const;
 
   /// Return the position of the read pointer in the <current_buffer_>
-  size_t rd_pos	(void) const;
+  size_t rd_pos (void) const;
 
   /// Return the position of the write pointer in the <current_buffer_>
-  size_t wr_pos	(void) const;
+  size_t wr_pos (void) const;
 
 private:
 
-  /// Parses the header	information from the <current_buffer_>.
+  /// Parses the header information from the <current_buffer_>.
   int parse_header (void);
 
-  /// Validates	the first 4 bytes that contain the magic word
-  /// "GIOP". Also calls the validate_version () on the	incoming
+  /// Validates the first 4 bytes that contain the magic word
+  /// "GIOP". Also calls the validate_version () on the incoming
   /// stream.
-  int parse_magic_bytes	(void);
+  int parse_magic_bytes (void);
 
-  /// Gets the size of the payload from	the <current_buffer_>. If the
-  /// size of the current buffer is less than the payload size,	the
+  /// Gets the size of the payload from the <current_buffer_>. If the
+  /// size of the current buffer is less than the payload size, the
   /// size of the buffer is increased.
-  CORBA::ULong get_payload_size	(void);
+  CORBA::ULong get_payload_size (void);
 
-  /// Extract a	CORBA::ULong from the <current_buffer_>
+  /// Extract a CORBA::ULong from the <current_buffer_>
   CORBA::ULong read_ulong (const char *buf);
 
-  /// Get the next message from	the <supp_buffer_> in to the
+  /// Get the next message from the <supp_buffer_> in to the
   /// <current_buffer_>
   int get_message (void);
 
 private:
 
-  /// The pointer to the object	that holds us
-  TAO_GIOP_Message_Base	*mesg_base_;
+  /// The pointer to the object that holds us
+  TAO_GIOP_Message_Base *mesg_base_;
 
-  /// The state	of the message in the buffer
+  /// The state of the message in the buffer
   TAO_GIOP_Message_Status message_status_;
 
-  /// The size of the message that is being read of the	socket.	This
-  /// value is originally set to 1024 bytes. It	is reset if we start
-  /// receiving	messages with payloads greater than that. The current
-  /// value of <message_size_> would be	the size of the	last message
+  /// The size of the message that is being read of the socket. This
+  /// value is originally set to 1024 bytes. It is reset if we start
+  /// receiving messages with payloads greater than that. The current
+  /// value of <message_size_> would be the size of the last message
   /// received (ie. payload+headers).
   size_t message_size_;
 
   /// The buffer. rd_ptr() points to the beginning of the current
-  /// message, properly	aligned	wr_ptr() points	to where the next
-  /// read() should put	the data.
+  /// message, properly aligned wr_ptr() points to where the next
+  /// read() should put the data.
   ACE_Message_Block current_buffer_;
 
-  /// The supplementary	buffer that holds just one message if the
-  /// <current_buffer_>	has more than one message. One message from
-  /// the <current_buffer_> is taken and filled	in this	buffer,	which
-  /// is then sent to the higher layers	of the ORB.
+  /// The supplementary buffer that holds just one message if the
+  /// <current_buffer_> has more than one message. One message from
+  /// the <current_buffer_> is taken and filled in this buffer, which
+  /// is then sent to the higher layers of the ORB.
   ACE_Message_Block supp_buffer_;
 
   /// The message state. It represents the status of the messages that
-  /// have been	read from the current_buffer_
+  /// have been read from the current_buffer_
   TAO_GIOP_Message_State message_state_;
 };
 
@@ -165,7 +165,7 @@ const size_t TAO_GIOP_MESSAGE_FLAGS_OFFSET = 6;
 const size_t TAO_GIOP_MESSAGE_TYPE_OFFSET  = 7;
 const size_t TAO_GIOP_VERSION_MINOR_OFFSET = 5;
 const size_t TAO_GIOP_VERSION_MAJOR_OFFSET = 4;
-const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER =	4;
+const size_t TAO_GIOP_MESSAGE_FRAGMENT_HEADER = 4;
 
 #if defined (__ACE_INLINE__)
 # include "tao/GIOP_Message_Handler.inl"
diff --git a/TAO/tao/GIOP_Message_Headers.cpp b/TAO/tao/GIOP_Message_Headers.cpp
new file mode 100644
index 00000000000..71e27e38905
--- /dev/null
+++ b/TAO/tao/GIOP_Message_Headers.cpp
@@ -0,0 +1,8 @@
+//$Id$
+#include "tao/GIOP_Message_Headers.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/GIOP_Message_Headers.i"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(tao, GIOP_Message_Headers, "$Id$")
diff --git a/TAO/tao/GIOP_Message_Headers.h b/TAO/tao/GIOP_Message_Headers.h
new file mode 100644
index 00000000000..9c9fbb3db0d
--- /dev/null
+++ b/TAO/tao/GIOP_Message_Headers.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file     GIOP_Message_Headers.h
+ *
+ *  $Id$
+ *
+ *   Some assorted GIOP structure mappings
+ *
+ *
+ *  @author  Balachandran Natarajan <bala@cs.wustl.edu>
+ */
+//=============================================================================
+
+
+#ifndef TAO_GIOP_MESSAGE_HEADERS_H
+#define TAO_GIOP_MESSAGE_HEADERS_H
+#include "ace/pre.h"
+
+#include "tao/Tagged_Profile.h"
+
+
+// @@ Bala: what goes in this file? All the message headers? A few of
+// @@ them? Only the Locate_Request header?!
+
+/**
+ * @class TAO_GIOP_Locate_Request_Header
+ *
+ * @brief Location service support
+ */
+class TAO_Export TAO_GIOP_Locate_Request_Header
+{
+public:
+
+  /// Constructor
+  TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg,
+                                  TAO_ORB_Core *core);
+
+  /// Set the id
+  void request_id (CORBA::ULong id);
+
+  /// Get the request id
+  CORBA::ULong request_id (void);
+
+  /// Get the object_key in read mode..
+  const TAO_ObjectKey &object_key (void) const;
+
+  /// Get the object_key in read/write mode..
+  TAO_ObjectKey &object_key (void);
+
+  /// Get the reference to the underlying profile
+  TAO_Tagged_Profile &profile (void);
+
+  /// Get the CDR stream for read/write
+  TAO_InputCDR &incoming_stream (void);
+
+private:
+  /// Request id
+  CORBA::ULong request_id_;
+
+  /// Profile info.
+  TAO_Tagged_Profile profile_;
+
+  /// Object Key
+  TAO_ObjectKey object_key_;
+
+  /// Incoming CDR stream
+  TAO_InputCDR *incoming_;
+};
+
+#if defined (__ACE_INLINE__)
+# include "tao/GIOP_Message_Headers.i"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif /*TAO_GIOP_MESSAGE_HEADERS_H*/
diff --git a/TAO/tao/GIOP_Message_Headers.i b/TAO/tao/GIOP_Message_Headers.i
new file mode 100644
index 00000000000..208019a5dea
--- /dev/null
+++ b/TAO/tao/GIOP_Message_Headers.i
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+//$Id$
+
+ACE_INLINE
+TAO_GIOP_Locate_Request_Header::TAO_GIOP_Locate_Request_Header (TAO_InputCDR &msg,
+                                                                TAO_ORB_Core *orb)
+  : request_id_ (0),
+    profile_ (orb),
+    incoming_ (&msg)
+{
+}
+
+ACE_INLINE void
+TAO_GIOP_Locate_Request_Header::request_id (CORBA::ULong id)
+{
+  this->request_id_ = id;
+}
+
+ACE_INLINE CORBA::ULong
+TAO_GIOP_Locate_Request_Header::request_id (void)
+{
+  return this->request_id_;
+}
+
+ACE_INLINE const TAO_ObjectKey &
+TAO_GIOP_Locate_Request_Header::object_key (void) const
+{
+  return this->profile_.object_key ();
+}
+
+ACE_INLINE TAO_ObjectKey &
+TAO_GIOP_Locate_Request_Header::object_key (void)
+{
+  return this->profile_.object_key ();
+}
+
+ACE_INLINE TAO_Tagged_Profile &
+TAO_GIOP_Locate_Request_Header::profile (void)
+{
+  return this->profile_;
+}
+
+ACE_INLINE TAO_InputCDR &
+TAO_GIOP_Locate_Request_Header::incoming_stream (void)
+{
+  return *this->incoming_;
+}
+
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index b404d10c978..9947469b4fb 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -7,7 +7,7 @@
 #include "tao/GIOP_Utils.h"
 #include "tao/operation_details.h"
 #include "tao/TAO_Server_Request.h"
-#include "tao/GIOP_Message_Locate_Header.h"
+#include "tao/GIOP_Message_Headers.h"
 #include "tao/target_specification.h"
 #include "tao/Leader_Follower.h"
 #include "Transport.h"
@@ -1350,7 +1350,9 @@ TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport)
   ACE_Message_Block message_block(&data_block);
   message_block.wr_ptr (TAO_GIOP_LITE_HEADER_LEN);
 
-  int result = transport->send (&message_block);
+  size_t bytes_transferred;
+  int result = transport->send_message_block_chain (&message_block,
+                                                    bytes_transferred);
   if (result == -1)
     {
       if (TAO_debug_level > 0)
diff --git a/TAO/tao/GIOP_Message_Locate_Header.cpp b/TAO/tao/GIOP_Message_Locate_Header.cpp
index a7401ed5270..71e27e38905 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.cpp
+++ b/TAO/tao/GIOP_Message_Locate_Header.cpp
@@ -1,8 +1,8 @@
 //$Id$
-#include "tao/GIOP_Message_Locate_Header.h"
+#include "tao/GIOP_Message_Headers.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Locate_Header.i"
+# include "tao/GIOP_Message_Headers.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(tao, GIOP_Message_Headers, "$Id$")
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
index 6c46c74ce6b..81311d766f7 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ b/TAO/tao/GIOP_Message_Locate_Header.h
@@ -72,7 +72,7 @@ private:
 };
 
 #if defined (__ACE_INLINE__)
-# include "tao/GIOP_Message_Locate_Header.i"
+# include "tao/GIOP_Message_Headers.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
diff --git a/TAO/tao/IFR_Client/InterfaceC.cpp b/TAO/tao/IFR_Client/InterfaceC.cpp
index 5aa837936cc..b2ad0857da3 100644
--- a/TAO/tao/IFR_Client/InterfaceC.cpp
+++ b/TAO/tao/IFR_Client/InterfaceC.cpp
@@ -23,12 +23,6 @@
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 
-// The Following header must remain visible since it contains the
-// "TAO_INTERCEPTOR" macros.  Note that this won't cause problems when
-// portable interceptor support is disabled since those macros are
-// always visible, too.
-#include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -125,136 +119,46 @@ IR_DefinitionKind _TAO_IRObject_Remote_Proxy_Impl::def_kind (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_DefinitionKind  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_retval;
 }
 
@@ -279,120 +183,36 @@ void _TAO_IRObject_Remote_Proxy_Impl::destroy (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        ACE_CHECK;
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -413,17 +233,13 @@ _TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
 {
 }
 
-_TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_IRObject_Remote_Proxy_Broker *
-_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void)
 {
   static ::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
+
 _TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
 {
 }
@@ -452,7 +268,7 @@ _TAO_IRObject_Remote_Proxy_Broker::select_proxy (
 // default constructor
 CORBA_IRObject::CORBA_IRObject (int collocated)
 {
-  this->CORBA_IRObject_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -460,14 +276,16 @@ CORBA_IRObject::~CORBA_IRObject (void)
 {}
 
 void
-CORBA_IRObject::CORBA_IRObject_setup_collocation (int collocated)
+CORBA_IRObject::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_IRObject_Proxy_Broker_ =
       _TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_IRObject_Proxy_Broker_ =
-      _TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker ();    
+      the_TAO_IRObject_Remote_Proxy_Broker ();
+  
+  
 }
 
 void CORBA_IRObject::_tao_any_destructor (void *x)
@@ -609,111 +427,6 @@ void CORBA_IRObject::destroy (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (IR_DefinitionKind result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_Identifier[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -748,7 +461,6 @@ static const CORBA::Long _oc_IR_ScopedName[] =
     0U, // string length
 
 };
-
 static CORBA::TypeCode _tc_TAO_tc_IR_ScopedName (CORBA::tk_alias, sizeof (_oc_IR_ScopedName), (char *) &_oc_IR_ScopedName, 0, sizeof (IR::ScopedName));
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IR)
@@ -826,137 +538,46 @@ char * _TAO_Contained_Remote_Proxy_Impl::id (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -982,130 +603,45 @@ void _TAO_Contained_Remote_Proxy_Impl::id (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 char * _TAO_Contained_Remote_Proxy_Impl::name (
@@ -1131,137 +667,46 @@ char * _TAO_Contained_Remote_Proxy_Impl::name (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -1287,130 +732,45 @@ void _TAO_Contained_Remote_Proxy_Impl::name (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        name,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << name)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << name)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 char * _TAO_Contained_Remote_Proxy_Impl::version (
@@ -1438,137 +798,46 @@ char * _TAO_Contained_Remote_Proxy_Impl::version (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -1593,130 +862,45 @@ void _TAO_Contained_Remote_Proxy_Impl::version (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        version,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << version)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << version)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
@@ -1743,137 +927,46 @@ IR_Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -1899,137 +992,46 @@ char * _TAO_Contained_Remote_Proxy_Impl::absolute_name (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              char * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -2056,137 +1058,46 @@ IR_Repository_ptr _TAO_Contained_Remote_Proxy_Impl::containing_repository (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -2214,137 +1125,46 @@ IR_Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -2371,134 +1191,47 @@ void _TAO_Contained_Remote_Proxy_Impl::move (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Contained::TAO_ClientRequestInfo_IR_Contained_move ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        new_container,
-        new_name,
-        new_version,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << new_container) &&
-              (_tao_out << new_name) &&
-              (_tao_out << new_version)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << new_container) &&
+              (_tao_out << new_name) &&
+              (_tao_out << new_version)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -2519,13 +1252,8 @@ _TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
 {
 }
 
-_TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_Contained_Remote_Proxy_Broker *
-_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void)
 {
   static ::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -2559,7 +1287,7 @@ _TAO_Contained_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_Contained::IR_Contained (int collocated)
 {
-  this->IR_Contained_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -2567,16 +1295,16 @@ IR_Contained::~IR_Contained (void)
 {}
 
 void
-IR_Contained::IR_Contained_setup_collocation (int collocated)
+IR_Contained::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_Contained_Proxy_Broker_ =
       _TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_Contained_Proxy_Broker_ =
-      _TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
+      ::the_TAO_Contained_Remote_Proxy_Broker ();
   
-  this->CORBA_IRObject_setup_collocation (collocated);
+  CORBA_IRObject::_tao_setup_collocation (collocated);  
 }
 
 void IR_Contained::_tao_any_destructor (void *x)
@@ -2920,636 +1648,6 @@ void IR_Contained::move (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::TAO_ClientRequestInfo_IR_Contained_id_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (char * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::TAO_ClientRequestInfo_IR_Contained_id_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::TAO_ClientRequestInfo_IR_Contained_name_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (char * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::TAO_ClientRequestInfo_IR_Contained_name_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * name,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    name_ (name)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::TAO_ClientRequestInfo_IR_Contained_version_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (char * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::TAO_ClientRequestInfo_IR_Contained_version_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * version,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    version_ (version)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::TAO_ClientRequestInfo_IR_Contained_defined_in_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (IR_Container_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::TAO_ClientRequestInfo_IR_Contained_absolute_name_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (char * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::TAO_ClientRequestInfo_IR_Contained_containing_repository_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (IR_Repository_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::TAO_ClientRequestInfo_IR_Contained_describe (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (ACE_NESTED_CLASS (IR_Contained,Description) * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::TAO_ClientRequestInfo_IR_Contained_move (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_Container_ptr new_container,
-    const char * new_name,
-    const char * new_version,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    new_container_ (new_container),
-    new_name_ (new_name),
-    new_version_ (new_version)
-{}
-
-Dynamic::ParameterList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_new_container = parameter_list->length ();
-  parameter_list->length (length_new_container + 1);
-  (*parameter_list)[length_new_container].argument <<=  this->new_container_;
-  
-  (*parameter_list)[length_new_container].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_new_name = parameter_list->length ();
-  parameter_list->length (length_new_name + 1);
-  (*parameter_list)[length_new_name].argument <<= new_name_;
-  (*parameter_list)[length_new_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_new_version = parameter_list->length ();
-  parameter_list->length (length_new_version + 1);
-  (*parameter_list)[length_new_version].argument <<= new_version_;
-  (*parameter_list)[length_new_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_Contained[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -5897,148 +3995,56 @@ IR_Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_lookup ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        search_name,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << search_name)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << search_name)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -6068,150 +4074,57 @@ IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_contents ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << limit_type) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << limit_type) &&
               (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -6243,154 +4156,60 @@ IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        search_name,
-        levels_to_search,
-        limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << search_name) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << search_name) &&
               (_tao_out << levels_to_search) &&
               (_tao_out << limit_type) &&
               (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -6421,152 +4240,58 @@ IR_Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_conten
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        limit_type,
-        exclude_inherited,
-        max_returned_objs,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << limit_type) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << limit_type) &&
               (_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
               (_tao_out << max_returned_objs)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -6596,152 +4321,59 @@ IR_ModuleDef_ptr _TAO_Container_Remote_Proxy_Impl::create_module (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_module ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -6773,156 +4405,61 @@ IR_ConstantDef_ptr _TAO_Container_Remote_Proxy_Impl::create_constant (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        type,
-        value,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << type) &&
               (_tao_out << value)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -6953,154 +4490,60 @@ IR_StructDef_ptr _TAO_Container_Remote_Proxy_Impl::create_struct (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -7132,156 +4575,61 @@ IR_UnionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_union (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_union ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        discriminator_type,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << discriminator_type) &&
               (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -7312,154 +4660,60 @@ IR_EnumDef_ptr _TAO_Container_Remote_Proxy_Impl::create_enum (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -7490,154 +4744,60 @@ IR_AliasDef_ptr _TAO_Container_Remote_Proxy_Impl::create_alias (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        original_type,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << original_type)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -7671,158 +4831,62 @@ IR_InterfaceDef_ptr _TAO_Container_Remote_Proxy_Impl::create_interface (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        base_interfaces,
-        is_abstract,
-        is_local,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << base_interfaces) &&
               (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
               (_tao_out << CORBA::Any::from_boolean (is_local))
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -7859,62 +4923,22 @@ IR_ValueDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_value ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        is_custom,
-        is_abstract,
-        base_value,
-        is_truncatable,
-        abstract_base_values,
-        supported_interfaces,
-        initializers,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
@@ -7924,101 +4948,41 @@ IR_ValueDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value (
               (_tao_out << abstract_base_values) &&
               (_tao_out << supported_interfaces) &&
               (_tao_out << initializers)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -8049,154 +5013,60 @@ IR_ValueBoxDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value_box (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        original_type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << original_type_def)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -8227,154 +5097,60 @@ IR_ExceptionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_exception (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -8404,152 +5180,59 @@ IR_NativeDef_ptr _TAO_Container_Remote_Proxy_Impl::create_native (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Container::TAO_ClientRequestInfo_IR_Container_create_native ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -8571,13 +5254,8 @@ _TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
 {
 }
 
-_TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_Container_Remote_Proxy_Broker *
-_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void)
 {
   static ::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -8611,7 +5289,7 @@ _TAO_Container_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_Container::IR_Container (int collocated)
 {
-  this->IR_Container_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -8619,16 +5297,16 @@ IR_Container::~IR_Container (void)
 {}
 
 void
-IR_Container::IR_Container_setup_collocation (int collocated)
+IR_Container::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_Container_Proxy_Broker_ =
       _TAO_Container_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_Container_Proxy_Broker_ =
-      _TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
+      ::the_TAO_Container_Remote_Proxy_Broker ();
   
-  this->CORBA_IRObject_setup_collocation (collocated);
+  CORBA_IRObject::_tao_setup_collocation (collocated);
   
 }
 
@@ -9299,1329 +5977,6 @@ IR_NativeDef_ptr IR_Container::create_native (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::TAO_ClientRequestInfo_IR_Container_lookup (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * search_name,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    search_name_ (search_name)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_name = parameter_list->length ();
-  parameter_list->length (length_search_name + 1);
-  (*parameter_list)[length_search_name].argument <<= search_name_;
-  (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::result (IR_Contained_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_contents::TAO_ClientRequestInfo_IR_Container_contents (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    limit_type_ (limit_type),
-    exclude_inherited_ (exclude_inherited)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
-  
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_contents::result (IR_ContainedSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::TAO_ClientRequestInfo_IR_Container_lookup_name (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * search_name,
-    const CORBA::Long & levels_to_search,
-    IR_DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    search_name_ (search_name),
-    levels_to_search_ (levels_to_search),
-    limit_type_ (limit_type),
-    exclude_inherited_ (exclude_inherited)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_name = parameter_list->length ();
-  parameter_list->length (length_search_name + 1);
-  (*parameter_list)[length_search_name].argument <<= search_name_;
-  (*parameter_list)[length_search_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_levels_to_search = parameter_list->length ();
-  parameter_list->length (length_levels_to_search + 1);
-  (*parameter_list)[length_levels_to_search].argument <<= levels_to_search_;
-  (*parameter_list)[length_levels_to_search].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
-  
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (IR_ContainedSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::TAO_ClientRequestInfo_IR_Container_describe_contents (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    const CORBA::Long & max_returned_objs,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    limit_type_ (limit_type),
-    exclude_inherited_ (exclude_inherited),
-    max_returned_objs_ (max_returned_objs)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_limit_type = parameter_list->length ();
-  parameter_list->length (length_limit_type + 1);
-  (*parameter_list)[length_limit_type].argument <<=  this->limit_type_;
-  
-  (*parameter_list)[length_limit_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exclude_inherited = parameter_list->length ();
-  parameter_list->length (length_exclude_inherited + 1);
-  (*parameter_list)[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
-  (*parameter_list)[length_exclude_inherited].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_max_returned_objs = parameter_list->length ();
-  parameter_list->length (length_max_returned_objs + 1);
-  (*parameter_list)[length_max_returned_objs].argument <<= max_returned_objs_;
-  (*parameter_list)[length_max_returned_objs].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (ACE_NESTED_CLASS (IR_Container,DescriptionSeq) * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::TAO_ClientRequestInfo_IR_Container_create_module (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::result (IR_ModuleDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::TAO_ClientRequestInfo_IR_Container_create_constant (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<= value_;
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (IR_ConstantDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::TAO_ClientRequestInfo_IR_Container_create_struct (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (IR_StructDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::TAO_ClientRequestInfo_IR_Container_create_union (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr discriminator_type,
-    const IR_UnionMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    discriminator_type_ (discriminator_type),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_discriminator_type = parameter_list->length ();
-  parameter_list->length (length_discriminator_type + 1);
-  (*parameter_list)[length_discriminator_type].argument <<=  this->discriminator_type_;
-  
-  (*parameter_list)[length_discriminator_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::result (IR_UnionDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::TAO_ClientRequestInfo_IR_Container_create_enum (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_EnumMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (IR_EnumDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::TAO_ClientRequestInfo_IR_Container_create_alias (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr original_type,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    original_type_ (original_type)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_original_type = parameter_list->length ();
-  parameter_list->length (length_original_type + 1);
-  (*parameter_list)[length_original_type].argument <<=  this->original_type_;
-  
-  (*parameter_list)[length_original_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (IR_AliasDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::TAO_ClientRequestInfo_IR_Container_create_interface (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_InterfaceDefSeq & base_interfaces,
-    const CORBA::Boolean & is_abstract,
-    const CORBA::Boolean & is_local,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    base_interfaces_ (base_interfaces),
-    is_abstract_ (is_abstract),
-    is_local_ (is_local)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_local = parameter_list->length ();
-  parameter_list->length (length_is_local + 1);
-  (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-  (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (IR_InterfaceDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::TAO_ClientRequestInfo_IR_Container_create_value (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::Boolean & is_custom,
-    const CORBA::Boolean & is_abstract,
-    IR_ValueDef_ptr base_value,
-    const CORBA::Boolean & is_truncatable,
-    const IR_ValueDefSeq & abstract_base_values,
-    const IR_InterfaceDefSeq & supported_interfaces,
-    const IR_InitializerSeq & initializers,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    is_custom_ (is_custom),
-    is_abstract_ (is_abstract),
-    base_value_ (base_value),
-    is_truncatable_ (is_truncatable),
-    abstract_base_values_ (abstract_base_values),
-    supported_interfaces_ (supported_interfaces),
-    initializers_ (initializers)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_custom = parameter_list->length ();
-  parameter_list->length (length_is_custom + 1);
-  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_value = parameter_list->length ();
-  parameter_list->length (length_base_value + 1);
-  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
-  
-  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_truncatable = parameter_list->length ();
-  parameter_list->length (length_is_truncatable + 1);
-  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_abstract_base_values = parameter_list->length ();
-  parameter_list->length (length_abstract_base_values + 1);
-  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
-  
-  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_initializers = parameter_list->length ();
-  parameter_list->length (length_initializers + 1);
-  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
-  
-  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::result (IR_ValueDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::TAO_ClientRequestInfo_IR_Container_create_value_box (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr original_type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    original_type_def_ (original_type_def)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (IR_ValueBoxDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::TAO_ClientRequestInfo_IR_Container_create_exception (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (IR_ExceptionDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::TAO_ClientRequestInfo_IR_Container_create_native (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version)
-{}
-
-Dynamic::ParameterList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::result (IR_NativeDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_Container[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -10669,137 +6024,47 @@ CORBA::TypeCode_ptr _TAO_IDLType_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -10821,13 +6086,8 @@ _TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
 {
 }
 
-_TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_IDLType_Remote_Proxy_Broker *
-_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void)
 {
   static ::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -10861,7 +6121,7 @@ _TAO_IDLType_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_IDLType::IR_IDLType (int collocated)
 {
-  this->IR_IDLType_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -10869,16 +6129,16 @@ IR_IDLType::~IR_IDLType (void)
 {}
 
 void
-IR_IDLType::IR_IDLType_setup_collocation (int collocated)
+IR_IDLType::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_IDLType_Proxy_Broker_ =
       _TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_IDLType_Proxy_Broker_ =
-      ::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker ();
+      ::the_TAO_IDLType_Remote_Proxy_Broker ();
   
-  this->CORBA_IRObject_setup_collocation (collocated);
+  CORBA_IRObject::_tao_setup_collocation (collocated);
   
 }
 
@@ -11020,65 +6280,6 @@ CORBA::TypeCode_ptr IR_IDLType::type (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::TAO_ClientRequestInfo_IR_IDLType_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_IDLType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -11161,148 +6362,57 @@ IR_Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        search_id,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << search_id)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << search_id)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -11330,148 +6440,57 @@ CORBA::TypeCode_ptr _TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        tc,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << tc)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << tc)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -11499,148 +6518,57 @@ IR_PrimitiveDef_ptr _TAO_Repository_Remote_Proxy_Impl::get_primitive (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        kind,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << kind)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << kind)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -11668,148 +6596,57 @@ IR_StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << bound)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << bound)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -11837,148 +6674,57 @@ IR_WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << bound)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << bound)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -12007,150 +6753,58 @@ IR_SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        bound,
-        element_type,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << bound) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << bound) &&
               (_tao_out << element_type)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -12179,150 +6833,58 @@ IR_ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        length,
-        element_type,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << length) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << length) &&
               (_tao_out << element_type)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -12351,150 +6913,58 @@ IR_FixedDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_fixed (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        digits,
-        scale,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << digits) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << digits) &&
               (_tao_out << scale)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -12516,13 +6986,8 @@ _TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
 {
 }
 
-_TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_Repository_Remote_Proxy_Broker *
-_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void)
 {
   static ::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -12556,7 +7021,7 @@ _TAO_Repository_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_Repository::IR_Repository (int collocated)
 {
-  this->IR_Repository_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -12564,16 +7029,16 @@ IR_Repository::~IR_Repository (void)
 {}
 
 void
-IR_Repository::IR_Repository_setup_collocation (int collocated)
+IR_Repository::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_Repository_Proxy_Broker_ =
       _TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_Repository_Proxy_Broker_ =
-      ::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
+      ::the_TAO_Repository_Remote_Proxy_Broker ();
   
-  this->IR_Container_setup_collocation (collocated);
+  IR_Container::_tao_setup_collocation (collocated);
   
 }
 
@@ -12840,553 +7305,6 @@ IR_FixedDef_ptr IR_Repository::create_fixed (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::TAO_ClientRequestInfo_IR_Repository_lookup_id (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * search_id,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    search_id_ (search_id)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_search_id = parameter_list->length ();
-  parameter_list->length (length_search_id + 1);
-  (*parameter_list)[length_search_id].argument <<= search_id_;
-  (*parameter_list)[length_search_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (IR_Contained_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    tc_ (tc)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_tc = parameter_list->length ();
-  parameter_list->length (length_tc + 1);
-  (*parameter_list)[length_tc].argument <<= tc_;
-  (*parameter_list)[length_tc].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::TAO_ClientRequestInfo_IR_Repository_get_primitive (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_PrimitiveKind & kind,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    kind_ (kind)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_kind = parameter_list->length ();
-  parameter_list->length (length_kind + 1);
-  (*parameter_list)[length_kind].argument <<=  this->kind_;
-  
-  (*parameter_list)[length_kind].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (IR_PrimitiveDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::TAO_ClientRequestInfo_IR_Repository_create_string (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (IR_StringDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::TAO_ClientRequestInfo_IR_Repository_create_wstring (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (IR_WstringDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::TAO_ClientRequestInfo_IR_Repository_create_sequence (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    IR_IDLType_ptr element_type,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    bound_ (bound),
-    element_type_ (element_type)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_element_type = parameter_list->length ();
-  parameter_list->length (length_element_type + 1);
-  (*parameter_list)[length_element_type].argument <<=  this->element_type_;
-  
-  (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (IR_SequenceDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::TAO_ClientRequestInfo_IR_Repository_create_array (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & length,
-    IR_IDLType_ptr element_type,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    length_ (length),
-    element_type_ (element_type)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_length = parameter_list->length ();
-  parameter_list->length (length_length + 1);
-  (*parameter_list)[length_length].argument <<= length_;
-  (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_element_type = parameter_list->length ();
-  parameter_list->length (length_element_type + 1);
-  (*parameter_list)[length_element_type].argument <<=  this->element_type_;
-  
-  (*parameter_list)[length_element_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (IR_ArrayDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::TAO_ClientRequestInfo_IR_Repository_create_fixed (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::UShort & digits,
-    const CORBA::Short & scale,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    digits_ (digits),
-    scale_ (scale)
-{}
-
-Dynamic::ParameterList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_digits = parameter_list->length ();
-  parameter_list->length (length_digits + 1);
-  (*parameter_list)[length_digits].argument <<= digits_;
-  (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_scale = parameter_list->length ();
-  parameter_list->length (length_scale + 1);
-  (*parameter_list)[length_scale].argument <<= scale_;
-  (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (IR_FixedDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_Repository[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -13439,156 +7357,61 @@ IR_ComponentDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_component
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        base_component,
-        supports_interfaces,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << base_component) &&
               (_tao_out << supports_interfaces)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -13621,158 +7444,62 @@ IR_HomeDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        base_home,
-        managed_component,
-        primary_key,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << base_home) &&
               (_tao_out << managed_component) &&
               (_tao_out << primary_key)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -13794,13 +7521,8 @@ _TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (v
 {
 }
 
-_TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ComponentRepository_Remote_Proxy_Broker *
-_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -13834,7 +7556,7 @@ _TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ComponentRepository::IR_ComponentRepository (int collocated)
 {
-  this->IR_ComponentRepository_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -13842,16 +7564,16 @@ IR_ComponentRepository::~IR_ComponentRepository (void)
 {}
 
 void
-IR_ComponentRepository::IR_ComponentRepository_setup_collocation (int collocated)
+IR_ComponentRepository::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ComponentRepository_Proxy_Broker_ =
       _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ComponentRepository_Proxy_Broker_ =
-      _TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
+      ::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
   
-  this->IR_Repository_setup_collocation (collocated);
+  IR_Repository::_tao_setup_collocation (collocated);
   
 }
 
@@ -14053,207 +7775,6 @@ IR_HomeDef_ptr IR_ComponentRepository::create_home (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ComponentDef_ptr base_component,
-    const IR_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    base_component_ (base_component),
-    supports_interfaces_ (supports_interfaces)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_component = parameter_list->length ();
-  parameter_list->length (length_base_component + 1);
-  (*parameter_list)[length_base_component].argument <<=  this->base_component_;
-  
-  (*parameter_list)[length_base_component].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_supports_interfaces = parameter_list->length ();
-  parameter_list->length (length_supports_interfaces + 1);
-  (*parameter_list)[length_supports_interfaces].argument <<=  this->supports_interfaces_;
-  
-  (*parameter_list)[length_supports_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR_ComponentDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_HomeDef_ptr base_home,
-    IR_ComponentDef_ptr managed_component,
-    IR_ValueDef_ptr primary_key,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    base_home_ (base_home),
-    managed_component_ (managed_component),
-    primary_key_ (primary_key)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_home = parameter_list->length ();
-  parameter_list->length (length_base_home + 1);
-  (*parameter_list)[length_base_home].argument <<=  this->base_home_;
-  
-  (*parameter_list)[length_base_home].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_managed_component = parameter_list->length ();
-  parameter_list->length (length_managed_component + 1);
-  (*parameter_list)[length_managed_component].argument <<=  this->managed_component_;
-  
-  (*parameter_list)[length_managed_component].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_primary_key = parameter_list->length ();
-  parameter_list->length (length_primary_key + 1);
-  (*parameter_list)[length_primary_key].argument <<=  this->primary_key_;
-  
-  (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (IR_HomeDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ComponentRepository[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -14296,13 +7817,8 @@ _TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ModuleDef_Remote_Proxy_Broker *
-_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -14336,7 +7852,7 @@ _TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ModuleDef::IR_ModuleDef (int collocated)
 {
-  this->IR_ModuleDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -14344,17 +7860,18 @@ IR_ModuleDef::~IR_ModuleDef (void)
 {}
 
 void
-IR_ModuleDef::IR_ModuleDef_setup_collocation (int collocated)
+IR_ModuleDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ModuleDef_Proxy_Broker_ =
       _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ModuleDef_Proxy_Broker_ =
-      _TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
+      ::the_TAO_ModuleDef_Remote_Proxy_Broker ();
+  
+  IR_Container::_tao_setup_collocation (collocated);
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Container_setup_collocation (collocated);
-  this->IR_Contained_setup_collocation (collocated); 
 }
 
 void IR_ModuleDef::_tao_any_destructor (void *x)
@@ -14609,137 +8126,47 @@ CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -14766,137 +8193,47 @@ IR_IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -14922,130 +8259,46 @@ void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
+
 }
 
 CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
@@ -15072,137 +8325,47 @@ CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Any * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -15228,130 +8391,46 @@ void _TAO_ConstantDef_Remote_Proxy_Impl::value (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        value,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << value)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        ACE_CHECK;
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << value)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 //
@@ -15371,13 +8450,8 @@ _TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ConstantDef_Remote_Proxy_Broker *
-_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -15411,7 +8485,7 @@ _TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ConstantDef::IR_ConstantDef (int collocated)
 {
-  this->IR_ConstantDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -15419,16 +8493,16 @@ IR_ConstantDef::~IR_ConstantDef (void)
 {}
 
 void
-IR_ConstantDef::IR_ConstantDef_setup_collocation (int collocated)
+IR_ConstantDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ConstantDef_Proxy_Broker_ =
       _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ConstantDef_Proxy_Broker_ =
-      _TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
+      ::the_TAO_ConstantDef_Remote_Proxy_Broker ();
   
-  this->IR_Contained_setup_collocation (collocated);
+  IR_Contained::_tao_setup_collocation (collocated);
   
 }
 
@@ -15638,288 +8712,6 @@ void IR_ConstantDef::value (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::TAO_ClientRequestInfo_IR_ConstantDef_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    type_def_ (type_def)
-{}
-
-Dynamic::ParameterList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::TAO_ClientRequestInfo_IR_ConstantDef_value_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::TAO_ClientRequestInfo_IR_ConstantDef_value_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Any & value,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<= value_;
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ConstantDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -16024,13 +8816,8 @@ _TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
 {
 }
 
-_TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_TypedefDef_Remote_Proxy_Broker *
-_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -16064,7 +8851,7 @@ _TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_TypedefDef::IR_TypedefDef (int collocated)
 {
-  this->IR_TypedefDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -16072,17 +8859,17 @@ IR_TypedefDef::~IR_TypedefDef (void)
 {}
 
 void
-IR_TypedefDef::IR_TypedefDef_setup_collocation (int collocated)
+IR_TypedefDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_TypedefDef_Proxy_Broker_ =
       _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_TypedefDef_Proxy_Broker_ =
-      _TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker ();
+      ::the_TAO_TypedefDef_Remote_Proxy_Broker ();
   
-  this->IR_Contained_setup_collocation (collocated);
-  this->IR_IDLType_setup_collocation (collocated);
+  IR_Contained::_tao_setup_collocation (collocated);
+  IR_IDLType::_tao_setup_collocation (collocated);
   
 }
 
@@ -16342,137 +9129,47 @@ IR_StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -16498,130 +9195,45 @@ void _TAO_StructDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << members)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -16642,13 +9254,8 @@ _TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
 {
 }
 
-_TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_StructDef_Remote_Proxy_Broker *
-_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -16682,7 +9289,7 @@ _TAO_StructDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_StructDef::IR_StructDef (int collocated)
 {
-  this->IR_StructDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -16690,17 +9297,17 @@ IR_StructDef::~IR_StructDef (void)
 {}
 
 void
-IR_StructDef::IR_StructDef_setup_collocation (int collocated)
+IR_StructDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_StructDef_Proxy_Broker_ =
       _TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_StructDef_Proxy_Broker_ =
-      _TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker ();
+      ::the_TAO_StructDef_Remote_Proxy_Broker ();
   
-  this->IR_TypedefDef_setup_collocation (collocated);
-  this->IR_Container_setup_collocation (collocated);
+  IR_TypedefDef::_tao_setup_collocation (collocated);
+  IR_Container::_tao_setup_collocation (collocated);
   
 }
 
@@ -16908,121 +9515,6 @@ void IR_StructDef::members (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::TAO_ClientRequestInfo_IR_StructDef_members_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (IR_StructMemberSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::TAO_ClientRequestInfo_IR_StructDef_members_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_StructDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -17070,137 +9562,47 @@ CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -17227,137 +9629,47 @@ IR_IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -17383,130 +9695,45 @@ void _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        discriminator_type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << discriminator_type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << discriminator_type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
@@ -17533,137 +9760,47 @@ IR_UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -17689,130 +9826,45 @@ void _TAO_UnionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << members)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -17833,13 +9885,8 @@ _TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
 {
 }
 
-_TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_UnionDef_Remote_Proxy_Broker *
-_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -17873,7 +9920,7 @@ _TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_UnionDef::IR_UnionDef (int collocated)
 {
-  this->IR_UnionDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -17881,17 +9928,17 @@ IR_UnionDef::~IR_UnionDef (void)
 {}
 
 void
-IR_UnionDef::IR_UnionDef_setup_collocation (int collocated)
+IR_UnionDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_UnionDef_Proxy_Broker_ =
       _TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_UnionDef_Proxy_Broker_ =
-      _TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker ();
+      ::the_TAO_UnionDef_Remote_Proxy_Broker ();
   
-  this->IR_TypedefDef_setup_collocation (collocated);
-  this->IR_Container_setup_collocation (collocated);
+  IR_TypedefDef::_tao_setup_collocation (collocated);
+  IR_Container::_tao_setup_collocation (collocated);
 }
 
 void IR_UnionDef::_tao_any_destructor (void *x)
@@ -18139,289 +10186,6 @@ void IR_UnionDef::members (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    discriminator_type_def_ (discriminator_type_def)
-{}
-
-Dynamic::ParameterList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_discriminator_type_def = parameter_list->length ();
-  parameter_list->length (length_discriminator_type_def + 1);
-  (*parameter_list)[length_discriminator_type_def].argument <<=  this->discriminator_type_def_;
-  
-  (*parameter_list)[length_discriminator_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::TAO_ClientRequestInfo_IR_UnionDef_members_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (IR_UnionMemberSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::TAO_ClientRequestInfo_IR_UnionDef_members_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_UnionMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_UnionDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -18470,137 +10234,47 @@ IR_EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -18625,130 +10299,45 @@ void _TAO_EnumDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << members)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -18769,13 +10358,8 @@ _TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
 {
 }
 
-_TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_EnumDef_Remote_Proxy_Broker *
-_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -18809,7 +10393,7 @@ _TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_EnumDef::IR_EnumDef (int collocated)
 {
-  this->IR_EnumDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -18817,16 +10401,16 @@ IR_EnumDef::~IR_EnumDef (void)
 {}
 
 void
-IR_EnumDef::IR_EnumDef_setup_collocation (int collocated)
+IR_EnumDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_EnumDef_Proxy_Broker_ =
       _TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_EnumDef_Proxy_Broker_ =
-      _TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
+      ::the_TAO_EnumDef_Remote_Proxy_Broker ();
   
-  this->IR_TypedefDef_setup_collocation (collocated);
+  IR_TypedefDef::_tao_setup_collocation (collocated);
   
 }
 
@@ -19021,121 +10605,6 @@ void IR_EnumDef::members (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::TAO_ClientRequestInfo_IR_EnumDef_members_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (IR_EnumMemberSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::TAO_ClientRequestInfo_IR_EnumDef_members_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_EnumMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_EnumDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -19183,137 +10652,47 @@ IR_IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -19338,130 +10717,45 @@ void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        original_type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << original_type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << original_type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -19482,13 +10776,8 @@ _TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_AliasDef_Remote_Proxy_Broker *
-_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -19522,7 +10811,7 @@ _TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_AliasDef::IR_AliasDef (int collocated)
 {
-  this->IR_AliasDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -19530,16 +10819,16 @@ IR_AliasDef::~IR_AliasDef (void)
 {}
 
 void
-IR_AliasDef::IR_AliasDef_setup_collocation (int collocated)
+IR_AliasDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_AliasDef_Proxy_Broker_ =
       _TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_AliasDef_Proxy_Broker_ =
-      _TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
+      ::the_TAO_AliasDef_Remote_Proxy_Broker ();
   
-  this->IR_TypedefDef_setup_collocation (collocated);
+  IR_TypedefDef::_tao_setup_collocation (collocated);
   
 }
 
@@ -19734,121 +11023,6 @@ void IR_AliasDef::original_type_def (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr original_type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    original_type_def_ (original_type_def)
-{}
-
-Dynamic::ParameterList *
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_AliasDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -19891,13 +11065,8 @@ _TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
 {
 }
 
-_TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_NativeDef_Remote_Proxy_Broker *
-_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -19931,7 +11100,7 @@ _TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_NativeDef::IR_NativeDef (int collocated)
 {
-  this->IR_NativeDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -19939,18 +11108,19 @@ IR_NativeDef::~IR_NativeDef (void)
 {}
 
 void
-IR_NativeDef::IR_NativeDef_setup_collocation (int collocated)
+IR_NativeDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_NativeDef_Proxy_Broker_ =
       _TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_NativeDef_Proxy_Broker_ =
-      _TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
+      ::the_TAO_NativeDef_Remote_Proxy_Broker ();
   
-  this->IR_TypedefDef_setup_collocation (collocated);
-}
+  IR_TypedefDef::_tao_setup_collocation (collocated);
   
+}
+
 void IR_NativeDef::_tao_any_destructor (void *x)
 {
   IR_NativeDef *tmp = ACE_static_cast (IR_NativeDef*,x);
@@ -20160,136 +11330,47 @@ IR_PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_PrimitiveKind  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -20311,13 +11392,8 @@ _TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
 {
 }
 
-_TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_PrimitiveDef_Remote_Proxy_Broker *
-_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -20351,7 +11427,7 @@ _TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_PrimitiveDef::IR_PrimitiveDef (int collocated)
 {
-  this->IR_PrimitiveDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -20359,16 +11435,16 @@ IR_PrimitiveDef::~IR_PrimitiveDef (void)
 {}
 
 void
-IR_PrimitiveDef::IR_PrimitiveDef_setup_collocation (int collocated)
+IR_PrimitiveDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_PrimitiveDef_Proxy_Broker_ =
       _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_PrimitiveDef_Proxy_Broker_ =
-      _TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
+      ::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
   
-  this->IR_IDLType_setup_collocation (collocated);
+  IR_IDLType::_tao_setup_collocation (collocated);
   
 }
 
@@ -20522,65 +11598,6 @@ IR_PrimitiveKind IR_PrimitiveDef::kind (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (IR_PrimitiveKind result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_PrimitiveDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -20627,136 +11644,47 @@ CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -20781,130 +11709,45 @@ void _TAO_StringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << bound)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << bound)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -20925,13 +11768,8 @@ _TAO_StringDef_Proxy_Broker::~_TAO_StringDef_Proxy_Broker (void)
 {
 }
 
-_TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_StringDef_Remote_Proxy_Broker *
-_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -20965,7 +11803,7 @@ _TAO_StringDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_StringDef::IR_StringDef (int collocated)
 {
-  this->IR_StringDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -20973,16 +11811,17 @@ IR_StringDef::~IR_StringDef (void)
 {}
 
 void
-IR_StringDef::IR_StringDef_setup_collocation (int collocated)
+IR_StringDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_StringDef_Proxy_Broker_ =
       _TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_StringDef_Proxy_Broker_ =
-      _TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
+      ::the_TAO_StringDef_Remote_Proxy_Broker ();
+  
+  IR_IDLType::_tao_setup_collocation (collocated);
   
-  this->IR_IDLType_setup_collocation (collocated);
 }
 
 void IR_StringDef::_tao_any_destructor (void *x)
@@ -21150,120 +11989,6 @@ void IR_StringDef::bound (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::TAO_ClientRequestInfo_IR_StringDef_bound_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::TAO_ClientRequestInfo_IR_StringDef_bound_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_StringDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -21310,136 +12035,47 @@ CORBA::ULong _TAO_WstringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -21464,130 +12100,45 @@ void _TAO_WstringDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << bound)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << bound)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -21608,13 +12159,8 @@ _TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
 {
 }
 
-_TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_WstringDef_Remote_Proxy_Broker *
-_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -21648,7 +12194,7 @@ _TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_WstringDef::IR_WstringDef (int collocated)
 {
-  this->IR_WstringDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -21656,16 +12202,16 @@ IR_WstringDef::~IR_WstringDef (void)
 {}
 
 void
-IR_WstringDef::IR_WstringDef_setup_collocation (int collocated)
+IR_WstringDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_WstringDef_Proxy_Broker_ =
       _TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_WstringDef_Proxy_Broker_ =
-      _TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
+      ::the_TAO_WstringDef_Remote_Proxy_Broker ();
   
-  this->IR_IDLType_setup_collocation (collocated);
+  IR_IDLType::_tao_setup_collocation (collocated);
   
 }
 
@@ -21836,120 +12382,6 @@ void IR_WstringDef::bound (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::TAO_ClientRequestInfo_IR_WstringDef_bound_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::TAO_ClientRequestInfo_IR_WstringDef_bound_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_WstringDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -21999,136 +12431,47 @@ CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::UShort  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -22153,130 +12496,45 @@ void _TAO_FixedDef_Remote_Proxy_Impl::digits (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        digits,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << digits)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << digits)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
@@ -22304,136 +12562,47 @@ CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Short  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -22458,130 +12627,45 @@ void _TAO_FixedDef_Remote_Proxy_Impl::scale (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        scale,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << scale)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << scale)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -22602,13 +12686,8 @@ _TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
 {
 }
 
-_TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_FixedDef_Remote_Proxy_Broker *
-_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -22642,7 +12721,7 @@ _TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_FixedDef::IR_FixedDef (int collocated)
 {
-  this->IR_FixedDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -22650,16 +12729,16 @@ IR_FixedDef::~IR_FixedDef (void)
 {}
 
 void
-IR_FixedDef::IR_FixedDef_setup_collocation (int collocated)
+IR_FixedDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_FixedDef_Proxy_Broker_ =
       _TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_FixedDef_Proxy_Broker_ =
-      _TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
+      ::the_TAO_FixedDef_Remote_Proxy_Broker ();
   
-  this->IR_IDLType_setup_collocation (collocated);
+  IR_IDLType::_tao_setup_collocation (collocated);
   
 }
 
@@ -22860,231 +12939,6 @@ void IR_FixedDef::scale (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::TAO_ClientRequestInfo_IR_FixedDef_digits_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::TAO_ClientRequestInfo_IR_FixedDef_digits_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::UShort & digits,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    digits_ (digits)
-{}
-
-Dynamic::ParameterList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_digits = parameter_list->length ();
-  parameter_list->length (length_digits + 1);
-  (*parameter_list)[length_digits].argument <<= digits_;
-  (*parameter_list)[length_digits].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::TAO_ClientRequestInfo_IR_FixedDef_scale_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::TAO_ClientRequestInfo_IR_FixedDef_scale_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Short & scale,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    scale_ (scale)
-{}
-
-Dynamic::ParameterList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_scale = parameter_list->length ();
-  parameter_list->length (length_scale + 1);
-  (*parameter_list)[length_scale].argument <<= scale_;
-  (*parameter_list)[length_scale].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_FixedDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -23134,136 +12988,47 @@ CORBA::ULong _TAO_SequenceDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -23288,130 +13053,45 @@ void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        bound,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << bound)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << bound)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
@@ -23440,137 +13120,47 @@ CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -23600,137 +13190,47 @@ IR_IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -23755,130 +13255,45 @@ void _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        element_type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << element_type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << element_type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -23899,13 +13314,8 @@ _TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_SequenceDef_Remote_Proxy_Broker *
-_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -23939,7 +13349,7 @@ _TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_SequenceDef::IR_SequenceDef (int collocated)
 {
-  this->IR_SequenceDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -23947,16 +13357,17 @@ IR_SequenceDef::~IR_SequenceDef (void)
 {}
 
 void
-IR_SequenceDef::IR_SequenceDef_setup_collocation (int collocated)
+IR_SequenceDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_SequenceDef_Proxy_Broker_ =
       _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_SequenceDef_Proxy_Broker_ =
-      _TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
+      ::the_TAO_SequenceDef_Remote_Proxy_Broker ();
+  
+  IR_IDLType::_tao_setup_collocation (collocated);
   
-  this->IR_IDLType_setup_collocation (collocated);
 }
 
 void IR_SequenceDef::_tao_any_destructor (void *x)
@@ -24170,288 +13581,6 @@ void IR_SequenceDef::element_type_def (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & bound,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    bound_ (bound)
-{}
-
-Dynamic::ParameterList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_bound = parameter_list->length ();
-  parameter_list->length (length_bound + 1);
-  (*parameter_list)[length_bound].argument <<= bound_;
-  (*parameter_list)[length_bound].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr element_type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    element_type_def_ (element_type_def)
-{}
-
-Dynamic::ParameterList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_element_type_def = parameter_list->length ();
-  parameter_list->length (length_element_type_def + 1);
-  (*parameter_list)[length_element_type_def].argument <<=  this->element_type_def_;
-  
-  (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_SequenceDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -24501,136 +13630,47 @@ CORBA::ULong _TAO_ArrayDef_Remote_Proxy_Impl::length (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ULong  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -24655,130 +13695,45 @@ void _TAO_ArrayDef_Remote_Proxy_Impl::length (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        length,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << length)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << length)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::TypeCode_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type (
@@ -24807,137 +13762,47 @@ CORBA::TypeCode_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -24967,137 +13832,47 @@ IR_IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -25122,130 +13897,45 @@ void _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        element_type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << element_type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << element_type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -25266,13 +13956,8 @@ _TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ArrayDef_Remote_Proxy_Broker *
-_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -25306,7 +13991,7 @@ _TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ArrayDef::IR_ArrayDef (int collocated)
 {
-  this->IR_ArrayDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -25314,16 +13999,17 @@ IR_ArrayDef::~IR_ArrayDef (void)
 {}
 
 void
-IR_ArrayDef::IR_ArrayDef_setup_collocation (int collocated)
+IR_ArrayDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ArrayDef_Proxy_Broker_ =
       _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ArrayDef_Proxy_Broker_ =
-      _TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker ();
+      ::the_TAO_ArrayDef_Remote_Proxy_Broker ();
+  
+  IR_IDLType::_tao_setup_collocation (collocated);
   
-  this->IR_IDLType_setup_collocation (collocated);
 }
 
 void IR_ArrayDef::_tao_any_destructor (void *x)
@@ -25537,288 +14223,6 @@ void IR_ArrayDef::element_type_def (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::TAO_ClientRequestInfo_IR_ArrayDef_length_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::ULong result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::TAO_ClientRequestInfo_IR_ArrayDef_length_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & length,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    length_ (length)
-{}
-
-Dynamic::ParameterList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_length = parameter_list->length ();
-  parameter_list->length (length_length + 1);
-  (*parameter_list)[length_length].argument <<= length_;
-  (*parameter_list)[length_length].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr element_type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    element_type_def_ (element_type_def)
-{}
-
-Dynamic::ParameterList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_element_type_def = parameter_list->length ();
-  parameter_list->length (length_element_type_def + 1);
-  (*parameter_list)[length_element_type_def].argument <<=  this->element_type_def_;
-  
-  (*parameter_list)[length_element_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ArrayDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -25869,137 +14273,47 @@ CORBA::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -26030,137 +14344,47 @@ IR_StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -26185,130 +14409,45 @@ void _TAO_ExceptionDef_Remote_Proxy_Impl::members (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << members)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -26329,13 +14468,8 @@ _TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ExceptionDef_Remote_Proxy_Broker *
-_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -26369,7 +14503,7 @@ _TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ExceptionDef::IR_ExceptionDef (int collocated)
 {
-  this->IR_ExceptionDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -26377,17 +14511,18 @@ IR_ExceptionDef::~IR_ExceptionDef (void)
 {}
 
 void
-IR_ExceptionDef::IR_ExceptionDef_setup_collocation (int collocated)
+IR_ExceptionDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ExceptionDef_Proxy_Broker_ =
       _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ExceptionDef_Proxy_Broker_ =
-      _TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
+      ::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
+  IR_Container::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
-  this->IR_Container_setup_collocation (collocated);
 }
 
 void IR_ExceptionDef::_tao_any_destructor (void *x)
@@ -26584,177 +14719,6 @@ void IR_ExceptionDef::members (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::TAO_ClientRequestInfo_IR_ExceptionDef_members_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (IR_StructMemberSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_StructMemberSeq & members,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    members_ (members)
-{}
-
-Dynamic::ParameterList *
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_members = parameter_list->length ();
-  parameter_list->length (length_members + 1);
-  (*parameter_list)[length_members].argument <<=  this->members_;
-  
-  (*parameter_list)[length_members].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ExceptionDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -27163,137 +15127,47 @@ CORBA::TypeCode_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -27323,137 +15197,47 @@ IR_IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -27478,130 +15262,45 @@ void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
@@ -27629,136 +15328,47 @@ IR_AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_AttributeMode  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -27783,130 +15393,45 @@ void _TAO_AttributeDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        mode,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << mode)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << mode)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -27927,13 +15452,8 @@ _TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_AttributeDef_Remote_Proxy_Broker *
-_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -27967,7 +15487,7 @@ _TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_AttributeDef::IR_AttributeDef (int collocated)
 {
-  this->IR_AttributeDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -27975,16 +15495,17 @@ IR_AttributeDef::~IR_AttributeDef (void)
 {}
 
 void
-IR_AttributeDef::IR_AttributeDef_setup_collocation (int collocated)
+IR_AttributeDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_AttributeDef_Proxy_Broker_ =
       _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_AttributeDef_Proxy_Broker_ =
-      _TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker ();
+      ::the_TAO_AttributeDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
 }
 
 void IR_AttributeDef::_tao_any_destructor (void *x)
@@ -28198,289 +15719,6 @@ void IR_AttributeDef::mode (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::TAO_ClientRequestInfo_IR_AttributeDef_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    type_def_ (type_def)
-{}
-
-Dynamic::ParameterList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (IR_AttributeMode result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_AttributeMode & mode,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    mode_ (mode)
-{}
-
-Dynamic::ParameterList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_AttributeDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -29024,137 +16262,47 @@ CORBA::TypeCode_ptr _TAO_OperationDef_Remote_Proxy_Impl::result (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -29184,137 +16332,47 @@ IR_IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -29339,130 +16397,45 @@ void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        result_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << result_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << result_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
@@ -29492,137 +16465,47 @@ IR_ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -29647,130 +16530,45 @@ void _TAO_OperationDef_Remote_Proxy_Impl::params (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        params,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << params)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << params)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
@@ -29798,136 +16596,47 @@ IR_OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_OperationMode  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -29952,130 +16661,45 @@ void _TAO_OperationDef_Remote_Proxy_Impl::mode (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        mode,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << mode)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << mode)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
@@ -30105,137 +16729,47 @@ IR_ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -30260,130 +16794,45 @@ void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        contexts,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << contexts)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << contexts)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
@@ -30413,137 +16862,47 @@ IR_ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -30568,130 +16927,45 @@ void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        exceptions,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << exceptions)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << exceptions)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -30712,13 +16986,8 @@ _TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
 {
 }
 
-_TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_OperationDef_Remote_Proxy_Broker *
-_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -30752,7 +17021,7 @@ _TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_OperationDef::IR_OperationDef (int collocated)
 {
-  this->IR_OperationDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -30760,16 +17029,17 @@ IR_OperationDef::~IR_OperationDef (void)
 {}
 
 void
-IR_OperationDef::IR_OperationDef_setup_collocation (int collocated)
+IR_OperationDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_OperationDef_Proxy_Broker_ =
       _TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_OperationDef_Proxy_Broker_ =
-      _TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker ();
+      ::the_TAO_OperationDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
 }
 
 void IR_OperationDef::_tao_any_destructor (void *x)
@@ -31073,625 +17343,6 @@ void IR_OperationDef::exceptions (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::TAO_ClientRequestInfo_IR_OperationDef_result_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::TAO_ClientRequestInfo_IR_OperationDef_result_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr result_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    result_def_ (result_def)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_result_def = parameter_list->length ();
-  parameter_list->length (length_result_def + 1);
-  (*parameter_list)[length_result_def].argument <<=  this->result_def_;
-  
-  (*parameter_list)[length_result_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::TAO_ClientRequestInfo_IR_OperationDef_params_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (IR_ParDescriptionSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::TAO_ClientRequestInfo_IR_OperationDef_params_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_ParDescriptionSeq & params,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    params_ (params)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::TAO_ClientRequestInfo_IR_OperationDef_mode_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (IR_OperationMode result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::TAO_ClientRequestInfo_IR_OperationDef_mode_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_OperationMode & mode,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    mode_ (mode)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (IR_ContextIdSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_ContextIdSeq & contexts,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    contexts_ (contexts)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (IR_ExceptionDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_ExceptionDefSeq & exceptions,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    exceptions_ (exceptions)
-{}
-
-Dynamic::ParameterList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_OperationDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -32569,137 +18220,47 @@ IR_InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -32725,130 +18286,45 @@ void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        base_interfaces,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << base_interfaces)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << base_interfaces)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
@@ -32876,136 +18352,47 @@ CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -33031,130 +18418,45 @@ void _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        is_abstract,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << CORBA::Any::from_boolean (is_abstract))
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_abstract))
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
@@ -33182,136 +18484,47 @@ CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -33337,130 +18550,45 @@ void _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        is_local,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << CORBA::Any::from_boolean (is_local))
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_local))
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
@@ -33489,147 +18617,57 @@ CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        interface_id,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << interface_id)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << interface_id)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            _tao_retval
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               _tao_retval
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -33666,160 +18704,63 @@ IR_AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        type,
-        mode,
-        get_exceptions,
-        put_exceptions,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << type) &&
               (_tao_out << mode) &&
               (_tao_out << get_exceptions) &&
               (_tao_out << put_exceptions)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -33857,60 +18798,22 @@ IR_OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        result,
-        mode,
-        params,
-        exceptions,
-        contexts,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << result) &&
@@ -33918,101 +18821,41 @@ IR_OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
               (_tao_out << params) &&
               (_tao_out << exceptions) &&
               (_tao_out << contexts)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -34034,13 +18877,8 @@ _TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_InterfaceDef_Remote_Proxy_Broker *
-_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -34074,7 +18912,7 @@ _TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_InterfaceDef::IR_InterfaceDef (int collocated)
 {
-  this->IR_InterfaceDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -34082,18 +18920,19 @@ IR_InterfaceDef::~IR_InterfaceDef (void)
 {}
 
 void
-IR_InterfaceDef::IR_InterfaceDef_setup_collocation (int collocated)
+IR_InterfaceDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_InterfaceDef_Proxy_Broker_ =
       _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_InterfaceDef_Proxy_Broker_ =
-      _TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
+      ::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
+  
+  IR_Container::_tao_setup_collocation (collocated);
+  IR_Contained::_tao_setup_collocation (collocated);
+  IR_IDLType::_tao_setup_collocation (collocated);
   
-  this->IR_Container_setup_collocation (collocated);
-  this->IR_Contained_setup_collocation (collocated);
-  this->IR_IDLType_setup_collocation (collocated);
 }
 
 void IR_InterfaceDef::_tao_any_destructor (void *x)
@@ -34423,638 +19262,6 @@ IR_OperationDef_ptr IR_InterfaceDef::create_operation (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (IR_InterfaceDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    base_interfaces_ (base_interfaces)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    is_abstract_ (is_abstract)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_local,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    is_local_ (is_local)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_local = parameter_list->length ();
-  parameter_list->length (length_is_local + 1);
-  (*parameter_list)[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
-  (*parameter_list)[length_is_local].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * interface_id,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    interface_id_ (interface_id)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_interface_id = parameter_list->length ();
-  parameter_list->length (length_interface_id + 1);
-  (*parameter_list)[length_interface_id].argument <<= interface_id_;
-  (*parameter_list)[length_interface_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    IR_AttributeMode & mode,
-    const IR_ExceptionDefSeq & get_exceptions,
-    const IR_ExceptionDefSeq & put_exceptions,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    mode_ (mode),
-    get_exceptions_ (get_exceptions),
-    put_exceptions_ (put_exceptions)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_get_exceptions = parameter_list->length ();
-  parameter_list->length (length_get_exceptions + 1);
-  (*parameter_list)[length_get_exceptions].argument <<=  this->get_exceptions_;
-  
-  (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_put_exceptions = parameter_list->length ();
-  parameter_list->length (length_put_exceptions + 1);
-  (*parameter_list)[length_put_exceptions].argument <<=  this->put_exceptions_;
-  
-  (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (IR_AttributeDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr result,
-    IR_OperationMode & mode,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    const IR_ContextIdSeq & contexts,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    result_ (result),
-    mode_ (mode),
-    params_ (params),
-    exceptions_ (exceptions),
-    contexts_ (contexts)
-{}
-
-Dynamic::ParameterList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_result = parameter_list->length ();
-  parameter_list->length (length_result + 1);
-  (*parameter_list)[length_result].argument <<=  this->result_;
-  
-  (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (IR_OperationDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_InterfaceDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -35810,137 +20017,46 @@ CORBA::TypeCode_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
+          }
+        break;
+      }
   return _tao_safe_retval._retn ();
 }
 
@@ -35970,137 +20086,47 @@ IR_IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -36126,130 +20152,45 @@ void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
@@ -36277,136 +20218,47 @@ CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_retval)
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        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
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Visibility  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -36432,130 +20284,45 @@ void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        access,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << access)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << access)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -36576,13 +20343,8 @@ _TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ValueMemberDef_Remote_Proxy_Broker *
-_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -36616,7 +20378,7 @@ _TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ValueMemberDef::IR_ValueMemberDef (int collocated)
 {
-  this->IR_ValueMemberDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -36624,16 +20386,17 @@ IR_ValueMemberDef::~IR_ValueMemberDef (void)
 {}
 
 void
-IR_ValueMemberDef::IR_ValueMemberDef_setup_collocation (int collocated)
+IR_ValueMemberDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ValueMemberDef_Proxy_Broker_ =
       _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ValueMemberDef_Proxy_Broker_ =
-      _TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
+      ::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
 }
 
 void IR_ValueMemberDef::_tao_any_destructor (void *x)
@@ -36847,288 +20610,6 @@ void IR_ValueMemberDef::access (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    type_def_ (type_def)
-{}
-
-Dynamic::ParameterList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_type_def = parameter_list->length ();
-  parameter_list->length (length_type_def + 1);
-  (*parameter_list)[length_type_def].argument <<=  this->type_def_;
-  
-  (*parameter_list)[length_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Visibility result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Visibility & access,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    access_ (access)
-{}
-
-Dynamic::ParameterList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_access = parameter_list->length ();
-  parameter_list->length (length_access + 1);
-  (*parameter_list)[length_access].argument <<= access_;
-  (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ValueMemberDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -37180,137 +20661,47 @@ IR_InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -37336,130 +20727,45 @@ void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        supported_interfaces,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << supported_interfaces)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << supported_interfaces)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
@@ -37489,137 +20795,47 @@ IR_InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -37645,130 +20861,45 @@ void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        initializers,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << initializers)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << initializers)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
@@ -37797,137 +20928,47 @@ IR_ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -37953,130 +20994,45 @@ void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        base_value,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << base_value)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << base_value)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
@@ -38106,137 +21062,47 @@ IR_ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -38262,130 +21128,45 @@ void _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        abstract_base_values,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << abstract_base_values)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << abstract_base_values)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
@@ -38413,136 +21194,47 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -38568,130 +21260,45 @@ void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        is_abstract,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << CORBA::Any::from_boolean (is_abstract))
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_abstract))
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
@@ -38719,136 +21326,47 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -38874,130 +21392,45 @@ void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        is_custom,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << CORBA::Any::from_boolean (is_custom))
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_custom))
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
@@ -39025,136 +21458,47 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -39180,130 +21524,45 @@ void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        is_truncatable,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << CORBA::Any::from_boolean (is_truncatable))
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << CORBA::Any::from_boolean (is_truncatable))
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
@@ -39332,147 +21591,57 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            _tao_retval
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               _tao_retval
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -39507,156 +21676,61 @@ IR_ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        type,
-        access,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << type) &&
               (_tao_out << access)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -39693,160 +21767,63 @@ IR_AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        type,
-        mode,
-        get_exceptions,
-        put_exceptions,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << type) &&
               (_tao_out << mode) &&
               (_tao_out << get_exceptions) &&
               (_tao_out << put_exceptions)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -39884,60 +21861,22 @@ IR_OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        result,
-        mode,
-        params,
-        exceptions,
-        contexts,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << result) &&
@@ -39945,101 +21884,41 @@ IR_OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
               (_tao_out << params) &&
               (_tao_out << exceptions) &&
               (_tao_out << contexts)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -40061,13 +21940,8 @@ _TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ValueDef_Remote_Proxy_Broker *
-_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -40101,7 +21975,7 @@ _TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ValueDef::IR_ValueDef (int collocated)
 {
-  this->IR_ValueDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -40109,18 +21983,19 @@ IR_ValueDef::~IR_ValueDef (void)
 {}
 
 void
-IR_ValueDef::IR_ValueDef_setup_collocation (int collocated)
+IR_ValueDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ValueDef_Proxy_Broker_ =
       _TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ValueDef_Proxy_Broker_ =
-      _TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
+      ::the_TAO_ValueDef_Remote_Proxy_Broker ();
+  
+  IR_Container::_tao_setup_collocation (collocated);
+  IR_Contained::_tao_setup_collocation (collocated);
+  IR_IDLType::_tao_setup_collocation (collocated);
   
-  this->IR_Container_setup_collocation (collocated);
-  this->IR_Contained_setup_collocation (collocated);
-  this->IR_IDLType_setup_collocation (collocated);
 }
 
 void IR_ValueDef::_tao_any_destructor (void *x)
@@ -40594,1179 +22469,6 @@ IR_OperationDef_ptr IR_ValueDef::create_operation (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (IR_InterfaceDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    supported_interfaces_ (supported_interfaces)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (IR_InitializerSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_InitializerSeq & initializers,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    initializers_ (initializers)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_initializers = parameter_list->length ();
-  parameter_list->length (length_initializers + 1);
-  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
-  
-  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (IR_ValueDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_ValueDef_ptr base_value,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    base_value_ (base_value)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_base_value = parameter_list->length ();
-  parameter_list->length (length_base_value + 1);
-  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
-  
-  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR_ValueDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    abstract_base_values_ (abstract_base_values)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_abstract_base_values = parameter_list->length ();
-  parameter_list->length (length_abstract_base_values + 1);
-  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
-  
-  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    is_abstract_ (is_abstract)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_custom,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    is_custom_ (is_custom)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_custom = parameter_list->length ();
-  parameter_list->length (length_is_custom + 1);
-  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    is_truncatable_ (is_truncatable)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_is_truncatable = parameter_list->length ();
-  parameter_list->length (length_is_truncatable + 1);
-  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::TAO_ClientRequestInfo_IR_ValueDef_is_a (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    const CORBA::Visibility & access,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    access_ (access)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_access = parameter_list->length ();
-  parameter_list->length (length_access + 1);
-  (*parameter_list)[length_access].argument <<= access_;
-  (*parameter_list)[length_access].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (IR_ValueMemberDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr type,
-    IR_AttributeMode & mode,
-    const IR_ExceptionDefSeq & get_exceptions,
-    const IR_ExceptionDefSeq & put_exceptions,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    type_ (type),
-    mode_ (mode),
-    get_exceptions_ (get_exceptions),
-    put_exceptions_ (put_exceptions)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_type = parameter_list->length ();
-  parameter_list->length (length_type + 1);
-  (*parameter_list)[length_type].argument <<=  this->type_;
-  
-  (*parameter_list)[length_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_get_exceptions = parameter_list->length ();
-  parameter_list->length (length_get_exceptions + 1);
-  (*parameter_list)[length_get_exceptions].argument <<=  this->get_exceptions_;
-  
-  (*parameter_list)[length_get_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_put_exceptions = parameter_list->length ();
-  parameter_list->length (length_put_exceptions + 1);
-  (*parameter_list)[length_put_exceptions].argument <<=  this->put_exceptions_;
-  
-  (*parameter_list)[length_put_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (IR_AttributeDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::TAO_ClientRequestInfo_IR_ValueDef_create_operation (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_IDLType_ptr result,
-    IR_OperationMode & mode,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    const IR_ContextIdSeq & contexts,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    result_ (result),
-    mode_ (mode),
-    params_ (params),
-    exceptions_ (exceptions),
-    contexts_ (contexts)
-{}
-
-Dynamic::ParameterList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_result = parameter_list->length ();
-  parameter_list->length (length_result + 1);
-  (*parameter_list)[length_result].argument <<=  this->result_;
-  
-  (*parameter_list)[length_result].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_mode = parameter_list->length ();
-  parameter_list->length (length_mode + 1);
-  (*parameter_list)[length_mode].argument <<=  this->mode_;
-  
-  (*parameter_list)[length_mode].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_contexts = parameter_list->length ();
-  parameter_list->length (length_contexts + 1);
-  (*parameter_list)[length_contexts].argument <<=  this->contexts_;
-  
-  (*parameter_list)[length_contexts].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (IR_OperationDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ValueDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -42459,137 +23161,47 @@ IR_IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -42615,130 +23227,45 @@ void _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        original_type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << original_type_def)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << original_type_def)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 
@@ -42759,13 +23286,8 @@ _TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ValueBoxDef_Remote_Proxy_Broker *
-_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -42799,7 +23321,7 @@ _TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ValueBoxDef::IR_ValueBoxDef (int collocated)
 {
-  this->IR_ValueBoxDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -42807,16 +23329,17 @@ IR_ValueBoxDef::~IR_ValueBoxDef (void)
 {}
 
 void
-IR_ValueBoxDef::IR_ValueBoxDef_setup_collocation (int collocated)
+IR_ValueBoxDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ValueBoxDef_Proxy_Broker_ =
       _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ValueBoxDef_Proxy_Broker_ =
-      _TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
+      ::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
+  
+  IR_TypedefDef::_tao_setup_collocation (collocated);
   
-  this->IR_TypedefDef_setup_collocation (collocated);
 }
 
 void IR_ValueBoxDef::_tao_any_destructor (void *x)
@@ -43012,121 +23535,6 @@ void IR_ValueBoxDef::original_type_def (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR_IDLType_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    IR_IDLType_ptr original_type_def,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    original_type_def_ (original_type_def)
-{}
-
-Dynamic::ParameterList *
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_original_type_def = parameter_list->length ();
-  parameter_list->length (length_original_type_def + 1);
-  (*parameter_list)[length_original_type_def].argument <<=  this->original_type_def_;
-  
-  (*parameter_list)[length_original_type_def].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ValueBoxDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -43177,137 +23585,47 @@ IR_InterfaceDef_ptr _TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -43329,13 +23647,8 @@ _TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ProvidesDef_Remote_Proxy_Broker *
-_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -43369,7 +23682,7 @@ _TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ProvidesDef::IR_ProvidesDef (int collocated)
 {
-  this->IR_ProvidesDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -43377,16 +23690,17 @@ IR_ProvidesDef::~IR_ProvidesDef (void)
 {}
 
 void
-IR_ProvidesDef::IR_ProvidesDef_setup_collocation (int collocated)
+IR_ProvidesDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ProvidesDef_Proxy_Broker_ =
       _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ProvidesDef_Proxy_Broker_ =
-      _TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
+      ::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
 }
 
 void IR_ProvidesDef::_tao_any_destructor (void *x)
@@ -43540,65 +23854,6 @@ IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (IR_InterfaceDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ProvidesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -43712,137 +23967,47 @@ IR_InterfaceDef_ptr _TAO_UsesDef_Remote_Proxy_Impl::interface_type (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -43871,136 +24036,47 @@ CORBA::Boolean _TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -44022,14 +24098,8 @@ _TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
 {
 }
 
-
-_TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_UsesDef_Remote_Proxy_Broker *
-_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -44063,7 +24133,7 @@ _TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_UsesDef::IR_UsesDef (int collocated)
 {
-  this->IR_UsesDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -44071,16 +24141,17 @@ IR_UsesDef::~IR_UsesDef (void)
 {}
 
 void
-IR_UsesDef::IR_UsesDef_setup_collocation (int collocated)
+IR_UsesDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_UsesDef_Proxy_Broker_ =
       _TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_UsesDef_Proxy_Broker_ =
-      _TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
+      ::the_TAO_UsesDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
 }
 
 void IR_UsesDef::_tao_any_destructor (void *x)
@@ -44248,121 +24319,6 @@ CORBA::Boolean IR_UsesDef::is_multiple (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (IR_InterfaceDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_UsesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -44779,147 +24735,57 @@ CORBA::Boolean _TAO_EventDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        event_id,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << event_id)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << event_id)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            _tao_retval
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               _tao_retval
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -44949,137 +24815,47 @@ IR_ValueDef_ptr _TAO_EventDef_Remote_Proxy_Impl::event (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -45101,13 +24877,8 @@ _TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
 {
 }
 
-_TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_EventDef_Remote_Proxy_Broker *
-_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -45141,7 +24912,7 @@ _TAO_EventDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_EventDef::IR_EventDef (int collocated)
 {
-  this->IR_EventDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -45149,16 +24920,17 @@ IR_EventDef::~IR_EventDef (void)
 {}
 
 void
-IR_EventDef::IR_EventDef_setup_collocation (int collocated)
+IR_EventDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_EventDef_Proxy_Broker_ =
       _TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_EventDef_Proxy_Broker_ =
-      _TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
+      ::the_TAO_EventDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
 }
 
 void IR_EventDef::_tao_any_destructor (void *x)
@@ -45328,130 +25100,6 @@ IR_ValueDef_ptr IR_EventDef::event (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * event_id,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    event_id_ (event_id)
-{}
-
-Dynamic::ParameterList *
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_event_id = parameter_list->length ();
-  parameter_list->length (length_event_id + 1);
-  (*parameter_list)[length_event_id].argument <<= event_id_;
-  (*parameter_list)[length_event_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (IR_ValueDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_EventDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -45557,13 +25205,8 @@ _TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
 {
 }
 
-_TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_EmitsDef_Remote_Proxy_Broker *
-_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -45597,7 +25240,7 @@ _TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_EmitsDef::IR_EmitsDef (int collocated)
 {
-  this->IR_EmitsDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -45605,16 +25248,17 @@ IR_EmitsDef::~IR_EmitsDef (void)
 {}
 
 void
-IR_EmitsDef::IR_EmitsDef_setup_collocation (int collocated)
+IR_EmitsDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_EmitsDef_Proxy_Broker_ =
       _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_EmitsDef_Proxy_Broker_ =
-      _TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
+      ::the_TAO_EmitsDef_Remote_Proxy_Broker ();
+  
+  IR_EventDef::_tao_setup_collocation (collocated);
   
-  this->IR_EventDef_setup_collocation (collocated);
 }
 
 void IR_EmitsDef::_tao_any_destructor (void *x)
@@ -45809,13 +25453,8 @@ _TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
 {
 }
 
-_TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_PublishesDef_Remote_Proxy_Broker *
-_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -45849,7 +25488,7 @@ _TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_PublishesDef::IR_PublishesDef (int collocated)
 {
-  this->IR_PublishesDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -45857,16 +25496,17 @@ IR_PublishesDef::~IR_PublishesDef (void)
 {}
 
 void
-IR_PublishesDef::IR_PublishesDef_setup_collocation (int collocated)
+IR_PublishesDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_PublishesDef_Proxy_Broker_ =
       _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_PublishesDef_Proxy_Broker_ =
-      _TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
+      ::the_TAO_PublishesDef_Remote_Proxy_Broker ();
+  
+  IR_EventDef::_tao_setup_collocation (collocated);
   
-  this->IR_EventDef_setup_collocation (collocated);
 }
 
 void IR_PublishesDef::_tao_any_destructor (void *x)
@@ -46061,13 +25701,8 @@ _TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ConsumesDef_Remote_Proxy_Broker *
-_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -46101,7 +25736,7 @@ _TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ConsumesDef::IR_ConsumesDef (int collocated)
 {
-  this->IR_ConsumesDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -46109,16 +25744,17 @@ IR_ConsumesDef::~IR_ConsumesDef (void)
 {}
 
 void
-IR_ConsumesDef::IR_ConsumesDef_setup_collocation (int collocated)
+IR_ConsumesDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ConsumesDef_Proxy_Broker_ =
       _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ConsumesDef_Proxy_Broker_ =
-      _TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
+      ::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
+  
+  IR_EventDef::_tao_setup_collocation (collocated);
   
-  this->IR_EventDef_setup_collocation (collocated);
 }
 
 void IR_ConsumesDef::_tao_any_destructor (void *x)
@@ -46322,137 +25958,47 @@ IR_InterfaceDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -46478,130 +26024,45 @@ void _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        supported_interfaces,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK;
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK;
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << supported_interfaces)
-            ))
-            TAO_INTERCEPTOR_THROW (
-              CORBA::MARSHAL ()
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-              );
-              
-            }
-          
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK;
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
             ACE_TRY_ENV
           );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
+        ACE_CHECK;
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << supported_interfaces)
+          ))
+        ACE_THROW (
+            CORBA::MARSHAL ()
           );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
       
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK;
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
         {
-          _tao_call.restart_flag (1);
-          continue;
+          ACE_THROW (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+            );
         }
-      
-      break;
-    }
-  
+        
+        break;
+      }
 }
 
 IR_ComponentDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::base_component (
@@ -46630,137 +26091,47 @@ IR_ComponentDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::base_component (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -46791,137 +26162,47 @@ IR_ProvidesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -46952,137 +26233,47 @@ IR_UsesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -47113,137 +26304,47 @@ IR_EmitsDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -47274,137 +26375,47 @@ IR_PublishesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -47435,137 +26446,47 @@ IR_ConsumesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -47594,136 +26515,47 @@ CORBA::Boolean _TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -47757,154 +26589,60 @@ IR_ProvidesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        interface_type,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << interface_type)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -47939,156 +26677,61 @@ IR_UsesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        interface_type,
-        is_multiple,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << interface_type) &&
               (_tao_out << CORBA::Any::from_boolean (is_multiple))
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -48122,154 +26765,60 @@ IR_EmitsDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        value,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << value)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -48303,154 +26852,60 @@ IR_PublishesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        value,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << value)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -48484,154 +26939,60 @@ IR_ConsumesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        value,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << value)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -48653,13 +27014,8 @@ _TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_ComponentDef_Remote_Proxy_Broker *
-_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -48693,7 +27049,7 @@ _TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_ComponentDef::IR_ComponentDef (int collocated)
 {
-  this->IR_ComponentDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -48701,16 +27057,17 @@ IR_ComponentDef::~IR_ComponentDef (void)
 {}
 
 void
-IR_ComponentDef::IR_ComponentDef_setup_collocation (int collocated)
+IR_ComponentDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_ComponentDef_Proxy_Broker_ =
       _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_ComponentDef_Proxy_Broker_ =
-      _TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
+      ::the_TAO_ComponentDef_Remote_Proxy_Broker ();
+  
+  IR_InterfaceDef::_tao_setup_collocation (collocated);
   
-  this->IR_InterfaceDef_setup_collocation (collocated);
 }
 
 void IR_ComponentDef::_tao_any_destructor (void *x)
@@ -49129,955 +27486,6 @@ IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (IR_InterfaceDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const IR_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    supported_interfaces_ (supported_interfaces)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (IR_ComponentDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR_ProvidesDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR_UsesDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (IR_EmitsDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR_PublishesDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (IR_ConsumesDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_InterfaceDef_ptr interface_type,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    interface_type_ (interface_type)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_interface_type = parameter_list->length ();
-  parameter_list->length (length_interface_type + 1);
-  (*parameter_list)[length_interface_type].argument <<=  this->interface_type_;
-  
-  (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR_ProvidesDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_InterfaceDef_ptr interface_type,
-    const CORBA::Boolean & is_multiple,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    interface_type_ (interface_type),
-    is_multiple_ (is_multiple)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_interface_type = parameter_list->length ();
-  parameter_list->length (length_interface_type + 1);
-  (*parameter_list)[length_interface_type].argument <<=  this->interface_type_;
-  
-  (*parameter_list)[length_interface_type].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_multiple = parameter_list->length ();
-  parameter_list->length (length_is_multiple + 1);
-  (*parameter_list)[length_is_multiple].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
-  (*parameter_list)[length_is_multiple].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (IR_UsesDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr value,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR_EmitsDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr value,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR_PublishesDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr value,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    value_ (value)
-{}
-
-Dynamic::ParameterList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_value = parameter_list->length ();
-  parameter_list->length (length_value + 1);
-  (*parameter_list)[length_value].argument <<=  this->value_;
-  
-  (*parameter_list)[length_value].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (IR_ConsumesDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_ComponentDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -50490,147 +27898,57 @@ CORBA::Boolean _TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        primary_key_id,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << primary_key_id)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << primary_key_id)
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            _tao_retval
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               _tao_retval
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -50660,137 +27978,47 @@ IR_ValueDef_ptr _TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -50812,13 +28040,8 @@ _TAO_PrimaryKeyDef_Proxy_Broker::~_TAO_PrimaryKeyDef_Proxy_Broker (void)
 {
 }
 
-_TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_PrimaryKeyDef_Remote_Proxy_Broker *
-_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_PrimaryKeyDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -50852,7 +28075,7 @@ _TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_PrimaryKeyDef::IR_PrimaryKeyDef (int collocated)
 {
-  this->IR_PrimaryKeyDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -50860,16 +28083,17 @@ IR_PrimaryKeyDef::~IR_PrimaryKeyDef (void)
 {}
 
 void
-IR_PrimaryKeyDef::IR_PrimaryKeyDef_setup_collocation (int collocated)
+IR_PrimaryKeyDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
       _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
-      _TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
+      ::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
+  
+  IR_Contained::_tao_setup_collocation (collocated);
   
-  this->IR_Contained_setup_collocation (collocated);
 }
 
 void IR_PrimaryKeyDef::_tao_any_destructor (void *x)
@@ -51039,130 +28263,6 @@ IR_ValueDef_ptr IR_PrimaryKeyDef::primary_key (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * primary_key_id,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    primary_key_id_ (primary_key_id)
-{}
-
-Dynamic::ParameterList *
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_primary_key_id = parameter_list->length ();
-  parameter_list->length (length_primary_key_id + 1);
-  (*parameter_list)[length_primary_key_id].argument <<= primary_key_id_;
-  (*parameter_list)[length_primary_key_id].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (IR_ValueDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_PrimaryKeyDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -51268,13 +28368,8 @@ _TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
 {
 }
 
-_TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_FactoryDef_Remote_Proxy_Broker *
-_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -51308,7 +28403,7 @@ _TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_FactoryDef::IR_FactoryDef (int collocated)
 {
-  this->IR_FactoryDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -51316,16 +28411,17 @@ IR_FactoryDef::~IR_FactoryDef (void)
 {}
 
 void
-IR_FactoryDef::IR_FactoryDef_setup_collocation (int collocated)
+IR_FactoryDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_FactoryDef_Proxy_Broker_ =
       _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_FactoryDef_Proxy_Broker_ =
-      _TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
+      ::the_TAO_FactoryDef_Remote_Proxy_Broker ();
+  
+  IR_OperationDef::_tao_setup_collocation (collocated);
   
-  this->IR_OperationDef_setup_collocation (collocated);
 }
 
 void IR_FactoryDef::_tao_any_destructor (void *x)
@@ -51520,13 +28616,8 @@ _TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
 {
 }
 
-_TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_FinderDef_Remote_Proxy_Broker *
-_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -51560,7 +28651,7 @@ _TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_FinderDef::IR_FinderDef (int collocated)
 {
-  this->IR_FinderDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -51568,16 +28659,17 @@ IR_FinderDef::~IR_FinderDef (void)
 {}
 
 void
-IR_FinderDef::IR_FinderDef_setup_collocation (int collocated)
+IR_FinderDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_FinderDef_Proxy_Broker_ =
       _TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_FinderDef_Proxy_Broker_ =
-      _TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
+      ::the_TAO_FinderDef_Remote_Proxy_Broker ();
+  
+  IR_OperationDef::_tao_setup_collocation (collocated);
   
-  this->IR_OperationDef_setup_collocation (collocated);
 }
 
 void IR_FinderDef::_tao_any_destructor (void *x)
@@ -51780,137 +28872,47 @@ IR_HomeDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::base_home (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -51940,137 +28942,47 @@ IR_ComponentDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::managed_component (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -52100,137 +29012,47 @@ IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::primary_key (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -52261,137 +29083,47 @@ IR_FactoryDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::factories (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -52422,137 +29154,47 @@ IR_FinderDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::finders (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              0
             );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -52581,136 +29223,47 @@ CORBA::Boolean _TAO_HomeDef_Remote_Proxy_Impl::is_basic (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN  (_tao_retval);
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN  (_tao_retval);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+              _tao_retval
             );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                _tao_retval
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Boolean  _tao_retval_info = _tao_retval;
-               ri.result (_tao_retval_info);
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN  (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_retval;
 }
 
@@ -52744,154 +29297,60 @@ IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        primary_key,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << primary_key)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -52926,156 +29385,61 @@ IR_FactoryDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_factory (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        params,
-        exceptions,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << params) &&
               (_tao_out << exceptions)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -53110,156 +29474,61 @@ IR_FinderDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_finder (
       istub->orb_core ()
     );
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        params,
-        exceptions,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
+      for (;;)
+      {
+        _tao_call.start (ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+        
+        _tao_call.prepare_header (
+            ACE_static_cast (CORBA::Octet, _tao_response_flag),
+            ACE_TRY_ENV
+          );
+        ACE_CHECK_RETURN (0);
+        
+        TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+        if (!(
+              (_tao_out << id) &&
               (_tao_out << name) &&
               (_tao_out << version) &&
               (_tao_out << params) &&
               (_tao_out << exceptions)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
+          ))
+        ACE_THROW_RETURN (
+            CORBA::MARSHAL (),
+            0
+          );
+      
+        int _invoke_status =
+          _tao_call.invoke (0, 0, ACE_TRY_ENV);
+        ACE_CHECK_RETURN (0);
+        
+        if (_invoke_status == TAO_INVOKE_RESTART)
+          {
+            _tao_call.restart_flag (1);
+            continue;
+          }
+        if (_invoke_status != TAO_INVOKE_OK)
+        {
+          ACE_THROW_RETURN (
+              CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
               0
             );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
+        }
+        TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+        if (!(
+              (_tao_in >> _tao_safe_retval.inout ())
+          ))
+          {
+            ACE_THROW_RETURN (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              IR_FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+          }
+        break;
+      }
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
   return _tao_safe_retval._retn ();
 }
 
@@ -53281,13 +29550,8 @@ _TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
 {
 }
 
-_TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-_TAO_HomeDef_Remote_Proxy_Broker *
-_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker (void)
+// Factory function Implementation.
+_TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void)
 {
   static ::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
@@ -53321,7 +29585,7 @@ _TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
 // default constructor
 IR_HomeDef::IR_HomeDef (int collocated)
 {
-  this->IR_HomeDef_setup_collocation (collocated);
+  this->_tao_setup_collocation (collocated);
 }
 
 // destructor
@@ -53329,16 +29593,17 @@ IR_HomeDef::~IR_HomeDef (void)
 {}
 
 void
-IR_HomeDef::IR_HomeDef_setup_collocation (int collocated)
+IR_HomeDef::_tao_setup_collocation (int collocated)
 {
   if (collocated)
     this->the_TAO_HomeDef_Proxy_Broker_ =
       _TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
   else
     this->the_TAO_HomeDef_Proxy_Broker_ =
-      _TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
+      ::the_TAO_HomeDef_Remote_Proxy_Broker ();
+  
+  IR_InterfaceDef::_tao_setup_collocation (collocated);
   
-  this->IR_InterfaceDef_setup_collocation (collocated);
 }
 
 void IR_HomeDef::_tao_any_destructor (void *x)
@@ -53671,622 +29936,6 @@ IR_FinderDef_ptr IR_HomeDef::create_finder (
     );
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (IR_HomeDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (IR_ComponentDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (IR_PrimaryKeyDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (IR_FactoryDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (IR_FinderDefSeq * result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    IR_ValueDef_ptr primary_key,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    primary_key_ (primary_key)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_primary_key = parameter_list->length ();
-  parameter_list->length (length_primary_key + 1);
-  (*parameter_list)[length_primary_key].argument <<=  this->primary_key_;
-  
-  (*parameter_list)[length_primary_key].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (IR_PrimaryKeyDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDef_create_factory (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    params_ (params),
-    exceptions_ (exceptions)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (IR_FactoryDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef_create_finder (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * id,
-    const char * name,
-    const char * version,
-    const IR_ParDescriptionSeq & params,
-    const IR_ExceptionDefSeq & exceptions,
-    CORBA::Environment &    
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    id_ (id),
-    name_ (name),
-    version_ (version),
-    params_ (params),
-    exceptions_ (exceptions)
-{}
-
-Dynamic::ParameterList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_params = parameter_list->length ();
-  parameter_list->length (length_params + 1);
-  (*parameter_list)[length_params].argument <<=  this->params_;
-  
-  (*parameter_list)[length_params].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_exceptions = parameter_list->length ();
-  parameter_list->length (length_exceptions + 1);
-  (*parameter_list)[length_exceptions].argument <<=  this->exceptions_;
-  
-  (*parameter_list)[length_exceptions].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-
-CORBA::Any * 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-void 
-IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (IR_FinderDef_ptr result)
-{
-  // update the result 
-  this->_result = result;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 static const CORBA::Long _oc_IR_HomeDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -54841,6 +30490,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_DefinitionKind &_tao_
   return 0;
 }
 
+_TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, CORBA_IRObject_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -54895,11 +30548,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA_IRObject,CORBA_IRObject_var>;
+    template class TAO_Object_Manager<CORBA_IRObject,CORBA::IRObject_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA_IRObject,CORBA_IRObject_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_IRObject,CORBA::IRObject_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_Contained_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -56707,6 +32364,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EnumMemberSeq *
   return 0;
 }
 
+_TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_Container_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -56936,6 +32597,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Container::Desc
   return 0;
 }
 
+_TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_IDLType_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57033,6 +32698,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveKind &_tao_e
   return 0;
 }
 
+_TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_Repository_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57092,6 +32761,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Repository_ptr &_tao_
   #  pragma instantiate TAO_Object_Manager<IR_Repository,IR_Repository_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ComponentRepository_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57151,6 +32824,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentRepository_p
   #  pragma instantiate TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ModuleDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57291,6 +32968,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ModuleDescripti
   return 0;
 }
 
+_TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ConstantDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57431,6 +33112,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ConstantDescrip
   return 0;
 }
 
+_TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_TypedefDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57571,6 +33256,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_TypeDescription
   return 0;
 }
 
+_TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_StructDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57630,6 +33319,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructDef_ptr &_tao_e
   #  pragma instantiate TAO_Object_Manager<IR_StructDef,IR_StructDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_UnionDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57689,6 +33382,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionDef_ptr &_tao_el
   #  pragma instantiate TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_EnumDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57748,6 +33445,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EnumDef_ptr &_tao_ele
   #  pragma instantiate TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_AliasDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57807,6 +33508,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AliasDef_ptr &_tao_el
   #  pragma instantiate TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_NativeDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57866,6 +33571,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_NativeDef_ptr &_tao_e
   #  pragma instantiate TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_PrimitiveDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57925,6 +33634,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveDef_ptr &_ta
   #  pragma instantiate TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_StringDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -57984,6 +33697,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StringDef_ptr &_tao_e
   #  pragma instantiate TAO_Object_Manager<IR_StringDef,IR_StringDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_WstringDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -58043,6 +33760,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_WstringDef_ptr &_tao_
   #  pragma instantiate TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_FixedDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -58102,6 +33823,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FixedDef_ptr &_tao_el
   #  pragma instantiate TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_SequenceDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -58161,6 +33886,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_SequenceDef_ptr &_tao
   #  pragma instantiate TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ArrayDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -58220,6 +33949,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ArrayDef_ptr &_tao_el
   #  pragma instantiate TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -58576,6 +34309,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeMode &_tao_e
   return 0;
 }
 
+_TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_AttributeDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -59051,6 +34788,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ContextIdSeq *&
   return 0;
 }
 
+_TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_OperationDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -59458,6 +35199,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_AttrDescription
   return 0;
 }
 
+_TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -59768,6 +35513,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueMemberSeq
   return 0;
 }
 
+_TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ValueMemberDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -59827,6 +35576,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMemberDef_ptr &_
   #  pragma instantiate TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ValueDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -59967,6 +35720,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueDescriptio
   return 0;
 }
 
+_TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ValueBoxDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60026,6 +35783,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueBoxDef_ptr &_tao
   #  pragma instantiate TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60166,6 +35927,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDescrip
   return 0;
 }
 
+_TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_UsesDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60484,6 +36249,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDescSeq *&_
   return 0;
 }
 
+_TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_EventDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60624,6 +36393,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EventDescriptio
   return 0;
 }
 
+_TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_EmitsDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60683,6 +36456,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EmitsDef_ptr &_tao_el
   #  pragma instantiate TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_PublishesDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60742,6 +36519,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PublishesDef_ptr &_ta
   #  pragma instantiate TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ConsumesDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60801,6 +36582,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConsumesDef_ptr &_tao
   #  pragma instantiate TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_ComponentDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -60941,6 +36726,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ComponentDescri
   return 0;
 }
 
+_TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_PrimaryKeyDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -61081,6 +36870,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_PrimaryKeyDescr
   return 0;
 }
 
+_TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_FactoryDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -61140,6 +36933,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FactoryDef_ptr &_tao_
   #  pragma instantiate TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_FinderDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -61199,6 +36996,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FinderDef_ptr &_tao_e
   #  pragma instantiate TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+_TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
 void operator<<= (CORBA::Any &_tao_any, IR_HomeDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
diff --git a/TAO/tao/IFR_Client/InterfaceC.h b/TAO/tao/IFR_Client/InterfaceC.h
index 663b79772c9..35856df25df 100644
--- a/TAO/tao/IFR_Client/InterfaceC.h
+++ b/TAO/tao/IFR_Client/InterfaceC.h
@@ -37,10 +37,6 @@
 #include "tao/Typecode.h"
 #include "tao/Remote_Object_Proxy_Impl.h"
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  #include "tao/ClientRequestInfo.h"
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
@@ -170,7 +166,7 @@
   protected:
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
-    virtual void CORBA_IRObject_setup_collocation (int collocated);
+    virtual void _tao_setup_collocation (int collocated);
 
     CORBA_IRObject (
         TAO_Stub *objref,
@@ -186,97 +182,8 @@
   private:
     CORBA_IRObject (const CORBA_IRObject &);
     void operator= (const CORBA_IRObject &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ClientRequestInfo
-    {
-    public:
-      friend class CORBA_IRObject;
-      
-      friend class _TAO_IRObject_Remote_Proxy_Impl;
-      friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
-      friend class _TAO_IRObject_Direct_Proxy_Impl;
-    
-      TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
-          TAO_GIOP_Invocation *_tao_invocation,
-          CORBA::Object_ptr _tao_target,
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-    
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-  private:
-    TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
-    void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
-    void result (IR_DefinitionKind result);
-    // update the result 
-    IR_DefinitionKind _result;
-  };
-  
-  class TAO_ClientRequestInfo_CORBA_IRObject_destroy : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class CORBA_IRObject;
-    
-    friend class _TAO_IRObject_Remote_Proxy_Impl;
-    friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
-    friend class _TAO_IRObject_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_CORBA_IRObject_destroy (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_CORBA_IRObject_destroy (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
-    void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
-  
   };
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
-};
 
 // The Proxy Implementations are used by each interface to
 // perform a call. Each different implementation encapsulate
@@ -761,7 +668,7 @@ public:
   protected:
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
-    virtual void IR_Contained_setup_collocation (int collocated);
+    virtual void _tao_setup_collocation (int collocated);
 
     IR_Contained (
         TAO_Stub *objref,
@@ -778,481 +685,8 @@ public:
     IR_Contained (const IR_Contained &);
     void operator= (const IR_Contained &);
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-    // Generation of interceptors related RequestInfo classes per operation.
-    // This needed to be able to store the arguments, exceptions, contexts
-    // and build the lists dynamically on demand so that unnecessary time overhead
-    // of building these lists when they arent used is avoided.
-    class TAO_ClientRequestInfo_IR_Contained_id_get : public TAO_ClientRequestInfo
-    {
-    public:
-      friend class IR_Contained;
-      
-      friend class _TAO_Contained_Remote_Proxy_Impl;
-      friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-      friend class _TAO_Contained_Direct_Proxy_Impl;
-    
-      TAO_ClientRequestInfo_IR_Contained_id_get (
-          TAO_GIOP_Invocation *_tao_invocation,
-          CORBA::Object_ptr _tao_target,
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        );
-    
-      virtual Dynamic::ParameterList * arguments (
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual Dynamic::ExceptionList * exceptions (
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-      virtual CORBA::Any * result (
-          CORBA::Environment &ACE_TRY_ENV = 
-            TAO_default_environment ()
-        )
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    
-  private:
-    TAO_ClientRequestInfo_IR_Contained_id_get (const TAO_ClientRequestInfo_IR_Contained_id_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_id_get &);
-    void result (char * result);
-    // update the result 
-    char * _result;
-  };
-  
-  class TAO_ClientRequestInfo_IR_Contained_id_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-    
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_Contained_id_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_Contained_id_set (const TAO_ClientRequestInfo_IR_Contained_id_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_id_set &);
-    const char * id_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_name_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-  TAO_ClientRequestInfo_IR_Contained_name_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_name_get (const TAO_ClientRequestInfo_IR_Contained_name_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_name_get &);
-    void result (char * result);
-    // update the result 
-    char * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_name_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_name_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_name_set (const TAO_ClientRequestInfo_IR_Contained_name_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_name_set &);
-    const char * name_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_version_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_version_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_version_get (const TAO_ClientRequestInfo_IR_Contained_version_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_version_get &);
-    void result (char * result);
-    // update the result 
-    char * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_version_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_version_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_version_set (const TAO_ClientRequestInfo_IR_Contained_version_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_version_set &);
-    const char * version_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_defined_in_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_defined_in_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_defined_in_get (const TAO_ClientRequestInfo_IR_Contained_defined_in_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_defined_in_get &);
-    void result (IR_Container_ptr result);
-    // update the result 
-    IR_Container_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_absolute_name_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_absolute_name_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_absolute_name_get (const TAO_ClientRequestInfo_IR_Contained_absolute_name_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_absolute_name_get &);
-    void result (char * result);
-    // update the result 
-    char * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_containing_repository_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_containing_repository_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_containing_repository_get (const TAO_ClientRequestInfo_IR_Contained_containing_repository_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_containing_repository_get &);
-    void result (IR_Repository_ptr result);
-    // update the result 
-    IR_Repository_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_describe : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_describe (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_describe (const TAO_ClientRequestInfo_IR_Contained_describe &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_describe &);
-    void result (ACE_NESTED_CLASS (IR_Contained,Description) * result);
-    // update the result 
-    ACE_NESTED_CLASS (IR_Contained,Description) * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Contained_move : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Contained;
-  
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Contained_move (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_Container_ptr new_container,
-        const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Contained_move (const TAO_ClientRequestInfo_IR_Contained_move &);
-    void operator= (const TAO_ClientRequestInfo_IR_Contained_move &);
-    IR_Container_ptr new_container_;
-    const char * new_name_;
-    const char * new_version_;
-  
   };
 
-  #endif /* TAO_HAS_INTERCEPTORS */
-
-};
-
 
 // The Proxy Implementations are used by each interface to
 // perform a call. Each different implementation encapsulate
@@ -4891,7 +4325,6 @@ public:
 
     Description & operator[] (CORBA::ULong index);
     const Description & operator[] (CORBA::ULong index) const;
-
     // in, inout, out, _retn
     const DescriptionSeq &in (void) const;
     DescriptionSeq &inout (void);
@@ -5093,7 +4526,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_Container_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_Container (
       TAO_Stub *objref,
@@ -5109,768 +4542,6 @@ protected:
 private:
   IR_Container (const IR_Container &);
   void operator= (const IR_Container &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_Container_lookup : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-    
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_Container_lookup (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_Container_lookup (const TAO_ClientRequestInfo_IR_Container_lookup &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_lookup &);
-    const char * search_name_;
-    void result (IR_Contained_ptr result);
-    // update the result 
-    IR_Contained_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_contents : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_contents (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_DefinitionKind & limit_type,
-        const CORBA::Boolean & exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_contents (const TAO_ClientRequestInfo_IR_Container_contents &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_contents &);
-    const IR_DefinitionKind & limit_type_;
-    const CORBA::Boolean & exclude_inherited_;
-    void result (IR_ContainedSeq * result);
-    // update the result 
-    IR_ContainedSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_lookup_name : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_lookup_name (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * search_name,
-        const CORBA::Long & levels_to_search,
-        IR_DefinitionKind & limit_type,
-        const CORBA::Boolean & exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_lookup_name (const TAO_ClientRequestInfo_IR_Container_lookup_name &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_lookup_name &);
-    const char * search_name_;
-    const CORBA::Long & levels_to_search_;
-    const IR_DefinitionKind & limit_type_;
-    const CORBA::Boolean & exclude_inherited_;
-    void result (IR_ContainedSeq * result);
-    // update the result 
-    IR_ContainedSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_describe_contents : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_describe_contents (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_DefinitionKind & limit_type,
-        const CORBA::Boolean & exclude_inherited,
-        const CORBA::Long & max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_describe_contents (const TAO_ClientRequestInfo_IR_Container_describe_contents &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_describe_contents &);
-    const IR_DefinitionKind & limit_type_;
-    const CORBA::Boolean & exclude_inherited_;
-    const CORBA::Long & max_returned_objs_;
-    void result (ACE_NESTED_CLASS (IR_Container,DescriptionSeq) * result);
-    // update the result 
-    ACE_NESTED_CLASS (IR_Container,DescriptionSeq) * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_module : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_module (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_module (const TAO_ClientRequestInfo_IR_Container_create_module &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_module &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    void result (IR_ModuleDef_ptr result);
-    // update the result 
-    IR_ModuleDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_constant : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_constant (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_constant (const TAO_ClientRequestInfo_IR_Container_create_constant &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_constant &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr type_;
-    const CORBA::Any & value_;
-    void result (IR_ConstantDef_ptr result);
-    // update the result 
-    IR_ConstantDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_struct : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_struct (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_struct (const TAO_ClientRequestInfo_IR_Container_create_struct &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_struct &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    const IR_StructMemberSeq & members_;
-    void result (IR_StructDef_ptr result);
-    // update the result 
-    IR_StructDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_union : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_union (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr discriminator_type,
-        const IR_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_union (const TAO_ClientRequestInfo_IR_Container_create_union &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_union &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr discriminator_type_;
-    const IR_UnionMemberSeq & members_;
-    void result (IR_UnionDef_ptr result);
-    // update the result 
-    IR_UnionDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_enum : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_enum (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_enum (const TAO_ClientRequestInfo_IR_Container_create_enum &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_enum &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    const IR_EnumMemberSeq & members_;
-    void result (IR_EnumDef_ptr result);
-    // update the result 
-    IR_EnumDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_alias : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_alias (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_alias (const TAO_ClientRequestInfo_IR_Container_create_alias &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_alias &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr original_type_;
-    void result (IR_AliasDef_ptr result);
-    // update the result 
-    IR_AliasDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_interface : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_interface (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_InterfaceDefSeq & base_interfaces,
-        const CORBA::Boolean & is_abstract,
-        const CORBA::Boolean & is_local,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_interface (const TAO_ClientRequestInfo_IR_Container_create_interface &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_interface &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    const IR_InterfaceDefSeq & base_interfaces_;
-    const CORBA::Boolean & is_abstract_;
-    const CORBA::Boolean & is_local_;
-    void result (IR_InterfaceDef_ptr result);
-    // update the result 
-    IR_InterfaceDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_value : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_value (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::Boolean & is_custom,
-        const CORBA::Boolean & is_abstract,
-        IR_ValueDef_ptr base_value,
-        const CORBA::Boolean & is_truncatable,
-        const IR_ValueDefSeq & abstract_base_values,
-        const IR_InterfaceDefSeq & supported_interfaces,
-        const IR_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_value (const TAO_ClientRequestInfo_IR_Container_create_value &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_value &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    const CORBA::Boolean & is_custom_;
-    const CORBA::Boolean & is_abstract_;
-    IR_ValueDef_ptr base_value_;
-    const CORBA::Boolean & is_truncatable_;
-    const IR_ValueDefSeq & abstract_base_values_;
-    const IR_InterfaceDefSeq & supported_interfaces_;
-    const IR_InitializerSeq & initializers_;
-    void result (IR_ValueDef_ptr result);
-    // update the result 
-    IR_ValueDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_value_box : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_value_box (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_value_box (const TAO_ClientRequestInfo_IR_Container_create_value_box &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_value_box &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr original_type_def_;
-    void result (IR_ValueBoxDef_ptr result);
-    // update the result 
-    IR_ValueBoxDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_exception : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_exception (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_exception (const TAO_ClientRequestInfo_IR_Container_create_exception &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_exception &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    const IR_StructMemberSeq & members_;
-    void result (IR_ExceptionDef_ptr result);
-    // update the result 
-    IR_ExceptionDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Container_create_native : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Container;
-
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Container_create_native (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Container_create_native (const TAO_ClientRequestInfo_IR_Container_create_native &);
-    void operator= (const TAO_ClientRequestInfo_IR_Container_create_native &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    void result (IR_NativeDef_ptr result);
-    // update the result 
-    IR_NativeDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -6352,7 +5023,7 @@ class _TAO_IDLType_Remote_Proxy_Impl;
 class _TAO_IDLType_Proxy_Broker;
 class _TAO_IDLType_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export IR_IDLType : public virtual CORBA_IRObject
+class TAO_IFR_Client_Export IR_IDLType: public virtual CORBA_IRObject
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -6405,7 +5076,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_IDLType_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_IDLType (
       TAO_Stub *objref,
@@ -6421,56 +5092,6 @@ protected:
 private:
   IR_IDLType (const IR_IDLType &);
   void operator= (const IR_IDLType &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_IDLType_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_IDLType;
-    
-    friend class _TAO_IDLType_Remote_Proxy_Impl;
-    friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
-    friend class _TAO_IDLType_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_IDLType_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_IDLType_type_get (const TAO_ClientRequestInfo_IR_IDLType_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_IDLType_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -6996,7 +5617,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_Repository_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_Repository (
       TAO_Stub *objref,
@@ -7012,372 +5633,6 @@ protected:
 private:
   IR_Repository (const IR_Repository &);
   void operator= (const IR_Repository &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_Repository_lookup_id : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-    
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_Repository_lookup_id (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_Repository_lookup_id (const TAO_ClientRequestInfo_IR_Repository_lookup_id &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_lookup_id &);
-    const char * search_id_;
-    void result (IR_Contained_ptr result);
-    // update the result 
-    IR_Contained_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-  
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::TypeCode_ptr tc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (const TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode &);
-    CORBA::TypeCode_ptr tc_;
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Repository_get_primitive : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-  
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Repository_get_primitive (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_PrimitiveKind & kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Repository_get_primitive (const TAO_ClientRequestInfo_IR_Repository_get_primitive &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_get_primitive &);
-    const IR_PrimitiveKind & kind_;
-    void result (IR_PrimitiveDef_ptr result);
-    // update the result 
-    IR_PrimitiveDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Repository_create_string : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-  
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Repository_create_string (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Repository_create_string (const TAO_ClientRequestInfo_IR_Repository_create_string &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_create_string &);
-    const CORBA::ULong & bound_;
-    void result (IR_StringDef_ptr result);
-    // update the result 
-    IR_StringDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Repository_create_wstring : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-  
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Repository_create_wstring (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Repository_create_wstring (const TAO_ClientRequestInfo_IR_Repository_create_wstring &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_create_wstring &);
-    const CORBA::ULong & bound_;
-    void result (IR_WstringDef_ptr result);
-    // update the result 
-    IR_WstringDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Repository_create_sequence : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-  
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Repository_create_sequence (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & bound,
-        IR_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Repository_create_sequence (const TAO_ClientRequestInfo_IR_Repository_create_sequence &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_create_sequence &);
-    const CORBA::ULong & bound_;
-    IR_IDLType_ptr element_type_;
-    void result (IR_SequenceDef_ptr result);
-    // update the result 
-    IR_SequenceDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Repository_create_array : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-  
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Repository_create_array (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & length,
-        IR_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Repository_create_array (const TAO_ClientRequestInfo_IR_Repository_create_array &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_create_array &);
-    const CORBA::ULong & length_;
-    IR_IDLType_ptr element_type_;
-    void result (IR_ArrayDef_ptr result);
-    // update the result 
-    IR_ArrayDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_Repository_create_fixed : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_Repository;
-  
-    friend class _TAO_Repository_Remote_Proxy_Impl;
-    friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-    friend class _TAO_Repository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_Repository_create_fixed (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::UShort & digits,
-        const CORBA::Short & scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_Repository_create_fixed (const TAO_ClientRequestInfo_IR_Repository_create_fixed &);
-    void operator= (const TAO_ClientRequestInfo_IR_Repository_create_fixed &);
-    const CORBA::UShort & digits_;
-    const CORBA::Short & scale_;
-    void result (IR_FixedDef_ptr result);
-    // update the result 
-    IR_FixedDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -7763,7 +6018,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ComponentRepository_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ComponentRepository (
       TAO_Stub *objref,
@@ -7779,120 +6034,6 @@ protected:
 private:
   IR_ComponentRepository (const IR_ComponentRepository &);
   void operator= (const IR_ComponentRepository &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ComponentRepository_create_component : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentRepository;
-  
-    friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
-    friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ComponentDef_ptr base_component,
-        const IR_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ComponentRepository_create_component (const TAO_ClientRequestInfo_IR_ComponentRepository_create_component &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentRepository_create_component &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_ComponentDef_ptr base_component_;
-    const IR_InterfaceDefSeq & supports_interfaces_;
-    void result (IR_ComponentDef_ptr result);
-    // update the result 
-    IR_ComponentDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentRepository_create_home : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentRepository;
-  
-    friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
-    friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_HomeDef_ptr base_home,
-        IR_ComponentDef_ptr managed_component,
-        IR_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentRepository_create_home (const TAO_ClientRequestInfo_IR_ComponentRepository_create_home &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentRepository_create_home &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_HomeDef_ptr base_home_;
-    IR_ComponentDef_ptr managed_component_;
-    IR_ValueDef_ptr primary_key_;
-    void result (IR_HomeDef_ptr result);
-    // update the result 
-    IR_HomeDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -8110,7 +6251,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ModuleDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ModuleDef (
       TAO_Stub *objref,
@@ -8126,14 +6267,6 @@ protected:
 private:
   IR_ModuleDef (const IR_ModuleDef &);
   void operator= (const IR_ModuleDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -8403,7 +6536,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ConstantDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ConstantDef (
       TAO_Stub *objref,
@@ -8419,224 +6552,6 @@ protected:
 private:
   IR_ConstantDef (const IR_ConstantDef &);
   void operator= (const IR_ConstantDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ConstantDef_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ConstantDef;
-    
-    friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-    friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ConstantDef_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ConstantDef_type_get (const TAO_ClientRequestInfo_IR_ConstantDef_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ConstantDef_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ConstantDef;
-  
-    friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-    friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ConstantDef_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ConstantDef;
-  
-    friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-    friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_set &);
-    IR_IDLType_ptr type_def_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ConstantDef_value_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ConstantDef;
-  
-    friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-    friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ConstantDef_value_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ConstantDef_value_get (const TAO_ClientRequestInfo_IR_ConstantDef_value_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_value_get &);
-    void result (CORBA::Any * result);
-    // update the result 
-    CORBA::Any * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ConstantDef_value_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ConstantDef;
-  
-    friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-    friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ConstantDef_value_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ConstantDef_value_set (const TAO_ClientRequestInfo_IR_ConstantDef_value_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_value_set &);
-    const CORBA::Any & value_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -8786,6 +6701,7 @@ class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker
 {
 public:
   virtual ~_TAO_ConstantDef_Proxy_Broker (void);
+
   virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
     IR_ConstantDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
@@ -8992,7 +6908,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_TypedefDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_TypedefDef (
       TAO_Stub *objref,
@@ -9008,14 +6924,6 @@ protected:
 private:
   IR_TypedefDef (const IR_TypedefDef &);
   void operator= (const IR_TypedefDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -9083,6 +6991,7 @@ class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker
 {
 public:
   virtual ~_TAO_TypedefDef_Proxy_Broker (void);
+
   virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
     IR_TypedefDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
@@ -9260,7 +7169,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_StructDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_StructDef (
       TAO_Stub *objref,
@@ -9276,98 +7185,6 @@ protected:
 private:
   IR_StructDef (const IR_StructDef &);
   void operator= (const IR_StructDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_StructDef_members_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_StructDef;
-    
-    friend class _TAO_StructDef_Remote_Proxy_Impl;
-    friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_StructDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_StructDef_members_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_StructDef_members_get (const TAO_ClientRequestInfo_IR_StructDef_members_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_StructDef_members_get &);
-    void result (IR_StructMemberSeq * result);
-    // update the result 
-    IR_StructMemberSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_StructDef_members_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_StructDef;
-  
-    friend class _TAO_StructDef_Remote_Proxy_Impl;
-    friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_StructDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_StructDef_members_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_StructDef_members_set (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
-    const IR_StructMemberSeq & members_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -9609,7 +7426,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_UnionDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_UnionDef (
       TAO_Stub *objref,
@@ -9625,224 +7442,6 @@ protected:
 private:
  IR_UnionDef (const IR_UnionDef &);
   void operator= (const IR_UnionDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_UnionDef;
-    
-    friend class _TAO_UnionDef_Remote_Proxy_Impl;
-    friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UnionDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_UnionDef;
-  
-    friend class _TAO_UnionDef_Remote_Proxy_Impl;
-    friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UnionDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_UnionDef;
-  
-    friend class _TAO_UnionDef_Remote_Proxy_Impl;
-    friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UnionDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr discriminator_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set &);
-    IR_IDLType_ptr discriminator_type_def_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_UnionDef_members_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_UnionDef;
-  
-    friend class _TAO_UnionDef_Remote_Proxy_Impl;
-    friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UnionDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_UnionDef_members_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_UnionDef_members_get (const TAO_ClientRequestInfo_IR_UnionDef_members_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_UnionDef_members_get &);
-    void result (IR_UnionMemberSeq * result);
-    // update the result 
-    IR_UnionMemberSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_UnionDef_members_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_UnionDef;
-  
-    friend class _TAO_UnionDef_Remote_Proxy_Impl;
-    friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UnionDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_UnionDef_members_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_UnionDef_members_set (const TAO_ClientRequestInfo_IR_UnionDef_members_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_UnionDef_members_set &);
-    const IR_UnionMemberSeq & members_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -10109,7 +7708,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_EnumDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_EnumDef (
       TAO_Stub *objref,
@@ -10125,98 +7724,6 @@ protected:
 private:
   IR_EnumDef (const IR_EnumDef &);
   void operator= (const IR_EnumDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_EnumDef_members_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_EnumDef;
-    
-    friend class _TAO_EnumDef_Remote_Proxy_Impl;
-    friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EnumDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_EnumDef_members_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_EnumDef_members_get (const TAO_ClientRequestInfo_IR_EnumDef_members_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_EnumDef_members_get &);
-    void result (IR_EnumMemberSeq * result);
-    // update the result 
-    IR_EnumMemberSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_EnumDef_members_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_EnumDef;
-  
-    friend class _TAO_EnumDef_Remote_Proxy_Impl;
-    friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EnumDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_EnumDef_members_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_EnumDef_members_set (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
-    const IR_EnumMemberSeq & members_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -10431,7 +7938,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_AliasDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_AliasDef (
       TAO_Stub *objref,
@@ -10447,98 +7954,6 @@ protected:
 private:
   IR_AliasDef (const IR_AliasDef &);
   void operator= (const IR_AliasDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_AliasDef;
-    
-    friend class _TAO_AliasDef_Remote_Proxy_Impl;
-    friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AliasDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_AliasDef;
-  
-    friend class _TAO_AliasDef_Remote_Proxy_Impl;
-    friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AliasDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set &);
-    IR_IDLType_ptr original_type_def_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -10736,7 +8151,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_NativeDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_NativeDef (
       TAO_Stub *objref,
@@ -10752,14 +8167,6 @@ protected:
 private:
   IR_NativeDef (const IR_NativeDef &);
   void operator= (const IR_NativeDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -10860,13 +8267,13 @@ public:
 
 private:
   _TAO_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
-// This member function is used to get an handle to the unique instance
+};
+
+// This funxtion is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
-public:
-  static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
-};
+_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
 
 //
 //              End Remote Proxy Broker Declaration
@@ -10931,7 +8338,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_PrimitiveDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_PrimitiveDef (
       TAO_Stub *objref,
@@ -10947,56 +8354,6 @@ protected:
 private:
   IR_PrimitiveDef (const IR_PrimitiveDef &);
   void operator= (const IR_PrimitiveDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_PrimitiveDef;
-    
-    friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
-    friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (const TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get &);
-    void result (IR_PrimitiveKind result);
-    // update the result 
-    IR_PrimitiveKind _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -11193,7 +8550,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_StringDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_StringDef (
       TAO_Stub *objref,
@@ -11209,98 +8566,6 @@ protected:
 private:
   IR_StringDef (const IR_StringDef &);
   void operator= (const IR_StringDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_StringDef_bound_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_StringDef;
-    
-    friend class _TAO_StringDef_Remote_Proxy_Impl;
-    friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_StringDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_StringDef_bound_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_StringDef_bound_get (const TAO_ClientRequestInfo_IR_StringDef_bound_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_StringDef_bound_get &);
-    void result (CORBA::ULong result);
-    // update the result 
-    CORBA::ULong _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_StringDef_bound_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_StringDef;
-  
-    friend class _TAO_StringDef_Remote_Proxy_Impl;
-    friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_StringDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_StringDef_bound_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_StringDef_bound_set (const TAO_ClientRequestInfo_IR_StringDef_bound_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_StringDef_bound_set &);
-    const CORBA::ULong & bound_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -11515,7 +8780,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_WstringDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_WstringDef (
       TAO_Stub *objref,
@@ -11531,98 +8796,6 @@ protected:
 private:
   IR_WstringDef (const IR_WstringDef &);
   void operator= (const IR_WstringDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_WstringDef_bound_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_WstringDef;
-    
-    friend class _TAO_WstringDef_Remote_Proxy_Impl;
-    friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_WstringDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_WstringDef_bound_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_WstringDef_bound_get (const TAO_ClientRequestInfo_IR_WstringDef_bound_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_WstringDef_bound_get &);
-    void result (CORBA::ULong result);
-    // update the result 
-    CORBA::ULong _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_WstringDef_bound_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_WstringDef;
-  
-    friend class _TAO_WstringDef_Remote_Proxy_Impl;
-    friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_WstringDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_WstringDef_bound_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_WstringDef_bound_set (const TAO_ClientRequestInfo_IR_WstringDef_bound_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_WstringDef_bound_set &);
-    const CORBA::ULong & bound_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -11854,7 +9027,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_FixedDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_FixedDef (
       TAO_Stub *objref,
@@ -11870,182 +9043,6 @@ protected:
 private:
   IR_FixedDef (const IR_FixedDef &);
   void operator= (const IR_FixedDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_FixedDef_digits_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_FixedDef;
-    
-    friend class _TAO_FixedDef_Remote_Proxy_Impl;
-    friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FixedDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_FixedDef_digits_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_FixedDef_digits_get (const TAO_ClientRequestInfo_IR_FixedDef_digits_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_FixedDef_digits_get &);
-    void result (CORBA::UShort result);
-    // update the result 
-    CORBA::UShort _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_FixedDef_digits_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_FixedDef;
-  
-    friend class _TAO_FixedDef_Remote_Proxy_Impl;
-    friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FixedDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_FixedDef_digits_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::UShort & digits,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_FixedDef_digits_set (const TAO_ClientRequestInfo_IR_FixedDef_digits_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_FixedDef_digits_set &);
-    const CORBA::UShort & digits_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_FixedDef_scale_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_FixedDef;
-  
-    friend class _TAO_FixedDef_Remote_Proxy_Impl;
-    friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FixedDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_FixedDef_scale_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_FixedDef_scale_get (const TAO_ClientRequestInfo_IR_FixedDef_scale_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_FixedDef_scale_get &);
-    void result (CORBA::Short result);
-    // update the result 
-    CORBA::Short _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_FixedDef_scale_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_FixedDef;
-  
-    friend class _TAO_FixedDef_Remote_Proxy_Impl;
-    friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_FixedDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_FixedDef_scale_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Short & scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_FixedDef_scale_set (const TAO_ClientRequestInfo_IR_FixedDef_scale_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_FixedDef_scale_set &);
-    const CORBA::Short & scale_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -12319,7 +9316,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_SequenceDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_SequenceDef (
       TAO_Stub *objref,
@@ -12335,224 +9332,6 @@ protected:
 private:
   IR_SequenceDef (const IR_SequenceDef &);
   void operator= (const IR_SequenceDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_SequenceDef_bound_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_SequenceDef;
-    
-    friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-    friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_SequenceDef_bound_get (const TAO_ClientRequestInfo_IR_SequenceDef_bound_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_bound_get &);
-    void result (CORBA::ULong result);
-    // update the result 
-    CORBA::ULong _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_SequenceDef_bound_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_SequenceDef;
-  
-    friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-    friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_SequenceDef_bound_set (const TAO_ClientRequestInfo_IR_SequenceDef_bound_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_bound_set &);
-    const CORBA::ULong & bound_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_SequenceDef_element_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_SequenceDef;
-  
-    friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-    friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_SequenceDef;
-  
-    friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-    friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_SequenceDef;
-  
-    friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-    friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set &);
-    IR_IDLType_ptr element_type_def_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -12843,7 +9622,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ArrayDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ArrayDef (
       TAO_Stub *objref,
@@ -12859,224 +9638,6 @@ protected:
 private:
   IR_ArrayDef (const IR_ArrayDef &);
   void operator= (const IR_ArrayDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ArrayDef_length_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ArrayDef;
-    
-    friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-    friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ArrayDef_length_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ArrayDef_length_get (const TAO_ClientRequestInfo_IR_ArrayDef_length_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_length_get &);
-    void result (CORBA::ULong result);
-    // update the result 
-    CORBA::ULong _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ArrayDef_length_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ArrayDef;
-  
-    friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-    friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ArrayDef_length_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::ULong & length,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ArrayDef_length_set (const TAO_ClientRequestInfo_IR_ArrayDef_length_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_length_set &);
-    const CORBA::ULong & length_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ArrayDef_element_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ArrayDef;
-  
-    friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-    friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ArrayDef;
-  
-    friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-    friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ArrayDef;
-  
-    friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-    friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set &);
-    IR_IDLType_ptr element_type_def_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -13351,7 +9912,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ExceptionDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ExceptionDef (
       TAO_Stub *objref,
@@ -13367,140 +9928,6 @@ protected:
 private:
   IR_ExceptionDef (const IR_ExceptionDef &);
   void operator= (const IR_ExceptionDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ExceptionDef_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ExceptionDef;
-    
-    friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
-    friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ExceptionDef_type_get (const TAO_ClientRequestInfo_IR_ExceptionDef_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ExceptionDef_members_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ExceptionDef;
-  
-    friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
-    friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ExceptionDef_members_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ExceptionDef_members_get (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
-    void result (IR_StructMemberSeq * result);
-    // update the result 
-    IR_StructMemberSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ExceptionDef_members_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ExceptionDef;
-  
-    friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
-    friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ExceptionDef_members_set (const TAO_ClientRequestInfo_IR_ExceptionDef_members_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_members_set &);
-    const IR_StructMemberSeq & members_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -14108,7 +10535,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_AttributeDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_AttributeDef (
       TAO_Stub *objref,
@@ -14124,224 +10551,6 @@ protected:
 private:
   IR_AttributeDef (const IR_AttributeDef &);
   void operator= (const IR_AttributeDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_AttributeDef_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_AttributeDef;
-    
-    friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-    friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_AttributeDef_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_AttributeDef_type_get (const TAO_ClientRequestInfo_IR_AttributeDef_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_AttributeDef_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_AttributeDef;
-  
-    friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-    friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_AttributeDef_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_AttributeDef;
-  
-    friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-    friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_set &);
-    IR_IDLType_ptr type_def_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_AttributeDef_mode_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_AttributeDef;
-  
-    friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-    friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_AttributeDef_mode_get (const TAO_ClientRequestInfo_IR_AttributeDef_mode_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_mode_get &);
-    void result (IR_AttributeMode result);
-    // update the result 
-    IR_AttributeMode _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_AttributeDef_mode_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_AttributeDef;
-  
-    friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-    friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_AttributeMode & mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_AttributeDef_mode_set (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
-    const IR_AttributeMode & mode_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -15060,7 +11269,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_OperationDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_OperationDef (
       TAO_Stub *objref,
@@ -15076,476 +11285,6 @@ protected:
 private:
   IR_OperationDef (const IR_OperationDef &);
   void operator= (const IR_OperationDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_OperationDef_result_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-    
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_OperationDef_result_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_result_get (const TAO_ClientRequestInfo_IR_OperationDef_result_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_result_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_result_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_result_def_get (const TAO_ClientRequestInfo_IR_OperationDef_result_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_result_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_result_def_set (const TAO_ClientRequestInfo_IR_OperationDef_result_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_def_set &);
-    IR_IDLType_ptr result_def_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_params_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_params_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_params_get (const TAO_ClientRequestInfo_IR_OperationDef_params_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_params_get &);
-    void result (IR_ParDescriptionSeq * result);
-    // update the result 
-    IR_ParDescriptionSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_params_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_params_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_params_set (const TAO_ClientRequestInfo_IR_OperationDef_params_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_params_set &);
-    const IR_ParDescriptionSeq & params_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_mode_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_mode_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_mode_get (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
-    void result (IR_OperationMode result);
-    // update the result 
-    IR_OperationMode _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_mode_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_mode_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_OperationMode & mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_mode_set (const TAO_ClientRequestInfo_IR_OperationDef_mode_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_mode_set &);
-    const IR_OperationMode & mode_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_contexts_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_contexts_get (const TAO_ClientRequestInfo_IR_OperationDef_contexts_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_contexts_get &);
-    void result (IR_ContextIdSeq * result);
-    // update the result 
-    IR_ContextIdSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_contexts_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_contexts_set (const TAO_ClientRequestInfo_IR_OperationDef_contexts_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_contexts_set &);
-    const IR_ContextIdSeq & contexts_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_exceptions_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_get &);
-    void result (IR_ExceptionDefSeq * result);
-    // update the result 
-    IR_ExceptionDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_OperationDef_exceptions_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_OperationDef;
-  
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_set &);
-    const IR_ExceptionDefSeq & exceptions_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -16380,7 +12119,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_InterfaceDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_InterfaceDef (
       TAO_Stub *objref,
@@ -16396,424 +12135,6 @@ protected:
 private:
   IR_InterfaceDef (const IR_InterfaceDef &);
   void operator= (const IR_InterfaceDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-    
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get &);
-    void result (IR_InterfaceDefSeq * result);
-    // update the result 
-    IR_InterfaceDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set &);
-    const IR_InterfaceDefSeq & base_interfaces_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Boolean & is_abstract,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set &);
-    const CORBA::Boolean & is_abstract_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Boolean & is_local,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set &);
-    const CORBA::Boolean & is_local_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_is_a : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_is_a (const TAO_ClientRequestInfo_IR_InterfaceDef_is_a &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_a &);
-    const char * interface_id_;
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        IR_AttributeMode & mode,
-        const IR_ExceptionDefSeq & get_exceptions,
-        const IR_ExceptionDefSeq & put_exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (const TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr type_;
-    const IR_AttributeMode & mode_;
-    const IR_ExceptionDefSeq & get_exceptions_;
-    const IR_ExceptionDefSeq & put_exceptions_;
-    void result (IR_AttributeDef_ptr result);
-    // update the result 
-    IR_AttributeDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_InterfaceDef_create_operation : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_InterfaceDef;
-  
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr result,
-        IR_OperationMode & mode,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        const IR_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (const TAO_ClientRequestInfo_IR_InterfaceDef_create_operation &);
-    void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_create_operation &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr result_;
-    const IR_OperationMode & mode_;
-    const IR_ParDescriptionSeq & params_;
-    const IR_ExceptionDefSeq & exceptions_;
-    const IR_ContextIdSeq & contexts_;
-    void result (IR_OperationDef_ptr result);
-    // update the result 
-    IR_OperationDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -17504,7 +12825,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ValueMemberDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ValueMemberDef (
       TAO_Stub *objref,
@@ -17520,224 +12841,6 @@ protected:
 private:
   IR_ValueMemberDef (const IR_ValueMemberDef &);
   void operator= (const IR_ValueMemberDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ValueMemberDef_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueMemberDef;
-    
-    friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_get &);
-    void result (CORBA::TypeCode_ptr result);
-    // update the result 
-    CORBA::TypeCode_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueMemberDef;
-  
-    friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueMemberDef;
-  
-    friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set &);
-    IR_IDLType_ptr type_def_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueMemberDef_access_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueMemberDef;
-  
-    friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_get &);
-    void result (CORBA::Visibility result);
-    // update the result 
-    CORBA::Visibility _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueMemberDef_access_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueMemberDef;
-  
-    friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Visibility & access,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_set &);
-    const CORBA::Visibility & access_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -18157,7 +13260,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ValueDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ValueDef (
       TAO_Stub *objref,
@@ -18173,812 +13276,6 @@ protected:
 private:
   IR_ValueDef (const IR_ValueDef &);
   void operator= (const IR_ValueDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-    
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get &);
-    void result (IR_InterfaceDefSeq * result);
-    // update the result 
-    IR_InterfaceDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set &);
-    const IR_InterfaceDefSeq & supported_interfaces_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_initializers_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_initializers_get (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
-    void result (IR_InitializerSeq * result);
-    // update the result 
-    IR_InitializerSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_initializers_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_initializers_set (const TAO_ClientRequestInfo_IR_ValueDef_initializers_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_initializers_set &);
-    const IR_InitializerSeq & initializers_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_base_value_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_base_value_get (const TAO_ClientRequestInfo_IR_ValueDef_base_value_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_base_value_get &);
-    void result (IR_ValueDef_ptr result);
-    // update the result 
-    IR_ValueDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_base_value_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_ValueDef_ptr base_value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_base_value_set (const TAO_ClientRequestInfo_IR_ValueDef_base_value_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_base_value_set &);
-    IR_ValueDef_ptr base_value_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get &);
-    void result (IR_ValueDefSeq * result);
-    // update the result 
-    IR_ValueDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_ValueDefSeq & abstract_base_values,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set &);
-    const IR_ValueDefSeq & abstract_base_values_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Boolean & is_abstract,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set &);
-    const CORBA::Boolean & is_abstract_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_is_custom_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_is_custom_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Boolean & is_custom,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_set &);
-    const CORBA::Boolean & is_custom_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const CORBA::Boolean & is_truncatable,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set &);
-    const CORBA::Boolean & is_truncatable_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_is_a : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_is_a (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_is_a (const TAO_ClientRequestInfo_IR_ValueDef_is_a &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_a &);
-    const char * id_;
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_create_value_member : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        const CORBA::Visibility & access,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_create_value_member (const TAO_ClientRequestInfo_IR_ValueDef_create_value_member &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_create_value_member &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr type_;
-    const CORBA::Visibility & access_;
-    void result (IR_ValueMemberDef_ptr result);
-    // update the result 
-    IR_ValueMemberDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_create_attribute : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr type,
-        IR_AttributeMode & mode,
-        const IR_ExceptionDefSeq & get_exceptions,
-        const IR_ExceptionDefSeq & put_exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_create_attribute (const TAO_ClientRequestInfo_IR_ValueDef_create_attribute &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_create_attribute &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr type_;
-    const IR_AttributeMode & mode_;
-    const IR_ExceptionDefSeq & get_exceptions_;
-    const IR_ExceptionDefSeq & put_exceptions_;
-    void result (IR_AttributeDef_ptr result);
-    // update the result 
-    IR_AttributeDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueDef_create_operation : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueDef;
-  
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueDef_create_operation (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_IDLType_ptr result,
-        IR_OperationMode & mode,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        const IR_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueDef_create_operation (const TAO_ClientRequestInfo_IR_ValueDef_create_operation &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueDef_create_operation &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_IDLType_ptr result_;
-    const IR_OperationMode & mode_;
-    const IR_ParDescriptionSeq & params_;
-    const IR_ExceptionDefSeq & exceptions_;
-    const IR_ContextIdSeq & contexts_;
-    void result (IR_OperationDef_ptr result);
-    // update the result 
-    IR_OperationDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -19580,7 +13877,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ValueBoxDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ValueBoxDef (
       TAO_Stub *objref,
@@ -19596,98 +13893,6 @@ protected:
 private:
   IR_ValueBoxDef (const IR_ValueBoxDef &);
   void operator= (const IR_ValueBoxDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueBoxDef;
-    
-    friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get &);
-    void result (IR_IDLType_ptr result);
-    // update the result 
-    IR_IDLType_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ValueBoxDef;
-  
-    friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        IR_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set &);
-    IR_IDLType_ptr original_type_def_;
-  
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -19893,7 +14098,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ProvidesDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ProvidesDef (
       TAO_Stub *objref,
@@ -19909,56 +14114,6 @@ protected:
 private:
   IR_ProvidesDef (const IR_ProvidesDef &);
   void operator= (const IR_ProvidesDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ProvidesDef;
-    
-    friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
-    friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
-    void result (IR_InterfaceDef_ptr result);
-    // update the result 
-    IR_InterfaceDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -20217,7 +14372,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_UsesDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_UsesDef (
       TAO_Stub *objref,
@@ -20233,98 +14388,6 @@ protected:
 private:
   IR_UsesDef (const IR_UsesDef &);
   void operator= (const IR_UsesDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_UsesDef_interface_type_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_UsesDef;
-    
-    friend class _TAO_UsesDef_Remote_Proxy_Impl;
-    friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UsesDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
-    void result (IR_InterfaceDef_ptr result);
-    // update the result 
-    IR_InterfaceDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_UsesDef;
-  
-    friend class _TAO_UsesDef_Remote_Proxy_Impl;
-    friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UsesDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (const TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -20843,7 +14906,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_EventDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_EventDef (
       TAO_Stub *objref,
@@ -20859,100 +14922,6 @@ protected:
 private:
   IR_EventDef (const IR_EventDef &);
   void operator= (const IR_EventDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_EventDef_is_a : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_EventDef;
-    
-    friend class _TAO_EventDef_Remote_Proxy_Impl;
-    friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EventDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_EventDef_is_a (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_EventDef_is_a (const TAO_ClientRequestInfo_IR_EventDef_is_a &);
-    void operator= (const TAO_ClientRequestInfo_IR_EventDef_is_a &);
-    const char * event_id_;
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_EventDef_event_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_EventDef;
-  
-    friend class _TAO_EventDef_Remote_Proxy_Impl;
-    friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EventDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_EventDef_event_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_EventDef_event_get (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
-    void result (IR_ValueDef_ptr result);
-    // update the result 
-    IR_ValueDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -21213,7 +15182,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_EmitsDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_EmitsDef (
       TAO_Stub *objref,
@@ -21229,14 +15198,6 @@ protected:
 private:
   IR_EmitsDef (const IR_EmitsDef &);
   void operator= (const IR_EmitsDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -21399,7 +15360,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_PublishesDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_PublishesDef (
       TAO_Stub *objref,
@@ -21415,14 +15376,6 @@ protected:
 private:
   IR_PublishesDef (const IR_PublishesDef &);
   void operator= (const IR_PublishesDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -21586,7 +15539,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ConsumesDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ConsumesDef (
       TAO_Stub *objref,
@@ -21602,14 +15555,6 @@ protected:
 private:
   IR_ConsumesDef (const IR_ConsumesDef &);
   void operator= (const IR_ConsumesDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -21907,7 +15852,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_ComponentDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_ComponentDef (
       TAO_Stub *objref,
@@ -21923,644 +15868,6 @@ protected:
 private:
   IR_ComponentDef (const IR_ComponentDef &);
   void operator= (const IR_ComponentDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-    
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
-    void result (IR_InterfaceDefSeq * result);
-    // update the result 
-    IR_InterfaceDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const IR_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-    const IR_InterfaceDefSeq & supported_interfaces_;
-  
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_base_component_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
-    void result (IR_ComponentDef_ptr result);
-    // update the result 
-    IR_ComponentDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-    void result (IR_ProvidesDefSeq * result);
-    // update the result 
-    IR_ProvidesDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-    void result (IR_UsesDefSeq * result);
-    // update the result 
-    IR_UsesDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
-    void result (IR_EmitsDefSeq * result);
-    // update the result 
-    IR_EmitsDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
-    void result (IR_PublishesDefSeq * result);
-    // update the result 
-    IR_PublishesDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
-    void result (IR_ConsumesDefSeq * result);
-    // update the result 
-    IR_ConsumesDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (const TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_create_provides : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_provides (const TAO_ClientRequestInfo_IR_ComponentDef_create_provides &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_provides &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_InterfaceDef_ptr interface_type_;
-    void result (IR_ProvidesDef_ptr result);
-    // update the result 
-    IR_ProvidesDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_create_uses : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_InterfaceDef_ptr interface_type,
-        const CORBA::Boolean & is_multiple,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_uses (const TAO_ClientRequestInfo_IR_ComponentDef_create_uses &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_uses &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_InterfaceDef_ptr interface_type_;
-    const CORBA::Boolean & is_multiple_;
-    void result (IR_UsesDef_ptr result);
-    // update the result 
-    IR_UsesDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_create_emits : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_emits (const TAO_ClientRequestInfo_IR_ComponentDef_create_emits &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_emits &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_ValueDef_ptr value_;
-    void result (IR_EmitsDef_ptr result);
-    // update the result 
-    IR_EmitsDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_create_publishes : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (const TAO_ClientRequestInfo_IR_ComponentDef_create_publishes &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_publishes &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_ValueDef_ptr value_;
-    void result (IR_PublishesDef_ptr result);
-    // update the result 
-    IR_PublishesDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_ComponentDef_create_consumes : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_ComponentDef;
-  
-    friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-    friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (const TAO_ClientRequestInfo_IR_ComponentDef_create_consumes &);
-    void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_consumes &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_ValueDef_ptr value_;
-    void result (IR_ConsumesDef_ptr result);
-    // update the result 
-    IR_ConsumesDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 // The Proxy Implementations are used by each interface to
@@ -23079,7 +16386,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_PrimaryKeyDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_PrimaryKeyDef (
       TAO_Stub *objref,
@@ -23095,100 +16402,6 @@ protected:
 private:
   IR_PrimaryKeyDef (const IR_PrimaryKeyDef &);
   void operator= (const IR_PrimaryKeyDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_PrimaryKeyDef;
-    
-    friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a &);
-    void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a &);
-    const char * primary_key_id_;
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_PrimaryKeyDef;
-  
-    friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-    void result (IR_ValueDef_ptr result);
-    // update the result 
-    IR_ValueDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -23449,7 +16662,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_FactoryDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_FactoryDef (
       TAO_Stub *objref,
@@ -23465,14 +16678,6 @@ protected:
 private:
   IR_FactoryDef (const IR_FactoryDef &);
   void operator= (const IR_FactoryDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -23636,7 +16841,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_FinderDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_FinderDef (
       TAO_Stub *objref,
@@ -23652,14 +16857,6 @@ protected:
 private:
   IR_FinderDef (const IR_FinderDef &);
   void operator= (const IR_FinderDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -23909,7 +17106,7 @@ protected:
 protected:
   // This methods travese the inheritance tree and set the
   // parents piece of the given class in the right mode
-  virtual void IR_HomeDef_setup_collocation (int collocated);
+  virtual void _tao_setup_collocation (int collocated);
 
   IR_HomeDef (
       TAO_Stub *objref,
@@ -23925,420 +17122,6 @@ protected:
 private:
   IR_HomeDef (const IR_HomeDef &);
   void operator= (const IR_HomeDef &);
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  // Generation of interceptors related RequestInfo classes per operation.
-  // This needed to be able to store the arguments, exceptions, contexts
-  // and build the lists dynamically on demand so that unnecessary time overhead
-  // of building these lists when they arent used is avoided.
-  class TAO_ClientRequestInfo_IR_HomeDef_base_home_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-    
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-  
-    TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_base_home_get (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
-    void result (IR_HomeDef_ptr result);
-    // update the result 
-    IR_HomeDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_managed_component_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
-    void result (IR_ComponentDef_ptr result);
-    // update the result 
-    IR_ComponentDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_primary_key_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
-    void result (IR_PrimaryKeyDef_ptr result);
-    // update the result 
-    IR_PrimaryKeyDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_factories_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_factories_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_factories_get (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
-    void result (IR_FactoryDefSeq * result);
-    // update the result 
-    IR_FactoryDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_finders_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_finders_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_finders_get (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
-    void result (IR_FinderDefSeq * result);
-    // update the result 
-    IR_FinderDefSeq * _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_is_basic_get : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (const TAO_ClientRequestInfo_IR_HomeDef_is_basic_get &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_is_basic_get &);
-    void result (CORBA::Boolean result);
-    // update the result 
-    CORBA::Boolean _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_create_primary_key : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        IR_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (const TAO_ClientRequestInfo_IR_HomeDef_create_primary_key &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_primary_key &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    IR_ValueDef_ptr primary_key_;
-    void result (IR_PrimaryKeyDef_ptr result);
-    // update the result 
-    IR_PrimaryKeyDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_create_factory : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_create_factory (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_create_factory (const TAO_ClientRequestInfo_IR_HomeDef_create_factory &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_factory &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    const IR_ParDescriptionSeq & params_;
-    const IR_ExceptionDefSeq & exceptions_;
-    void result (IR_FactoryDef_ptr result);
-    // update the result 
-    IR_FactoryDef_ptr _result;
-  };
-
-  class TAO_ClientRequestInfo_IR_HomeDef_create_finder : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class IR_HomeDef;
-  
-    friend class _TAO_HomeDef_Remote_Proxy_Impl;
-    friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_HomeDef_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_IR_HomeDef_create_finder (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        const char * id,
-        const char * name,
-        const char * version,
-        const IR_ParDescriptionSeq & params,
-        const IR_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_IR_HomeDef_create_finder (const TAO_ClientRequestInfo_IR_HomeDef_create_finder &);
-    void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_finder &);
-    const char * id_;
-    const char * name_;
-    const char * version_;
-    const IR_ParDescriptionSeq & params_;
-    const IR_ExceptionDefSeq & exceptions_;
-    void result (IR_FinderDef_ptr result);
-    // update the result 
-    IR_FinderDef_ptr _result;
-  };
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -24693,165 +17476,17 @@ private:
   void operator= (const IR_HomeDescription_var &);
 };
 
-// Proxy Broker Factory function pointer declarations.
-
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_DefinitionKind);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_DefinitionKind &);
 extern TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
-
-extern TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-extern TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_DefinitionKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_DefinitionKind &);
 // Any operators for interface CORBA_IRObject
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
+extern TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_Contained
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Contained_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Contained *&);
@@ -24935,6 +17570,10 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_EnumMemberSeq &);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EnumMemberSeq*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumMemberSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EnumMemberSeq *&);
+extern TAO_IFR_Client_Export _TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
+// Any operators for interface IR_Container
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Container_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container *&);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_Container::Description &); // copying version
@@ -24945,17 +17584,29 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_Container::Descri
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Container::DescriptionSeq*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container::DescriptionSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Container::DescriptionSeq *&);
+extern TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_IDLType
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_IDLType_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_IDLType *&);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimitiveKind);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveKind &);
+extern TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_Repository
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Repository_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Repository *&);
+extern TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ComponentRepository
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentRepository_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentRepository *&);
+extern TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ModuleDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ModuleDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDef *&);
@@ -24963,6 +17614,9 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ModuleDescription
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ModuleDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ModuleDescription *&);
+extern TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ConstantDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConstantDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDef *&);
@@ -24970,6 +17624,9 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ConstantDescripti
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConstantDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ConstantDescription *&);
+extern TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_TypedefDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_TypedefDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypedefDef *&);
@@ -24977,39 +17634,75 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_TypeDescription &
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_TypeDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypeDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_TypeDescription *&);
+extern TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_StructDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StructDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructDef *&);
+extern TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_UnionDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UnionDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionDef *&);
+extern TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_EnumDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EnumDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumDef *&);
+extern TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_AliasDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AliasDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AliasDef *&);
+extern TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_NativeDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_NativeDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_NativeDef *&);
+extern TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_PrimitiveDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimitiveDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveDef *&);
+extern TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_StringDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StringDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StringDef *&);
+extern TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_WstringDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_WstringDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_WstringDef *&);
+extern TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_FixedDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FixedDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FixedDef *&);
+extern TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_SequenceDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_SequenceDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_SequenceDef *&);
+extern TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ArrayDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ArrayDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ArrayDef *&);
+extern TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ExceptionDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ExceptionDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDef *&);
@@ -25027,6 +17720,9 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExcDesc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExcDescriptionSeq *&);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttributeMode);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeMode &);
+extern TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_AttributeDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttributeDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeDef *&);
@@ -25050,6 +17746,9 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ContextIdSeq &);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ContextIdSeq*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ContextIdSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ContextIdSeq *&);
+extern TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_OperationDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_OperationDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationDef *&);
@@ -25069,6 +17768,9 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_AttrDescriptionSe
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttrDescriptionSeq*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttrDescriptionSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttrDescriptionSeq *&);
+extern TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_InterfaceDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_InterfaceDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDef *&);
@@ -25084,9 +17786,15 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ValueMemberSeq &)
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueMemberSeq*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueMemberSeq *&);
+extern TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ValueMemberDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueMemberDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberDef *&);
+extern TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ValueDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDef *&);
@@ -25094,9 +17802,15 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ValueDescription
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueDescription *&);
+extern TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ValueBoxDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueBoxDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueBoxDef *&);
+extern TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ProvidesDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDef *&);
@@ -25104,6 +17818,9 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ProvidesDescripti
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDescription *&);
+extern TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_UsesDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDef *&);
@@ -25119,6 +17836,9 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_UsesDescSeq &); /
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDescSeq*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDescSeq *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDescSeq *&);
+extern TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_EventDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EventDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDef *&);
@@ -25126,15 +17846,27 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_EventDescription
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EventDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EventDescription *&);
+extern TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_EmitsDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EmitsDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EmitsDef *&);
+extern TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_PublishesDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PublishesDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PublishesDef *&);
+extern TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ConsumesDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConsumesDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConsumesDef *&);
+extern TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_ComponentDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDef *&);
@@ -25142,6 +17874,9 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ComponentDescript
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ComponentDescription *&);
+extern TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_PrimaryKeyDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDef *&);
@@ -25149,12 +17884,21 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_PrimaryKeyDescrip
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDescription*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDescription *&); // deprecated
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_PrimaryKeyDescription *&);
+extern TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_FactoryDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FactoryDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FactoryDef *&);
+extern TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_FinderDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FinderDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FinderDef *&);
+extern TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  );
 // Any operators for interface IR_HomeDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_HomeDef_ptr);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDef *&);
@@ -25407,15 +18151,15 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeMode &); //
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeMode &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeMode &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDef_ptr &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationMode &); //
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationMode &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationMode &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterMode &); //
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterMode &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterMode &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterDescription &);
 
diff --git a/TAO/tao/IFR_Client/InterfaceC.i b/TAO/tao/IFR_Client/InterfaceC.i
index 211172973c0..37e31e7b8f4 100644
--- a/TAO/tao/IFR_Client/InterfaceC.i
+++ b/TAO/tao/IFR_Client/InterfaceC.i
@@ -27,7 +27,7 @@ CORBA_IRObject::CORBA_IRObject (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_IRObject_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -194,7 +194,7 @@ IR_Contained::IR_Contained (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_Contained_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -361,7 +361,7 @@ IR_Repository::IR_Repository (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_Repository_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -528,7 +528,7 @@ IR_Container::IR_Container (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_Container_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -888,7 +888,7 @@ IR_ModuleDef::IR_ModuleDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ModuleDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -1055,7 +1055,7 @@ IR_ConstantDef::IR_ConstantDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ConstantDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -1222,7 +1222,7 @@ IR_IDLType::IR_IDLType (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_IDLType_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -1389,7 +1389,7 @@ IR_StructDef::IR_StructDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_StructDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -1556,7 +1556,7 @@ IR_UnionDef::IR_UnionDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_UnionDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -1723,7 +1723,7 @@ IR_EnumDef::IR_EnumDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_EnumDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -1890,7 +1890,7 @@ IR_AliasDef::IR_AliasDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_AliasDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -2057,7 +2057,7 @@ IR_InterfaceDef::IR_InterfaceDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_InterfaceDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -2224,7 +2224,7 @@ IR_ExceptionDef::IR_ExceptionDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ExceptionDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -2391,7 +2391,7 @@ IR_NativeDef::IR_NativeDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_NativeDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -2912,7 +2912,7 @@ IR_ValueDef::IR_ValueDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ValueDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -3433,7 +3433,7 @@ IR_ValueBoxDef::IR_ValueBoxDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ValueBoxDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -3600,7 +3600,7 @@ IR_ComponentDef::IR_ComponentDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ComponentDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -4121,7 +4121,7 @@ IR_ProvidesDef::IR_ProvidesDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ProvidesDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -4642,7 +4642,7 @@ IR_UsesDef::IR_UsesDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_UsesDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -5163,7 +5163,7 @@ IR_HomeDef::IR_HomeDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_HomeDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -5684,7 +5684,7 @@ IR_EventDef::IR_EventDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_EventDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -5851,7 +5851,7 @@ IR_EmitsDef::IR_EmitsDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_EmitsDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -6372,7 +6372,7 @@ IR_PublishesDef::IR_PublishesDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_PublishesDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -6893,7 +6893,7 @@ IR_ConsumesDef::IR_ConsumesDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ConsumesDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -7414,7 +7414,7 @@ IR_FactoryDef::IR_FactoryDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_FactoryDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -7935,7 +7935,7 @@ IR_FinderDef::IR_FinderDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_FinderDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -8456,7 +8456,7 @@ IR_PrimaryKeyDef::IR_PrimaryKeyDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_PrimaryKeyDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -11479,7 +11479,7 @@ IR_PrimitiveDef::IR_PrimitiveDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_PrimitiveDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -11646,7 +11646,7 @@ IR_StringDef::IR_StringDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_StringDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -11813,7 +11813,7 @@ IR_SequenceDef::IR_SequenceDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_SequenceDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -11980,7 +11980,7 @@ IR_ArrayDef::IR_ArrayDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ArrayDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -12147,7 +12147,7 @@ IR_WstringDef::IR_WstringDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_WstringDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -12314,7 +12314,7 @@ IR_FixedDef::IR_FixedDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_FixedDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -12481,7 +12481,7 @@ IR_ComponentRepository::IR_ComponentRepository (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ComponentRepository_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -13034,7 +13034,7 @@ IR_TypedefDef::IR_TypedefDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_TypedefDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -14322,7 +14322,7 @@ IR_AttributeDef::IR_AttributeDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_AttributeDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -15461,7 +15461,7 @@ IR_OperationDef::IR_OperationDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_OperationDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
@@ -17555,7 +17555,7 @@ IR_ValueMemberDef::IR_ValueMemberDef (
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->IR_ValueMemberDef_setup_collocation (_tao_collocated);
+  this->_tao_setup_collocation (_tao_collocated);
 }
 
 // *************************************************************
diff --git a/TAO/tao/IFR_Client/Makefile b/TAO/tao/IFR_Client/Makefile
index 280d202b245..4e56d9e3710 100644
--- a/TAO/tao/IFR_Client/Makefile
+++ b/TAO/tao/IFR_Client/Makefile
@@ -184,35 +184,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/Invocation.h \
+ InterfaceC.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -220,6 +196,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
  $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
@@ -232,6 +213,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -244,6 +227,20 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -290,8 +287,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -302,6 +314,7 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
@@ -322,10 +335,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- InterfaceC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/RequestInfo_Util.h
 
 .obj/IFR_Client_Adapter_Impl.o .obj/IFR_Client_Adapter_Impl.so .shobj/IFR_Client_Adapter_Impl.o .shobj/IFR_Client_Adapter_Impl.so: IFR_Client_Adapter_Impl.cpp \
@@ -485,62 +494,48 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
+ InterfaceC.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -572,8 +567,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -582,29 +592,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- InterfaceC.i
+ $(TAO_ROOT)/tao/ORB_Core.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 4bad2d06b83..761772eeb3a 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -281,11 +281,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
 
   ACE_INET_Addr addr;
 
-  const char *port_separator_loc = ACE_OS::strchr (address, ':');
-  const char *specified_hostname = 0;
-  char tmp_host[MAXHOSTNAMELEN + 1];
-
-  if (port_separator_loc == address)
+  if (ACE_OS::strchr (address, ':') == address)
     {
       // The address is a port number or port name.  No hostname was
       // specified.  The hostname for each network interface and the
@@ -307,28 +303,17 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
       else
         return this->open_i (addr);
     }
-  else if (port_separator_loc == 0)
+  else if (ACE_OS::strchr (address, ':') == 0)
     {
       // The address is a hostname.  No port was specified, so assume
       // port zero (port will be chosen for us).
       if (addr.set ((unsigned short) 0, address) != 0)
         return -1;
-
-      specified_hostname = address;
     }
-  else
-    {
-      // Host and port were specified.
-      if (addr.set (address) != 0)
-        return -1;
-
-      // Extract out just the host part of the address.
-      size_t len = port_separator_loc - address;
-      ACE_OS::memcpy (tmp_host, address, len);
-      tmp_host[len] = '\0';
+  else if (addr.set (address) != 0)
+    // Host and port were specified.
+    return -1;
 
-      specified_hostname = tmp_host;
-    }
 
   this->endpoint_count_ = 1;  // Only one hostname to store
 
@@ -342,8 +327,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
 
   if (this->hostname (orb_core,
                       addr,
-                      this->hosts_[0],
-                      specified_hostname) != 0)
+                      this->hosts_[0]) != 0)
     return -1;
 
   // Copy the addr.  The port is (re)set in
@@ -475,58 +459,30 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr)
 int
 TAO_IIOP_Acceptor::hostname (TAO_ORB_Core *orb_core,
                              ACE_INET_Addr &addr,
-                             char *&host,
-                             const char *specified_hostname)
+                             char *&host)
 {
-  if (orb_core->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      // If dotted decimal addresses are enabled,
-      // just return ours.
-      return this->dotted_decimal_address (addr, host);
-    }
-  else
-  if (specified_hostname != 0)
-    {
-      // If the user specified a hostname, pass it back
-      // blindly as it overrides our choice of hostname.
-      host = CORBA::string_dup (specified_hostname);
-    }
-  else
-    {
-      char tmp_host[MAXHOSTNAMELEN + 1];
+  char tmp_host[MAXHOSTNAMELEN + 1];
 
-      // Get the hostname associated with our address
-      if (addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
-        {
-          // On failure, just return the decimal address.
-          return this->dotted_decimal_address (addr, host);
-        }
-      else
+  if (orb_core->orb_params ()->use_dotted_decimal_addresses ()
+      || addr.get_host_name (tmp_host, sizeof (tmp_host)) != 0)
+    {
+      const char *tmp = addr.get_host_addr ();
+      if (tmp == 0)
         {
-          host = CORBA::string_dup (tmp_host);
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ACE_TEXT ("\n\nTAO (%P|%t) ")
+                        ACE_TEXT ("IIOP_Acceptor::hostname ")
+                        ACE_TEXT ("- %p\n\n"),
+                        ACE_TEXT ("cannot determine hostname")));
+          return -1;
         }
-    }
-
-  return 0;
-}
 
-int
-TAO_IIOP_Acceptor::dotted_decimal_address (ACE_INET_Addr &addr,
-                                           char *&host)
-{
-  const char *tmp = addr.get_host_addr ();
-  if (tmp == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("\n\nTAO (%P|%t) ")
-                    ACE_TEXT ("IIOP_Acceptor::dotted_decimal_address ")
-                    ACE_TEXT ("- %p\n\n"),
-                    ACE_TEXT ("cannot determine hostname")));
-      return -1;
+      host = CORBA::string_dup (tmp);
     }
+  else
+    host = CORBA::string_dup (tmp_host);
 
-  host = CORBA::string_dup (tmp);
   return 0;
 }
 
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 59cb0d06d29..19185fb0e58 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -62,10 +62,8 @@ public:
   typedef TAO_Concurrency_Strategy<TAO_IIOP_Connection_Handler> TAO_IIOP_CONCURRENCY_STRATEGY;
   typedef TAO_Accept_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_ACCEPTOR> TAO_IIOP_ACCEPT_STRATEGY;
 
-  /**
-   * The TAO_Acceptor methods, check the documentation in
-   * Pluggable.h for details.
-   */
+  // = The TAO_Acceptor methods, check the documentation in
+  //   Pluggable.h for details.
   virtual int open (TAO_ORB_Core *orb_core,
                     int version_major,
                     int version_minor,
@@ -84,25 +82,10 @@ public:
   virtual int object_key (IOP::TaggedProfile &profile,
                           TAO_ObjectKey &key);
 
-  /**
-   * Set the host name for the given addr.
-   * A hostname may be forced by using specified_hostname.  This
-   * is useful if the given address corresponds to more than one
-   * hostname and the desired one cannot be determined in any
-   * other way.
-   */
+  /// Set the host name for the given addr.
   int hostname (TAO_ORB_Core *orb_core,
                 ACE_INET_Addr &addr,
-                char *&host,
-                const char *specified_hostname = 0);
-
-  /**
-   * Set the host name for the given address using the dotted decimal
-   * format.
-   */
-  int dotted_decimal_address (ACE_INET_Addr &addr,
-                              char *&host);
-
+                char *&host);
 protected:
 
   /**
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index cda23b18fe7..d546636ba27 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -53,20 +53,8 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core
 
 TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void)
 {
-  // If the socket has not already been closed.
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      // Cannot deal with errors, and therefore they are ignored.
-      this->transport_.send_buffered_messages ();
-    }
-  else
-    {
-      // Dequeue messages and delete message blocks.
-      this->transport_.dequeue_all ();
-    }
 }
 
-
 int
 TAO_IIOP_Connection_Handler::open (void*)
 {
@@ -193,22 +181,8 @@ TAO_IIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
       // passed to the reactor on ORB destruction.
       this->is_registered (0);
 
-      // Close the handle..
-      if (this->get_handle () != ACE_INVALID_HANDLE)
-        {
-          // Send the buffered messages first
-          this->transport_.send_buffered_messages ();
-
-          this->peer ().close ();
-
-          // Purge the entry too
-          this->mark_invalid ();
-        }
-
       // Decrement the reference count
       this->decr_ref_count ();
-
-
     }
 
   return 0;
@@ -220,27 +194,22 @@ TAO_IIOP_Connection_Handler::fetch_handle (void)
   return this->get_handle ();
 }
 
-
 int
 TAO_IIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
                                              const void *)
 {
-  // This method is called when buffering timer expires.
-  //
-  ACE_Time_Value *max_wait_time = 0;
-
-  TAO_Stub *stub = 0;
-  int has_timeout;
-  this->orb_core ()->call_timeout_hook (stub,
-                                        has_timeout,
-                                        *max_wait_time);
-
   // Cannot deal with errors, and therefore they are ignored.
-  this->transport ()->send_buffered_messages (max_wait_time);
+  if (this->transport ()->handle_output () == -1)
+    return -1;
 
   return 0;
 }
 
+int
+TAO_IIOP_Connection_Handler::handle_output (ACE_HANDLE)
+{
+  return this->transport ()->handle_output ();
+}
 
 int
 TAO_IIOP_Connection_Handler::close (u_long)
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index 57dd92fade4..58cb9e08208 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -117,6 +117,9 @@ public:
   virtual int handle_timeout (const ACE_Time_Value &tv,
                               const void *arg = 0);
 
+  /// Documented in ACE_Event_Handler
+  virtual int handle_output (ACE_HANDLE);
+
   /// Object termination hook.
   virtual int close (u_long flags = 0);
 
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 9640f3ca9cc..32d66140061 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -16,56 +16,6 @@
 
 ACE_RCSID(tao, IIOP_Connector, "$Id$")
 
-
-#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_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
-template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>;
-template class ACE_Hash<ARHR<ACE_INET_Addr> >;
-template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >;
-
-template class TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
-template class ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>;
-
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*>;
-template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>;
-
-#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_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>
-#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>
-
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*>
-#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_IIOP_PROFILE),
     lite_flag_ (flag),
@@ -501,7 +451,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
   int no_delay = 0;
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
-
+  
   if (tph != 0)
     {
       const char protocol [] = "iiop";
@@ -517,7 +467,7 @@ TAO_IIOP_Connector::init_tcp_properties (void)
       if(hook_result == -1)
         return -1;
     }
-
+  
   // Extract and locally store properties of interest.
   this->tcp_properties_.send_buffer_size =
     send_buffer_size;
@@ -541,3 +491,52 @@ TAO_IIOP_Connector::init_tcp_properties (void)
 
   return 0;
 }
+
+
+#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_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
+template class ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>;
+template class ACE_Hash<ARHR<ACE_INET_Addr> >;
+template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >;
+
+template class TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>;
+template class TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>;
+template class ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>;
+template class ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>;
+
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*>;
+template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>;
+
+#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_Refcounted_Hash_Recyclable<ACE_INET_Addr>
+#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_INET_Addr>
+#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >
+
+#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_IIOP_Connection_Handler>
+#pragma instantiate TAO_Connect_Creation_Strategy<TAO_IIOP_Connection_Handler>
+#pragma instantiate ACE_Strategy_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connect_Strategy<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Connector<TAO_IIOP_Connection_Handler, ACE_SOCK_CONNECTOR>
+#pragma instantiate ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>
+
+#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_IIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*>
+#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_IIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_IIOP_Connection_Handler*>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index bbac4ef3f30..9739276221b 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -3,7 +3,6 @@
 
 
 #include "tao/IIOP_Endpoint.h"
-#include "tao/IIOP_Connection_Handler.h"
 #include "tao/debug.h"
 
 ACE_RCSID(tao, IIOP_Endpoint, "$Id$")
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index cd9905d5f46..688bddeea46 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -126,6 +126,12 @@ private:
   /// invocations, etc.
   ACE_INET_Addr object_addr_;
 
+  // TAO_IIOP_Client_Connection_Handler *hint_;
+  // Hint indicating the last successfully used connection handler for
+  // a connection established through this endpoint's acceptor.
+  // @@ This needs to be used for optimization. Will look in to this
+  // after MS defense - Bala
+
   /// IIOP Endpoints can be stringed into a list.  Return the next
   /// endpoint in the list, if any.
   TAO_IIOP_Endpoint *next_;
diff --git a/TAO/tao/IIOP_Endpoint.i b/TAO/tao/IIOP_Endpoint.i
index 0aa65b95658..f3fa7a5aa6f 100644
--- a/TAO/tao/IIOP_Endpoint.i
+++ b/TAO/tao/IIOP_Endpoint.i
@@ -50,3 +50,9 @@ TAO_IIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+/*ACE_INLINE TAO_IIOP_Client_Connection_Handler *&
+TAO_IIOP_Endpoint::hint (void)
+{
+  return this->hint_;
+}*/
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 4dbb7d44cb9..cd4df10b152 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -29,6 +29,7 @@
 
 #include "ace/Synch.h"
 
+class TAO_IIOP_Client_Connection_Handler;
 
 // TAO IIOP_Profile concrete Profile definitions
 /**
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 1bdd830d779..1f126e1b2d5 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -72,10 +72,10 @@ TAO_IIOP_Transport::event_handler (void)
 void
 TAO_IIOP_Transport::close_connection (void)
 {
-  // Call handle close
+  // First close the handle
   this->connection_handler_->handle_close ();
 
-  // Purge the entry
+  // Now, purge the entry
   this->connection_handler_->purge_entry ();
 }
 
@@ -86,14 +86,16 @@ TAO_IIOP_Transport::idle (void)
 }
 
 ssize_t
-TAO_IIOP_Transport::send (const ACE_Message_Block *message_block,
-                          const ACE_Time_Value *max_wait_time,
-                          size_t *bytes_transferred)
+TAO_IIOP_Transport::send (iovec *iov, int iovcnt,
+                          size_t &bytes_transferred,
+                          const ACE_Time_Value *max_wait_time)
 {
-  return ACE::send_n (this->handle (),
-                      message_block,
-                      max_wait_time,
-                      bytes_transferred);
+  ssize_t retval = this->service_handler ()->peer ().sendv (iov, iovcnt,
+                                                            max_wait_time);
+  if (retval > 0)
+    bytes_transferred = retval;
+
+  return retval;
 }
 
 ssize_t
@@ -197,12 +199,8 @@ TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream,
   if (this->messaging_object_->format_message (stream) != 0)
     return -1;
 
-  // Strictly speaking, should not need to loop here because the
-  // socket never gets set to a nonblocking mode ... some Linux
-  // versions seem to need it though.  Leaving it costs little.
-
   // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_or_buffer (stub,
+  ssize_t n = this->send_message_i (stub,
                                     twoway,
                                     stream.begin (),
                                     max_wait_time);
@@ -218,17 +216,6 @@ TAO_IIOP_Transport::send_message (TAO_OutputCDR &stream,
       return -1;
     }
 
-  // EOF.
-  if (n == 0)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n")
-                    ACE_TEXT ("EOF, closing conn %d\n"),
-                    this->handle()));
-      return -1;
-    }
-
   return 1;
 }
 
@@ -327,6 +314,31 @@ TAO_IIOP_Transport::tear_listen_point_list (TAO_InputCDR &cdr)
   return this->connection_handler_->process_listen_point_list (listen_list);
 }
 
+int
+TAO_IIOP_Transport::schedule_output (void)
+{
+  if (TAO_debug_level > 4)
+    {
+      ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - schedule_output\n"));
+    }
+  ACE_Reactor *r =
+    this->connection_handler_->reactor ();
+  return r->schedule_wakeup (this->connection_handler_,
+                             ACE_Event_Handler::WRITE_MASK);
+}
+
+int
+TAO_IIOP_Transport::cancel_output (void)
+{
+  if (TAO_debug_level > 4)
+    {
+      ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - cancel_output\n"));
+    }
+  ACE_Reactor *r =
+    this->connection_handler_->reactor ();
+  return r->cancel_wakeup (this->connection_handler_,
+                           ACE_Event_Handler::WRITE_MASK);
+}
 
 int
 TAO_IIOP_Transport::process_message (void)
@@ -401,18 +413,13 @@ TAO_IIOP_Transport::process_message (void)
       //    is going to take a look please contact bala@cs.wustl.edu
       //    for details on this-- Bala
 
-
-
       if (result == -1)
         {
-          // Something really critical happened, we will forget about
-          // every reply on this connection.
           if (TAO_debug_level > 0)
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT ("TAO (%P|%t) : IIOP_Client_Transport::")
                         ACE_TEXT ("handle_client_input - ")
                         ACE_TEXT ("dispatch reply failed\n")));
-
           this->messaging_object_->reset ();
           this->tms_->connection_closed ();
           return -1;
@@ -421,16 +428,7 @@ TAO_IIOP_Transport::process_message (void)
       if (result == 0)
         {
           this->messaging_object_->reset ();
-
-          // The reply dispatcher was no longer registered.
-          // This can happened when the request/reply
-          // times out.
-          // To throw away all registered reply handlers is
-          // not the right thing, as there might be just one
-          // old reply coming in and several valid new ones
-          // pending. If we would invoke <connection_closed>
-          // we would throw away also the valid ones.
-          //return 0;
+          return 0;
         }
 
 
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index e28be5436a8..94b8efb38a0 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -64,8 +64,12 @@ public:
   /// Return the connection service handler
   TAO_IIOP_SVC_HANDLER *service_handler (void);
 
-  ///  The TAO_Transport methods, please check the documentation in
-  ///  "tao/Pluggable.h" for more details.
+  /** @name The TAO_Transport methods
+   *
+   * Please check the documentation in "tao/Transport.h" for more
+   * details.
+   */
+  //@{
   virtual ACE_HANDLE handle (void);
 
   virtual ACE_Event_Handler *event_handler (void);
@@ -74,27 +78,19 @@ public:
 
   virtual int idle (void);
 
-  /// Write the complete Message_Block chain to the connection.
-  virtual ssize_t send (const ACE_Message_Block *mblk,
-                        const ACE_Time_Value *s = 0,
-                        size_t *bytes_transferred = 0);
+  virtual ssize_t send (iovec *iov, int iovcnt,
+                        size_t &bytes_transferred,
+                        const ACE_Time_Value *timeout = 0);
 
-
-  /// Read len bytes from into buf.
   virtual ssize_t recv (char *buf,
                         size_t len,
                         const ACE_Time_Value *s = 0);
 
-  /// Read and process the message from the connection. The processing
-  /// of the message is done by delegating the work to the underlying
-  /// messaging object
   virtual int read_process_message (ACE_Time_Value *max_time_value = 0,
                                     int block =0);
 
   virtual int register_handler (void);
 
-  /// @@TODO: These methods IMHO should have more meaningful
-  /// names. The names seem to indicate nothing.
   virtual int send_request (TAO_Stub *stub,
                             TAO_ORB_Core *orb_core,
                             TAO_OutputCDR &stream,
@@ -125,13 +121,15 @@ public:
                        TAO_Target_Specification &spec,
                        TAO_OutputCDR &msg);
 
-  /// Initialising the messaging object
   virtual int messaging_init (CORBA::Octet major,
                               CORBA::Octet minor);
 
-  /// Open the service context list and process it.
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
+  virtual int schedule_output (void);
+  virtual int cancel_output (void);
+  //@}
+
 private:
 
   /// Process the message that we have read
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index 80f5182eb64..0a6077b5f8a 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -8,7 +8,6 @@
 //   is:
 //
 //     tao_idl
-//          -Ge 1
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_include="tao/TAO_Export.h"
 //          -Wb,pre_include="ace/pre.h"
@@ -19,8 +18,6 @@
 #ifndef TAO_IOP_PIDL
 #define TAO_IOP_PIDL
 
-#include "orb.idl"
-
 #pragma prefix "omg.org"
 
 module IOP
@@ -46,10 +43,9 @@ module IOP
   };
   typedef sequence<TaggedComponent> MultipleComponentProfile;
   typedef sequence<TaggedComponent> TaggedComponentList;
-  typedef sequence<TaggedComponent> TaggedComponentSeq;
 
   // @@ All security related tags are located in the Security Service
-  // @@ related IDL files, in accordance with the Security Service 1.8
+  // @@ related IDL files, in accordance with the Security Service 1.7
   // @@ specification.
 
   const ComponentId TAG_ORB_TYPE = 0;
@@ -82,10 +78,12 @@ module IOP
   // const ServiceId FORWARDED_IDENTITY = 8;
   const ServiceId UnknownExceptionInfo = 9;
 
-  // The following are defined in CORBA v2.4.2 Chapter 24 (February, 2001):
+  // The following are defined in the ptc/99-05-03:
+  // Real-Time CORBA Joint Revised Submission May 28, 1999
   const ServiceId RTCorbaPriority = 10;
   const ServiceId RTCorbaPriorityRange = 11;
 
+
   // The following are defined in the ptc/2000-04-04:
   // Fault Tolerant CORBA Specification, V1.0
   const ComponentId TAG_FT_GROUP = 27;
@@ -94,32 +92,6 @@ module IOP
   const ServiceId FT_GROUP_VERSION = 12;
   const ServiceId FT_REQUEST = 13;
 
-  local interface Codec {
-    exception InvalidTypeForEncoding {};
-    exception FormatMismatch {};
-    exception TypeMismatch {};
-
-    CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding);
-    any decode (in CORBA::OctetSeq data) raises (FormatMismatch);
-    CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding);
-    any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc)
-      raises (FormatMismatch, TypeMismatch);
-  };
-
-  typedef short EncodingFormat;
-  const EncodingFormat ENCODING_CDR_ENCAPS = 0;
-
-  struct Encoding {
-    EncodingFormat format;
-    octet major_version;
-    octet minor_version;
-  };
-
-  local interface CodecFactory {
-    exception UnknownEncoding {};
-
-    Codec create_codec (in Encoding enc) raises (UnknownEncoding);
-  };
 };
 
 #pragma prefix ""
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 90f2f55f550..ce7089e44d5 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+//       http://www.cs.wustl.edu/~schmidt/doc-group.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -21,15 +21,12 @@
 
 #include "IOPC.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
 #if !defined (__ACE_INLINE__)
 #include "IOPC.i"
 #endif /* !defined INLINE */
 
-#include "Typecode.h"
+#include "tao/Any.h"
+#include "tao/Typecode.h"
 
 static const CORBA::Long _oc_IOP_ProfileId[] =
 {
@@ -650,142 +647,6 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentList, &_tc_TAO_tc_IOP_TaggedComponentList)
 TAO_NAMESPACE_END
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_
-
-  void
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    IOP::TaggedComponent* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-    
-    _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
-#define _IOP_TAGGEDCOMPONENTSEQ_CS_
-
-// *************************************************************
-// IOP::TaggedComponentSeq
-// *************************************************************
-
-IOP::TaggedComponentSeq::TaggedComponentSeq (void)
-{}
-IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-IOP::TaggedComponentSeq::TaggedComponentSeq (const TaggedComponentSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-IOP::TaggedComponentSeq::~TaggedComponentSeq (void) // dtor
-{}
-void IOP::TaggedComponentSeq::_tao_any_destructor (void *x)
-{
-  TaggedComponentSeq *tmp = ACE_static_cast (TaggedComponentSeq*,x);
-  delete tmp;
-}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
-  19, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7453), ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
-  CORBA::tk_sequence, // typecode kind
-  200, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    184, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-      2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
-      CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
-        CORBA::tk_ulong,
-
-
-      15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
-      CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
-
-        0U,
-
-
-    0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (CORBA::tk_alias, sizeof (_oc_IOP_TaggedComponentSeq), (char *) &_oc_IOP_TaggedComponentSeq, 0, sizeof (IOP::TaggedComponentSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentSeq, &_tc_TAO_tc_IOP_TaggedComponentSeq)
-TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0U)
@@ -1122,466 +983,6 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U)
 TAO_NAMESPACE_END
-
-// default constructor
-IOP::Codec::Codec ()
-{
-  }
-
-// destructor
-IOP::Codec::~Codec (void)
-{}
-
-IOP::Codec_ptr IOP::Codec::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return Codec::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-IOP::Codec_ptr IOP::Codec::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Codec::_nil ();
-  return
-      ACE_reinterpret_cast
-        (
-          Codec_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &Codec::_narrow
-                  )
-              )
-        );
-}
-
-IOP::Codec_ptr
-IOP::Codec::_duplicate (Codec_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
-  return obj;
-}
-
-void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::IOP, Codec)::_narrow))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
-  return retv;
-}
-
-const char* IOP::Codec::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/IOP/Codec:1.0";
-}
-
-// Default constructor.
-IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0")
-{
-}
-
-// Destructor - all members are of self managing types.
-IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void)
-{
-}
-
-// Copy constructor.
-IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
-{
-}
-
-// Assignment operator.
-IOP::Codec::InvalidTypeForEncoding&
-IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// Narrow.
-IOP::Codec::InvalidTypeForEncoding *
-IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", exc->_id ()))
-    {
-      return ACE_dynamic_cast (InvalidTypeForEncoding *, exc);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-void IOP::Codec::InvalidTypeForEncoding::_raise ()
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::Codec::InvalidTypeForEncoding::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the _alloc method.
-CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::Codec::InvalidTypeForEncoding, 0);
-  return retval;
-}
-
-// Default constructor.
-IOP::Codec::FormatMismatch::FormatMismatch (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0")
-{
-}
-
-// Destructor - all members are of self managing types.
-IOP::Codec::FormatMismatch::~FormatMismatch (void)
-{
-}
-
-// Copy constructor.
-IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
-{
-}
-
-// Assignment operator.
-IOP::Codec::FormatMismatch&
-IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// Narrow.
-IOP::Codec::FormatMismatch *
-IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", exc->_id ()))
-    {
-      return ACE_dynamic_cast (FormatMismatch *, exc);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-void IOP::Codec::FormatMismatch::_raise ()
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::Codec::FormatMismatch::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::Codec::FormatMismatch::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the _alloc method.
-CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::Codec::FormatMismatch, 0);
-  return retval;
-}
-
-// Default constructor.
-IOP::Codec::TypeMismatch::TypeMismatch (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0")
-{
-}
-
-// Destructor - all members are of self managing types.
-IOP::Codec::TypeMismatch::~TypeMismatch (void)
-{
-}
-
-// Copy constructor.
-IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
-{
-}
-
-// Assignment operator.
-IOP::Codec::TypeMismatch&
-IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// Narrow.
-IOP::Codec::TypeMismatch *
-IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", exc->_id ()))
-    {
-      return ACE_dynamic_cast (TypeMismatch *, exc);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-void IOP::Codec::TypeMismatch::_raise ()
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::Codec::TypeMismatch::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::Codec::TypeMismatch::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the _alloc method.
-CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::Codec::TypeMismatch, 0);
-  return retval;
-}
-
-static const CORBA::Long _oc_IOP_EncodingFormat[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-  15, ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000),  // name = EncodingFormat
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (CORBA::tk_alias, sizeof (_oc_IOP_EncodingFormat), (char *) &_oc_IOP_EncodingFormat, 0, sizeof (IOP::EncodingFormat));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EncodingFormat, &_tc_TAO_tc_IOP_EncodingFormat)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ENCODING_CDR_ENCAPS, 0)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IOP_Encoding[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
-  9, ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x0),  // name = Encoding
-  3, // member count
-  7, ACE_NTOHL (0x666f726d), ACE_NTOHL (0x61740000),  // name = format
-  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 (0x494f502f), ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-    15, ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000),  // name = EncodingFormat
-    CORBA::tk_short,
-
-
-  14, ACE_NTOHL (0x6d616a6f), ACE_NTOHL (0x725f7665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000),  // name = major_version
-  CORBA::tk_octet,
-
-  14, ACE_NTOHL (0x6d696e6f), ACE_NTOHL (0x725f7665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000),  // name = minor_version
-  CORBA::tk_octet,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (CORBA::tk_struct, sizeof (_oc_IOP_Encoding), (char *) &_oc_IOP_Encoding, 0, sizeof (IOP::Encoding));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IOP)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Encoding, &_tc_TAO_tc_IOP_Encoding)
-TAO_NAMESPACE_END
-void IOP::Encoding::_tao_any_destructor (void *x)
-{
-  Encoding *tmp = ACE_static_cast (Encoding*,x);
-  delete tmp;
-}
-
-
-// default constructor
-IOP::CodecFactory::CodecFactory ()
-{
-  }
-
-// destructor
-IOP::CodecFactory::~CodecFactory (void)
-{}
-
-IOP::CodecFactory_ptr IOP::CodecFactory::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CodecFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
-
-IOP::CodecFactory_ptr IOP::CodecFactory::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CodecFactory::_nil ();
-  return
-      ACE_reinterpret_cast
-        (
-          CodecFactory_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &CodecFactory::_narrow
-                  )
-              )
-        );
-}
-
-IOP::CodecFactory_ptr
-IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
-  return obj;
-}
-
-void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::IOP, CodecFactory)::_narrow))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-    
-  if (retv)
-    this->_add_ref ();
-  return retv;
-}
-
-const char* IOP::CodecFactory::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/IOP/CodecFactory:1.0";
-}
-
-// Default constructor.
-IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
-  : CORBA_UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0")
-{
-}
-
-// Destructor - all members are of self managing types.
-IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void)
-{
-}
-
-// Copy constructor.
-IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
-  : CORBA_UserException (_tao_excp._id ())
-{
-}
-
-// Assignment operator.
-IOP::CodecFactory::UnknownEncoding&
-IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp)
-{
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// Narrow.
-IOP::CodecFactory::UnknownEncoding *
-IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", exc->_id ()))
-    {
-      return ACE_dynamic_cast (UnknownEncoding *, exc);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-void IOP::CodecFactory::UnknownEncoding::_raise ()
-{
-  TAO_RAISE (*this);
-}
-
-void IOP::CodecFactory::UnknownEncoding::_tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void IOP::CodecFactory::UnknownEncoding::_tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the _alloc method.
-CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::IOP::CodecFactory::UnknownEncoding, 0);
-  return retval;
-}
-
 void operator<<= (CORBA::Any &_tao_any, const IOP::TaggedProfile &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
@@ -2003,95 +1404,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   return 0;
 }
 
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponentSeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        IOP::_tc_TaggedComponentSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::TaggedComponentSeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_TaggedComponentSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::TaggedComponentSeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponentSeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const IOP::TaggedComponentSeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedComponentSeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (IOP::_tc_TaggedComponentSeq, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::TaggedComponentSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::TaggedComponentSeq *tmp;
-      ACE_NEW_RETURN (tmp, IOP::TaggedComponentSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_TaggedComponentSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::TaggedComponentSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 void operator<<= (CORBA::Any &_tao_any, const IOP::ServiceContext &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
@@ -2262,101 +1574,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<IOP::Codec,IOP::Codec_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<IOP::Codec,IOP::Codec_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const IOP::Encoding &_tao_elem) // copying
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_Encoding,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-void operator<<= (CORBA::Any &_tao_any, IOP::Encoding *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      IOP::_tc_Encoding,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      IOP::Encoding::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::Encoding *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(const IOP::Encoding*&,_tao_elem);
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (IOP::_tc_Encoding, ACE_TRY_ENV)) // not equal
-      {
-        return 0;
-      }
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const IOP::Encoding*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      IOP::Encoding *tmp;
-      ACE_NEW_RETURN (tmp, IOP::Encoding, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            IOP::_tc_Encoding,
-            1,
-            ACE_static_cast (void *, tmp),
-            IOP::Encoding::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<IOP::CodecFactory,IOP::CodecFactory_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 
 #if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_CPP_
@@ -2627,48 +1844,6 @@ CORBA::Boolean operator>> (
   return 0; // error
 }
 
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const IOP::TaggedComponentSeq &_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,
-    IOP::TaggedComponentSeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
-  {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // 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
-}
-
 
 #if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_
 #define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_CPP_
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index b9a4cfbdbef..c7d6b1edf6d 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+//       http://www.cs.wustl.edu/~schmidt/doc-group.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -23,18 +23,14 @@
 #define _TAO_IDL_IOPC_H_
 
 #include "ace/pre.h"
-
-#include "TAO_Export.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Any.h"
-#include "Object.h"
-#include "Exception.h"
-#include "CDR.h"
-#include "Sequence.h"
+#include "tao/CDR.h"
+#include "tao/Sequence.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -55,10 +51,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 TAO_NAMESPACE  IOP
 {
   typedef CORBA::ULong ProfileId;
@@ -107,7 +99,7 @@ TAO_NAMESPACE  IOP
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::Octet *buffer, 
-        CORBA::Boolean release = 0
+        CORBA::Boolean release=0
       );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
       ~_tao_seq_Octet (void);
@@ -157,9 +149,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_Octet &();
       operator _tao_seq_Octet &() const;
       
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      const CORBA::Octet & operator[] (CORBA::ULong index) const;
-      
+      CORBA::Octet &operator[] (CORBA::ULong index);
       // in, inout, out, _retn 
       const _tao_seq_Octet &in (void) const;
       _tao_seq_Octet &inout (void);
@@ -189,7 +179,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_Octet *&();
       _tao_seq_Octet *&ptr (void);
       _tao_seq_Octet *operator-> (void);
-      CORBA::Octet & operator[] (CORBA::ULong index);
+      CORBA::Octet &operator[] (CORBA::ULong index);
       
     private:
       _tao_seq_Octet *&ptr_;
@@ -336,7 +326,7 @@ TAO_NAMESPACE  IOP
         CORBA::ULong max, 
         CORBA::ULong length, 
         ACE_NESTED_CLASS (IOP, TaggedProfile) *buffer, 
-        CORBA::Boolean release = 0
+        CORBA::Boolean release=0
       );
       _tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &); // copy ctor
       ~_tao_seq_TaggedProfile (void);
@@ -376,9 +366,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_TaggedProfile &() const;
       operator _tao_seq_TaggedProfile *&(); // variable-size base types only
       
-      ACE_NESTED_CLASS (IOP, TaggedProfile) & operator[] (CORBA::ULong index);
-      const ACE_NESTED_CLASS (IOP, TaggedProfile) & operator[] (CORBA::ULong index) const;
-      
+      ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong index);
       // in, inout, out, _retn 
       const _tao_seq_TaggedProfile &in (void) const;
       _tao_seq_TaggedProfile &inout (void);
@@ -408,7 +396,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_TaggedProfile *&();
       _tao_seq_TaggedProfile *&ptr (void);
       _tao_seq_TaggedProfile *operator-> (void);
-      ACE_NESTED_CLASS (IOP, TaggedProfile) & operator[] (CORBA::ULong index);
+      ACE_NESTED_CLASS (IOP, TaggedProfile) &operator[] (CORBA::ULong index);
       
     private:
       _tao_seq_TaggedProfile *&ptr_;
@@ -517,7 +505,7 @@ TAO_NAMESPACE  IOP
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::Octet *buffer, 
-        CORBA::Boolean release = 0
+        CORBA::Boolean release=0
       );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
       ~_tao_seq_Octet (void);
@@ -567,9 +555,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_Octet &();
       operator _tao_seq_Octet &() const;
       
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      const CORBA::Octet & operator[] (CORBA::ULong index) const;
-      
+      CORBA::Octet &operator[] (CORBA::ULong index);
       // in, inout, out, _retn 
       const _tao_seq_Octet &in (void) const;
       _tao_seq_Octet &inout (void);
@@ -599,7 +585,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_Octet *&();
       _tao_seq_Octet *&ptr (void);
       _tao_seq_Octet *operator-> (void);
-      CORBA::Octet & operator[] (CORBA::ULong index);
+      CORBA::Octet &operator[] (CORBA::ULong index);
       
     private:
       _tao_seq_Octet *&ptr_;
@@ -733,7 +719,7 @@ TAO_NAMESPACE  IOP
       CORBA::ULong max, 
       CORBA::ULong length, 
       TaggedComponent *buffer, 
-      CORBA::Boolean release = 0
+      CORBA::Boolean release=0
     );
     MultipleComponentProfile (const MultipleComponentProfile &); // copy ctor
     ~MultipleComponentProfile (void);
@@ -773,9 +759,7 @@ TAO_NAMESPACE  IOP
     operator MultipleComponentProfile &() const;
     operator MultipleComponentProfile *&(); // variable-size base types only
     
-    TaggedComponent & operator[] (CORBA::ULong index);
-    const TaggedComponent & operator[] (CORBA::ULong index) const;
-    
+    TaggedComponent &operator[] (CORBA::ULong index);
     // in, inout, out, _retn 
     const MultipleComponentProfile &in (void) const;
     MultipleComponentProfile &inout (void);
@@ -805,7 +789,7 @@ TAO_NAMESPACE  IOP
     operator MultipleComponentProfile *&();
     MultipleComponentProfile *&ptr (void);
     MultipleComponentProfile *operator-> (void);
-    TaggedComponent & operator[] (CORBA::ULong index);
+    TaggedComponent &operator[] (CORBA::ULong index);
     
   private:
     MultipleComponentProfile *&ptr_;
@@ -885,7 +869,7 @@ TAO_NAMESPACE  IOP
       CORBA::ULong max, 
       CORBA::ULong length, 
       TaggedComponent *buffer, 
-      CORBA::Boolean release = 0
+      CORBA::Boolean release=0
     );
     TaggedComponentList (const TaggedComponentList &); // copy ctor
     ~TaggedComponentList (void);
@@ -925,9 +909,7 @@ TAO_NAMESPACE  IOP
     operator TaggedComponentList &() const;
     operator TaggedComponentList *&(); // variable-size base types only
     
-    TaggedComponent & operator[] (CORBA::ULong index);
-    const TaggedComponent & operator[] (CORBA::ULong index) const;
-    
+    TaggedComponent &operator[] (CORBA::ULong index);
     // in, inout, out, _retn 
     const TaggedComponentList &in (void) const;
     TaggedComponentList &inout (void);
@@ -957,7 +939,7 @@ TAO_NAMESPACE  IOP
     operator TaggedComponentList *&();
     TaggedComponentList *&ptr (void);
     TaggedComponentList *operator-> (void);
-    TaggedComponent & operator[] (CORBA::ULong index);
+    TaggedComponent &operator[] (CORBA::ULong index);
     
   private:
     TaggedComponentList *&ptr_;
@@ -970,158 +952,6 @@ TAO_NAMESPACE  IOP
 
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponentList;
 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CH_
-
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); // Default constructor.
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum); 
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum,
-        CORBA::ULong length,
-        TaggedComponent *data,
-        CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs);
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs);
-      virtual ~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void); // Dtor.
-      // = Accessors.
-      TaggedComponent &operator[] (CORBA::ULong i);
-      const TaggedComponent &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static TaggedComponent *allocbuf (CORBA::ULong size);
-      static void freebuf (TaggedComponent *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      TaggedComponent *get_buffer (CORBA::Boolean orphan = 0);
-      const TaggedComponent *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-        CORBA::ULong length,
-        TaggedComponent *data,
-        CORBA::Boolean release);
-    };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
-#define _IOP_TAGGEDCOMPONENTSEQ_CH_
-
-  class TaggedComponentSeq;
-  class TaggedComponentSeq_var;
-  
-  // *************************************************************
-  // TaggedComponentSeq
-  // *************************************************************
-  
-  class TAO_Export TaggedComponentSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    TaggedComponentSeq (void); // default ctor
-    TaggedComponentSeq (CORBA::ULong max); // uses max size
-    TaggedComponentSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      TaggedComponent *buffer, 
-      CORBA::Boolean release = 0
-    );
-    TaggedComponentSeq (const TaggedComponentSeq &); // copy ctor
-    ~TaggedComponentSeq (void);
-    static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef TaggedComponentSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  };
-  
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ___VAR_CH_)
-#define _IOP_TAGGEDCOMPONENTSEQ___VAR_CH_
-
-  // *************************************************************
-  // class IOP::TaggedComponentSeq_var
-  // *************************************************************
-
-  class TAO_Export TaggedComponentSeq_var
-  {
-  public:
-    TaggedComponentSeq_var (void); // default constructor
-    TaggedComponentSeq_var (TaggedComponentSeq *);
-    TaggedComponentSeq_var (const TaggedComponentSeq_var &); // copy constructor
-    ~TaggedComponentSeq_var (void); // destructor
-    
-    TaggedComponentSeq_var &operator= (TaggedComponentSeq *);
-    TaggedComponentSeq_var &operator= (const TaggedComponentSeq_var &);
-    TaggedComponentSeq *operator-> (void);
-    const TaggedComponentSeq *operator-> (void) const;
-    
-    operator const TaggedComponentSeq &() const;
-    operator TaggedComponentSeq &();
-    operator TaggedComponentSeq &() const;
-    operator TaggedComponentSeq *&(); // variable-size base types only
-    
-    TaggedComponent & operator[] (CORBA::ULong index);
-    const TaggedComponent & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const TaggedComponentSeq &in (void) const;
-    TaggedComponentSeq &inout (void);
-    TaggedComponentSeq *&out (void);
-    TaggedComponentSeq *_retn (void);
-    TaggedComponentSeq *ptr (void) const;
-
-  private:
-    TaggedComponentSeq *ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ___OUT_CH_)
-#define _IOP_TAGGEDCOMPONENTSEQ___OUT_CH_
-
-  class TAO_Export TaggedComponentSeq_out
-  {
-  public:
-    TaggedComponentSeq_out (TaggedComponentSeq *&);
-    TaggedComponentSeq_out (TaggedComponentSeq_var &);
-    TaggedComponentSeq_out (const TaggedComponentSeq_out &);
-    TaggedComponentSeq_out &operator= (const TaggedComponentSeq_out &);
-    TaggedComponentSeq_out &operator= (TaggedComponentSeq *);
-    operator TaggedComponentSeq *&();
-    TaggedComponentSeq *&ptr (void);
-    TaggedComponentSeq *operator-> (void);
-    TaggedComponent & operator[] (CORBA::ULong index);
-    
-  private:
-    TaggedComponentSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const TaggedComponentSeq_var &);
-  };
-
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TaggedComponentSeq;
-
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_ORB_TYPE;
 
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_CODE_SETS;
@@ -1184,7 +1014,7 @@ TAO_NAMESPACE  IOP
         CORBA::ULong max, 
         CORBA::ULong length, 
         CORBA::Octet *buffer, 
-        CORBA::Boolean release = 0
+        CORBA::Boolean release=0
       );
       _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
       ~_tao_seq_Octet (void);
@@ -1234,9 +1064,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_Octet &();
       operator _tao_seq_Octet &() const;
       
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      const CORBA::Octet & operator[] (CORBA::ULong index) const;
-      
+      CORBA::Octet &operator[] (CORBA::ULong index);
       // in, inout, out, _retn 
       const _tao_seq_Octet &in (void) const;
       _tao_seq_Octet &inout (void);
@@ -1266,7 +1094,7 @@ TAO_NAMESPACE  IOP
       operator _tao_seq_Octet *&();
       _tao_seq_Octet *&ptr (void);
       _tao_seq_Octet *operator-> (void);
-      CORBA::Octet & operator[] (CORBA::ULong index);
+      CORBA::Octet &operator[] (CORBA::ULong index);
       
     private:
       _tao_seq_Octet *&ptr_;
@@ -1400,7 +1228,7 @@ TAO_NAMESPACE  IOP
       CORBA::ULong max, 
       CORBA::ULong length, 
       ServiceContext *buffer, 
-      CORBA::Boolean release = 0
+      CORBA::Boolean release=0
     );
     ServiceContextList (const ServiceContextList &); // copy ctor
     ~ServiceContextList (void);
@@ -1440,9 +1268,7 @@ TAO_NAMESPACE  IOP
     operator ServiceContextList &() const;
     operator ServiceContextList *&(); // variable-size base types only
     
-    ServiceContext & operator[] (CORBA::ULong index);
-    const ServiceContext & operator[] (CORBA::ULong index) const;
-    
+    ServiceContext &operator[] (CORBA::ULong index);
     // in, inout, out, _retn 
     const ServiceContextList &in (void) const;
     ServiceContextList &inout (void);
@@ -1472,7 +1298,7 @@ TAO_NAMESPACE  IOP
     operator ServiceContextList *&();
     ServiceContextList *&ptr (void);
     ServiceContextList *operator-> (void);
-    ServiceContext & operator[] (CORBA::ULong index);
+    ServiceContext &operator[] (CORBA::ULong index);
     
   private:
     ServiceContextList *&ptr_;
@@ -1518,510 +1344,9 @@ TAO_NAMESPACE  IOP
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong FT_REQUEST;
 
 
-#if !defined (_IOP_CODEC___PTR_CH_)
-#define _IOP_CODEC___PTR_CH_
-
-  class Codec;
-  typedef Codec *Codec_ptr;
-  
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODEC___VAR_CH_)
-#define _IOP_CODEC___VAR_CH_
-
-  class TAO_Export Codec_var : public TAO_Base_var
-  {
-  public:
-    Codec_var (void); // default constructor
-    Codec_var (Codec_ptr p) : ptr_ (p) {} 
-    Codec_var (const Codec_var &); // copy constructor
-    ~Codec_var (void); // destructor
-    
-    Codec_var &operator= (Codec_ptr);
-    Codec_var &operator= (const Codec_var &);
-    Codec_ptr operator-> (void) const;
-    
-    operator const Codec_ptr &() const;
-    operator Codec_ptr &();
-    // in, inout, out, _retn 
-    Codec_ptr in (void) const;
-    Codec_ptr &inout (void);
-    Codec_ptr &out (void);
-    Codec_ptr _retn (void);
-    Codec_ptr ptr (void) const;
-
-  private:
-    Codec_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Codec_var (const TAO_Base_var &rhs);
-    Codec_var &operator= (const TAO_Base_var &rhs);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODEC___OUT_CH_)
-#define _IOP_CODEC___OUT_CH_
-
-  class TAO_Export Codec_out
-  {
-  public:
-    Codec_out (Codec_ptr &);
-    Codec_out (Codec_var &);
-    Codec_out (const Codec_out &);
-    Codec_out &operator= (const Codec_out &);
-    Codec_out &operator= (const Codec_var &);
-    Codec_out &operator= (Codec_ptr);
-    operator Codec_ptr &();
-    Codec_ptr &ptr (void);
-    Codec_ptr operator-> (void);
-    
-  private:
-    Codec_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODEC_CH_)
-#define _IOP_CODEC_CH_
-
-class TAO_Export Codec : public virtual CORBA_Object
-  {
-  public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef Codec_ptr _ptr_type;
-    typedef Codec_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    // the static operations
-    static Codec_ptr _duplicate (Codec_ptr obj);
-    static Codec_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static Codec_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static Codec_ptr _nil (void)
-      {
-        return (Codec_ptr)0;
-      }
-
-
-#if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
-#define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
-
-    class TAO_Export InvalidTypeForEncoding : public CORBA::UserException
-    {
-    public:
-
-      InvalidTypeForEncoding (void);
-      // Default constructor.
-      
-      InvalidTypeForEncoding (const InvalidTypeForEncoding &);
-      // Copy constructor.
-      
-      ~InvalidTypeForEncoding (void);
-      // Destructor.
-      
-      InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-      
-      virtual void _raise (void);
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
-        );
-      
-      static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
-
-
-      // = TAO extension.
-      static CORBA::Exception *_alloc (void);
-    }; // Exception IOP::Codec::InvalidTypeForEncoding.
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
-#define _IOP_CODEC_FORMATMISMATCH_CH_
-
-    class TAO_Export FormatMismatch : public CORBA::UserException
-    {
-    public:
-
-      FormatMismatch (void);
-      // Default constructor.
-      
-      FormatMismatch (const FormatMismatch &);
-      // Copy constructor.
-      
-      ~FormatMismatch (void);
-      // Destructor.
-      
-      FormatMismatch &operator= (const FormatMismatch &);
-      
-      virtual void _raise (void);
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
-        );
-      
-      static FormatMismatch *_downcast (CORBA::Exception *);
-
-
-      // = TAO extension.
-      static CORBA::Exception *_alloc (void);
-    }; // Exception IOP::Codec::FormatMismatch.
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
-#define _IOP_CODEC_TYPEMISMATCH_CH_
-
-    class TAO_Export TypeMismatch : public CORBA::UserException
-    {
-    public:
-
-      TypeMismatch (void);
-      // Default constructor.
-      
-      TypeMismatch (const TypeMismatch &);
-      // Copy constructor.
-      
-      ~TypeMismatch (void);
-      // Destructor.
-      
-      TypeMismatch &operator= (const TypeMismatch &);
-      
-      virtual void _raise (void);
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
-        );
-      
-      static TypeMismatch *_downcast (CORBA::Exception *);
-
-
-      // = TAO extension.
-      static CORBA::Exception *_alloc (void);
-    }; // Exception IOP::Codec::TypeMismatch.
-
-
-#endif /* end #if !defined */
-
-    virtual CORBA::OctetSeq * encode (
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IOP::Codec::InvalidTypeForEncoding
-      )) = 0;
-
-    virtual CORBA::Any * decode (
-        const CORBA::OctetSeq & data,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IOP::Codec::FormatMismatch
-      )) = 0;
-
-    virtual CORBA::OctetSeq * encode_value (
-        const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IOP::Codec::InvalidTypeForEncoding
-      )) = 0;
-
-    virtual CORBA::Any * decode_value (
-        const CORBA::OctetSeq & data,
-        CORBA::TypeCode_ptr tc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IOP::Codec::FormatMismatch,
-        IOP::Codec::TypeMismatch
-      )) = 0;
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    Codec ();
-    
-    virtual ~Codec (void);
-  private:
-    Codec (const Codec &);
-    void operator= (const Codec &);
-  };
-
-
-#endif /* end #if !defined */
-
-  typedef CORBA::Short EncodingFormat;
-  typedef CORBA::Short_out EncodingFormat_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EncodingFormat;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ENCODING_CDR_ENCAPS;
-
-  struct Encoding;
-  class Encoding_var;
-  
-  struct TAO_Export Encoding
-  {
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef Encoding_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (IOP, EncodingFormat) format;
-    CORBA::Octet major_version;
-    CORBA::Octet minor_version;
-  };
-
-  class TAO_Export Encoding_var
-  {
-  public:
-    Encoding_var (void); // default constructor
-    Encoding_var (Encoding *);
-    Encoding_var (const Encoding_var &); // copy constructor
-    Encoding_var (const Encoding &); // fixed-size types only
-    ~Encoding_var (void); // destructor
-    
-    Encoding_var &operator= (Encoding *);
-    Encoding_var &operator= (const Encoding_var &);
-    Encoding_var &operator= (const Encoding &); // fixed-size types only
-    Encoding *operator-> (void);
-    const Encoding *operator-> (void) const;
-    
-    operator const Encoding &() const;
-    operator Encoding &();
-    operator Encoding &() const;
-    
-    // in, inout, out, _retn 
-    const Encoding &in (void) const;
-    Encoding &inout (void);
-    Encoding &out (void);
-    Encoding _retn (void);
-    Encoding *ptr (void) const;
-
-  private:
-    Encoding *ptr_;
-  };
-
-  typedef Encoding &Encoding_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Encoding;
-
-
-#if !defined (_IOP_CODECFACTORY___PTR_CH_)
-#define _IOP_CODECFACTORY___PTR_CH_
-
-  class CodecFactory;
-  typedef CodecFactory *CodecFactory_ptr;
-  
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODECFACTORY___VAR_CH_)
-#define _IOP_CODECFACTORY___VAR_CH_
-
-  class TAO_Export CodecFactory_var : public TAO_Base_var
-  {
-  public:
-    CodecFactory_var (void); // default constructor
-    CodecFactory_var (CodecFactory_ptr p) : ptr_ (p) {} 
-    CodecFactory_var (const CodecFactory_var &); // copy constructor
-    ~CodecFactory_var (void); // destructor
-    
-    CodecFactory_var &operator= (CodecFactory_ptr);
-    CodecFactory_var &operator= (const CodecFactory_var &);
-    CodecFactory_ptr operator-> (void) const;
-    
-    operator const CodecFactory_ptr &() const;
-    operator CodecFactory_ptr &();
-    // in, inout, out, _retn 
-    CodecFactory_ptr in (void) const;
-    CodecFactory_ptr &inout (void);
-    CodecFactory_ptr &out (void);
-    CodecFactory_ptr _retn (void);
-    CodecFactory_ptr ptr (void) const;
-
-  private:
-    CodecFactory_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CodecFactory_var (const TAO_Base_var &rhs);
-    CodecFactory_var &operator= (const TAO_Base_var &rhs);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODECFACTORY___OUT_CH_)
-#define _IOP_CODECFACTORY___OUT_CH_
-
-  class TAO_Export CodecFactory_out
-  {
-  public:
-    CodecFactory_out (CodecFactory_ptr &);
-    CodecFactory_out (CodecFactory_var &);
-    CodecFactory_out (const CodecFactory_out &);
-    CodecFactory_out &operator= (const CodecFactory_out &);
-    CodecFactory_out &operator= (const CodecFactory_var &);
-    CodecFactory_out &operator= (CodecFactory_ptr);
-    operator CodecFactory_ptr &();
-    CodecFactory_ptr &ptr (void);
-    CodecFactory_ptr operator-> (void);
-    
-  private:
-    CodecFactory_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODECFACTORY_CH_)
-#define _IOP_CODECFACTORY_CH_
-
-class TAO_Export CodecFactory : public virtual CORBA_Object
-  {
-  public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CodecFactory_ptr _ptr_type;
-    typedef CodecFactory_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    // the static operations
-    static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-    static CodecFactory_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CodecFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CodecFactory_ptr _nil (void)
-      {
-        return (CodecFactory_ptr)0;
-      }
-
-
-#if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
-#define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-
-    class TAO_Export UnknownEncoding : public CORBA::UserException
-    {
-    public:
-
-      UnknownEncoding (void);
-      // Default constructor.
-      
-      UnknownEncoding (const UnknownEncoding &);
-      // Copy constructor.
-      
-      ~UnknownEncoding (void);
-      // Destructor.
-      
-      UnknownEncoding &operator= (const UnknownEncoding &);
-      
-      virtual void _raise (void);
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &,
-          CORBA::Environment &
-        ) const;
-      
-      virtual void _tao_decode (
-          TAO_InputCDR &,
-          CORBA::Environment &
-        );
-      
-      static UnknownEncoding *_downcast (CORBA::Exception *);
-
-
-      // = TAO extension.
-      static CORBA::Exception *_alloc (void);
-    }; // Exception IOP::CodecFactory::UnknownEncoding.
-
-
-#endif /* end #if !defined */
-
-    virtual IOP::Codec_ptr create_codec (
-        const IOP::Encoding & enc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        IOP::CodecFactory::UnknownEncoding
-      )) = 0;
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CodecFactory ();
-    
-    virtual ~CodecFactory (void);
-  private:
-    CodecFactory (const CodecFactory &);
-    void operator= (const CodecFactory &);
-  };
-
-
-#endif /* end #if !defined */
-
-
 }
 TAO_NAMESPACE_CLOSE // module IOP
 
-// Proxy Broker Factory function pointer declarations.
-
 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated
@@ -2042,10 +1367,6 @@ TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentList &); //
 TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&);
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentSeq *&);
 TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext *&); // deprecated
@@ -2054,10 +1375,6 @@ TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); //
 TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
-TAO_Export void operator<<= (CORBA::Any &, const IOP::Encoding &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::Encoding*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::Encoding *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::Encoding *&);
 
 #ifndef __ACE_INLINE__
 
@@ -2142,21 +1459,6 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_H_ */
 
-
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
-#define _TAO_CDR_OP_IOP_TaggedComponentSeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponentSeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponentSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_H_ */
-
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::ServiceContext &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::ServiceContext &);
 
@@ -2189,8 +1491,6 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 
 #endif /* __ACE_INLINE__ */
 
@@ -2203,9 +1503,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
index aba1dad1014..2881a39a3f6 100644
--- a/TAO/tao/IOPC.i
+++ b/TAO/tao/IOPC.i
@@ -8,7 +8,7 @@
 //       Washington University
 //       St. Louis, MO
 //       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+//       http://www.cs.wustl.edu/~schmidt/doc-group.html
 // and
 //       Distributed Object Computing Laboratory
 //       University of California at Irvine
@@ -68,12 +68,12 @@ IOP::TaggedProfile_var::operator= (const ::IOP::TaggedProfile_var &p)
         }
       else
         {
-          TaggedProfile *deep_copy =
-            new TaggedProfile (*p.ptr_);
+          IOP::TaggedProfile *deep_copy = 
+            new IOP::TaggedProfile (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              TaggedProfile *tmp = deep_copy;
+              IOP::TaggedProfile *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -260,8 +260,8 @@ IOP::TaggedProfile::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_var &
-IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet_var &p)
+ACE_INLINE IOP::TaggedProfile::_tao_seq_Octet_var &
+IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -272,12 +272,12 @@ IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_
         }
       else
         {
-          _tao_seq_Octet *deep_copy =
-            new _tao_seq_Octet (*p.ptr_);
+          IOP::TaggedProfile::_tao_seq_Octet *deep_copy = 
+            new IOP::TaggedProfile::_tao_seq_Octet (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              _tao_seq_Octet *tmp = deep_copy;
+              IOP::TaggedProfile::_tao_seq_Octet *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -336,12 +336,6 @@ IOP::TaggedProfile::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Octet &
-IOP::TaggedProfile::_tao_seq_Octet_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
 ACE_INLINE const ::IOP::TaggedProfile::_tao_seq_Octet &
 IOP::TaggedProfile::_tao_seq_Octet_var::in (void) const
 {
@@ -491,12 +485,12 @@ IOP::IOR_var::operator= (const ::IOP::IOR_var &p)
         }
       else
         {
-          IOR *deep_copy =
-            new IOR (*p.ptr_);
+          IOP::IOR *deep_copy = 
+            new IOP::IOR (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              IOR *tmp = deep_copy;
+              IOP::IOR *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -852,8 +846,8 @@ IOP::IOR::_tao_seq_TaggedProfile_var::operator= (_tao_seq_TaggedProfile *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile_var &
-IOP::IOR::_tao_seq_TaggedProfile_var::operator= (const ::IOP::IOR::_tao_seq_TaggedProfile_var &p)
+ACE_INLINE IOP::IOR::_tao_seq_TaggedProfile_var &
+IOP::IOR::_tao_seq_TaggedProfile_var::operator= (const ::IOP::IOR::_tao_seq_TaggedProfile_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -864,12 +858,12 @@ IOP::IOR::_tao_seq_TaggedProfile_var::operator= (const ::IOP::IOR::_tao_seq_Tagg
         }
       else
         {
-          _tao_seq_TaggedProfile *deep_copy =
-            new _tao_seq_TaggedProfile (*p.ptr_);
+          IOP::IOR::_tao_seq_TaggedProfile *deep_copy = 
+            new IOP::IOR::_tao_seq_TaggedProfile (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              _tao_seq_TaggedProfile *tmp = deep_copy;
+              IOP::IOR::_tao_seq_TaggedProfile *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -923,12 +917,6 @@ IOP::IOR::_tao_seq_TaggedProfile_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::TaggedProfile &
-IOP::IOR::_tao_seq_TaggedProfile_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IOP::TaggedProfile &, this->ptr_->operator[] (index));
-}
-
 ACE_INLINE const ::IOP::IOR::_tao_seq_TaggedProfile &
 IOP::IOR::_tao_seq_TaggedProfile_var::in (void) const
 {
@@ -1078,12 +1066,12 @@ IOP::TaggedComponent_var::operator= (const ::IOP::TaggedComponent_var &p)
         }
       else
         {
-          TaggedComponent *deep_copy =
-            new TaggedComponent (*p.ptr_);
+          IOP::TaggedComponent *deep_copy = 
+            new IOP::TaggedComponent (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              TaggedComponent *tmp = deep_copy;
+              IOP::TaggedComponent *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1270,8 +1258,8 @@ IOP::TaggedComponent::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_var &
-IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet_var &p)
+ACE_INLINE IOP::TaggedComponent::_tao_seq_Octet_var &
+IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -1282,12 +1270,12 @@ IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponen
         }
       else
         {
-          _tao_seq_Octet *deep_copy =
-            new _tao_seq_Octet (*p.ptr_);
+          IOP::TaggedComponent::_tao_seq_Octet *deep_copy = 
+            new IOP::TaggedComponent::_tao_seq_Octet (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              _tao_seq_Octet *tmp = deep_copy;
+              IOP::TaggedComponent::_tao_seq_Octet *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1346,12 +1334,6 @@ IOP::TaggedComponent::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Octet &
-IOP::TaggedComponent::_tao_seq_Octet_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
 ACE_INLINE const ::IOP::TaggedComponent::_tao_seq_Octet &
 IOP::TaggedComponent::_tao_seq_Octet_var::in (void) const
 {
@@ -1669,8 +1651,8 @@ IOP::MultipleComponentProfile_var::operator= (MultipleComponentProfile *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::MultipleComponentProfile_var &
-IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProfile_var &p)
+ACE_INLINE IOP::MultipleComponentProfile_var &
+IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProfile_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -1681,12 +1663,12 @@ IOP::MultipleComponentProfile_var::operator= (const ::IOP::MultipleComponentProf
         }
       else
         {
-          MultipleComponentProfile *deep_copy =
-            new MultipleComponentProfile (*p.ptr_);
+          IOP::MultipleComponentProfile *deep_copy = 
+            new IOP::MultipleComponentProfile (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              MultipleComponentProfile *tmp = deep_copy;
+              IOP::MultipleComponentProfile *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1740,12 +1722,6 @@ IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::TaggedComponent &
-IOP::MultipleComponentProfile_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index));
-}
-
 ACE_INLINE const ::IOP::MultipleComponentProfile &
 IOP::MultipleComponentProfile_var::in (void) const
 {
@@ -2063,8 +2039,8 @@ IOP::TaggedComponentList_var::operator= (TaggedComponentList *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::TaggedComponentList_var &
-IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p)
+ACE_INLINE IOP::TaggedComponentList_var &
+IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -2075,12 +2051,12 @@ IOP::TaggedComponentList_var::operator= (const ::IOP::TaggedComponentList_var &p
         }
       else
         {
-          TaggedComponentList *deep_copy =
-            new TaggedComponentList (*p.ptr_);
+          IOP::TaggedComponentList *deep_copy = 
+            new IOP::TaggedComponentList (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              TaggedComponentList *tmp = deep_copy;
+              IOP::TaggedComponentList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -2134,12 +2110,6 @@ IOP::TaggedComponentList_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::TaggedComponent &
-IOP::TaggedComponentList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index));
-}
-
 ACE_INLINE const ::IOP::TaggedComponentList &
 IOP::TaggedComponentList_var::in (void) const
 {
@@ -2240,400 +2210,6 @@ IOP::TaggedComponentList_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CI_
-
-  // = Static operations.
-  ACE_INLINE IOP::TaggedComponent *
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    IOP::TaggedComponent *retval = 0;
-    ACE_NEW_RETURN (retval, IOP::TaggedComponent[size], 0);
-    return retval;
-  }
-  
-  ACE_INLINE void IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (IOP::TaggedComponent *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    IOP::TaggedComponent *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      IOP::TaggedComponent *tmp1 = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->maximum_);
-      IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp1[i] = tmp2[i];
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator= (const _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-        _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    IOP::TaggedComponent *tmp1 = ACE_reinterpret_cast (IOP::TaggedComponent *, this->buffer_);
-    IOP::TaggedComponent * const tmp2 = ACE_reinterpret_cast (IOP::TaggedComponent * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE IOP::TaggedComponent &
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    IOP::TaggedComponent* tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const IOP::TaggedComponent &
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    IOP::TaggedComponent * const tmp = ACE_reinterpret_cast (IOP::TaggedComponent* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE IOP::TaggedComponent *
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    IOP::TaggedComponent *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (this->length_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (IOP::TaggedComponent*, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const IOP::TaggedComponent *
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const IOP::TaggedComponent * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  IOP::TaggedComponent *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      IOP::TaggedComponent *tmp = ACE_reinterpret_cast(IOP::TaggedComponent*,this->buffer_);
-      _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IOP_TAGGEDCOMPONENTSEQ_CI_)
-#define _IOP_TAGGEDCOMPONENTSEQ_CI_
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponentSeq_var
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (TaggedComponentSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::TaggedComponentSeq_var::TaggedComponentSeq_var (const ::IOP::TaggedComponentSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::TaggedComponentSeq (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponentSeq_var::~TaggedComponentSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponentSeq_var &
-IOP::TaggedComponentSeq_var::operator= (TaggedComponentSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq_var &
-IOP::TaggedComponentSeq_var::operator= (const ::IOP::TaggedComponentSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          TaggedComponentSeq *deep_copy =
-            new TaggedComponentSeq (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              TaggedComponentSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IOP::TaggedComponentSeq *
-IOP::TaggedComponentSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq *
-IOP::TaggedComponentSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedComponentSeq_var::operator const ::IOP::TaggedComponentSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-IOP::TaggedComponentSeq_var::operator ::IOP::TaggedComponentSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::TaggedComponentSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const IOP::TaggedComponent &
-IOP::TaggedComponentSeq_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IOP::TaggedComponent &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE const ::IOP::TaggedComponentSeq &
-IOP::TaggedComponentSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq &
-IOP::TaggedComponentSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::IOP::TaggedComponentSeq *&
-IOP::TaggedComponentSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq *
-IOP::TaggedComponentSeq_var::_retn (void)
-{
-  ::IOP::TaggedComponentSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq *
-IOP::TaggedComponentSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponentSeq_out
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (TaggedComponentSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponentSeq_out::TaggedComponentSeq_out (const ::IOP::TaggedComponentSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TaggedComponentSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::TaggedComponentSeq_out &
-IOP::TaggedComponentSeq_out::operator= (const ::IOP::TaggedComponentSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (TaggedComponentSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq_out &
-IOP::TaggedComponentSeq_out::operator= (TaggedComponentSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IOP::TaggedComponentSeq_out::operator ::IOP::TaggedComponentSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq *&
-IOP::TaggedComponentSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponentSeq *
-IOP::TaggedComponentSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent &
-IOP::TaggedComponentSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
 // *************************************************************
 // Inline operations for class IOP::ServiceContext_var
 // *************************************************************
@@ -2683,12 +2259,12 @@ IOP::ServiceContext_var::operator= (const ::IOP::ServiceContext_var &p)
         }
       else
         {
-          ServiceContext *deep_copy =
-            new ServiceContext (*p.ptr_);
+          IOP::ServiceContext *deep_copy = 
+            new IOP::ServiceContext (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              ServiceContext *tmp = deep_copy;
+              IOP::ServiceContext *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -2875,8 +2451,8 @@ IOP::ServiceContext::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_var &
-IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext::_tao_seq_Octet_var &p)
+ACE_INLINE IOP::ServiceContext::_tao_seq_Octet_var &
+IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext::_tao_seq_Octet_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -2887,12 +2463,12 @@ IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext:
         }
       else
         {
-          _tao_seq_Octet *deep_copy =
-            new _tao_seq_Octet (*p.ptr_);
+          IOP::ServiceContext::_tao_seq_Octet *deep_copy = 
+            new IOP::ServiceContext::_tao_seq_Octet (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              _tao_seq_Octet *tmp = deep_copy;
+              IOP::ServiceContext::_tao_seq_Octet *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -2951,12 +2527,6 @@ IOP::ServiceContext::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Octet &
-IOP::ServiceContext::_tao_seq_Octet_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
 ACE_INLINE const ::IOP::ServiceContext::_tao_seq_Octet &
 IOP::ServiceContext::_tao_seq_Octet_var::in (void) const
 {
@@ -3274,8 +2844,8 @@ IOP::ServiceContextList_var::operator= (ServiceContextList *p)
   return *this;
 }
 
-ACE_INLINE ::IOP::ServiceContextList_var &
-IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p)
+ACE_INLINE IOP::ServiceContextList_var &
+IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -3286,12 +2856,12 @@ IOP::ServiceContextList_var::operator= (const ::IOP::ServiceContextList_var &p)
         }
       else
         {
-          ServiceContextList *deep_copy =
-            new ServiceContextList (*p.ptr_);
+          IOP::ServiceContextList *deep_copy = 
+            new IOP::ServiceContextList (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              ServiceContextList *tmp = deep_copy;
+              IOP::ServiceContextList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -3345,12 +2915,6 @@ IOP::ServiceContextList_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const IOP::ServiceContext &
-IOP::ServiceContextList_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IOP::ServiceContext &, this->ptr_->operator[] (index));
-}
-
 ACE_INLINE const ::IOP::ServiceContextList &
 IOP::ServiceContextList_var::in (void) const
 {
@@ -3451,507 +3015,6 @@ IOP::ServiceContextList_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception IOP::Codec::InvalidTypeForEncoding
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception IOP::Codec::FormatMismatch
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception IOP::Codec::TypeMismatch
-// *************************************************************
-
-
-#if !defined (_IOP_CODEC___VAR_CI_)
-#define _IOP_CODEC___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IOP::Codec_var
-// *************************************************************
-
-ACE_INLINE
-IOP::Codec_var::Codec_var (void) // default constructor
-  : ptr_ (Codec::_nil ())
-{}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::Codec_var::Codec_var (const ::IOP::Codec_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Codec::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IOP::Codec_var::~Codec_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IOP::Codec_var &
-IOP::Codec_var::operator= (Codec_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::Codec_var &
-IOP::Codec_var::operator= (const ::IOP::Codec_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr &
-IOP::Codec_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr &
-IOP::Codec_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::Codec::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IOP::Codec_ptr val = this->ptr_;
-  this->ptr_ = ::IOP::Codec::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODEC___OUT_CI_)
-#define _IOP_CODEC___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IOP::Codec_out
-// *************************************************************
-
-ACE_INLINE
-IOP::Codec_out::Codec_out (Codec_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IOP::Codec::_nil ();
-}
-
-ACE_INLINE
-IOP::Codec_out::Codec_out (Codec_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::Codec::_nil ();
-}
-
-ACE_INLINE
-IOP::Codec_out::Codec_out (const ::IOP::Codec_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Codec_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::Codec_out &
-IOP::Codec_out::operator= (const ::IOP::Codec_out &p)
-{
-  this->ptr_ = ACE_const_cast (Codec_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::Codec_out &
-IOP::Codec_out::operator= (const ::IOP::Codec_var &p)
-{
-  this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IOP::Codec_out &
-IOP::Codec_out::operator= (Codec_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IOP::Codec_out::operator ::IOP::Codec_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr &
-IOP::Codec_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class IOP::Encoding_var
-// *************************************************************
-
-ACE_INLINE
-IOP::Encoding_var::Encoding_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::Encoding_var::Encoding_var (Encoding *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::Encoding_var::Encoding_var (const ::IOP::Encoding_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::Encoding (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-// fixed-size types only
-ACE_INLINE
-IOP::Encoding_var::Encoding_var (const ::IOP::Encoding &p)
-{
-  ACE_NEW (this->ptr_, ::IOP::Encoding (p));
-}
-
-ACE_INLINE
-IOP::Encoding_var::~Encoding_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::Encoding_var &
-IOP::Encoding_var::operator= (Encoding *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::IOP::Encoding_var &
-IOP::Encoding_var::operator= (const ::IOP::Encoding_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          Encoding *deep_copy =
-            new Encoding (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              Encoding *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE IOP::Encoding_var &
-IOP::Encoding_var::operator= (const ::IOP::Encoding &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::Encoding (p), *this);
-  }
-  return *this;
-}
-
-ACE_INLINE const ::IOP::Encoding *
-IOP::Encoding_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Encoding *
-IOP::Encoding_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::Encoding_var::operator const ::IOP::Encoding &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::Encoding_var::operator ::IOP::Encoding &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-IOP::Encoding_var::operator ::IOP::Encoding &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const ::IOP::Encoding &
-IOP::Encoding_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::Encoding &
-IOP::Encoding_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size 
-ACE_INLINE ::IOP::Encoding &
-IOP::Encoding_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::Encoding
-IOP::Encoding_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::Encoding *
-IOP::Encoding_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for exception IOP::CodecFactory::UnknownEncoding
-// *************************************************************
-
-
-#if !defined (_IOP_CODECFACTORY___VAR_CI_)
-#define _IOP_CODECFACTORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IOP::CodecFactory_var
-// *************************************************************
-
-ACE_INLINE
-IOP::CodecFactory_var::CodecFactory_var (void) // default constructor
-  : ptr_ (CodecFactory::_nil ())
-{}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::CodecFactory_var::CodecFactory_var (const ::IOP::CodecFactory_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CodecFactory::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IOP::CodecFactory_var::~CodecFactory_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IOP::CodecFactory_var &
-IOP::CodecFactory_var::operator= (CodecFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::CodecFactory_var &
-IOP::CodecFactory_var::operator= (const ::IOP::CodecFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr &
-IOP::CodecFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr &
-IOP::CodecFactory_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IOP::CodecFactory_ptr val = this->ptr_;
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODECFACTORY___OUT_CI_)
-#define _IOP_CODECFACTORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IOP::CodecFactory_out
-// *************************************************************
-
-ACE_INLINE
-IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-}
-
-ACE_INLINE
-IOP::CodecFactory_out::CodecFactory_out (CodecFactory_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-}
-
-ACE_INLINE
-IOP::CodecFactory_out::CodecFactory_out (const ::IOP::CodecFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CodecFactory_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::CodecFactory_out &
-IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (CodecFactory_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::CodecFactory_out &
-IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_var &p)
-{
-  this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IOP::CodecFactory_out &
-IOP::CodecFactory_out::operator= (CodecFactory_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IOP::CodecFactory_out::operator ::IOP::CodecFactory_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr &
-IOP::CodecFactory_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
 
 #if !defined _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_
 #define _TAO_CDR_OP_IOP_TaggedProfile__tao_seq_Octet_I_
@@ -4100,21 +3163,6 @@ CORBA::Boolean TAO_Export operator>> (
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_I_ */
 
 
-#if !defined _TAO_CDR_OP_IOP_TaggedComponentSeq_I_
-#define _TAO_CDR_OP_IOP_TaggedComponentSeq_I_
-
-CORBA::Boolean TAO_Export operator<< (
-    TAO_OutputCDR &,
-    const IOP::TaggedComponentSeq &
-  );
-CORBA::Boolean TAO_Export operator>> (
-    TAO_InputCDR &,
-    IOP::TaggedComponentSeq &
-  );
-
-#endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_I_ */
-
-
 #if !defined _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_
 #define _TAO_CDR_OP_IOP_ServiceContext__tao_seq_Octet_I_
 
@@ -4168,29 +3216,3 @@ CORBA::Boolean TAO_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IOP::Encoding &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.format) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.minor_version))
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IOP::Encoding &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.format) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version))
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile
index 2d5381149f0..de6a11dfc08 100644
--- a/TAO/tao/IORManipulation/Makefile
+++ b/TAO/tao/IORManipulation/Makefile
@@ -67,7 +67,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -155,15 +154,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -178,7 +176,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- IORC.h $(TAO_ROOT)/tao/Object.h \
+ IORC.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -224,7 +225,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -312,15 +312,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -335,7 +334,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- IORC.h $(TAO_ROOT)/tao/Object.h \
+ IORC.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
@@ -463,16 +465,14 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/LocalObject.i \
  IORManip_Loader.h ior_manip_export.h \
  $(TAO_ROOT)/tao/Object_Loader.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.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 \
  $(TAO_ROOT)/tao/Object_Loader.i \
  $(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 \
@@ -488,6 +488,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  IORC.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -505,10 +507,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
@@ -517,6 +515,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
  $(TAO_ROOT)/tao/GIOP_Message_State.i \
@@ -553,6 +553,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -597,8 +599,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile
index 4024308747b..e42345125fc 100644
--- a/TAO/tao/IORTable/Makefile
+++ b/TAO/tao/IORTable/Makefile
@@ -308,8 +308,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -610,8 +625,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -914,8 +944,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1218,8 +1263,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index a81c6cbcf13..77d331327cb 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -94,6 +94,7 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (void)
     profile_ (0),
     endpoint_ (0),
     max_wait_time_ (0),
+    ior_info_ (),
     rt_context_initialized_ (0),
     restart_flag_ (0),
     forward_reference_ (),
@@ -105,15 +106,14 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
                                           const char *operation,
                                           CORBA::ULong opname_len,
                                           CORBA::Boolean argument_flag,
-                                          TAO_ORB_Core *orb_core,
-                                          int byte_order)
+                                          TAO_ORB_Core *orb_core)
   : stub_ (stub),
     op_details_ (operation,
                  opname_len,
                  argument_flag),
     out_stream_ (this->buffer_,
                  sizeof this->buffer_, /* ACE_CDR::DEFAULT_BUFSIZE */
-                 byte_order,
+                 TAO_ENCAP_BYTE_ORDER,
                  orb_core->output_cdr_buffer_allocator (),
                  orb_core->output_cdr_dblock_allocator (),
                  orb_core->orb_params ()->cdr_memcpy_tradeoff (),
@@ -127,6 +127,7 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
     profile_ (0),
     endpoint_ (0),
     max_wait_time_ (0),
+    ior_info_ (),
     rt_context_initialized_ (0),
     restart_flag_ (0),
     forward_reference_ (),
@@ -348,26 +349,8 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags,
       // We need to call the method seperately. If there is no
       // IOP::IOR info, the call would create the info and return the
       // index that we need.
-      CORBA::ULong index = 0;
-
-      IOP::IOR *ior_info = 0;
-      int retval = this->stub_->create_ior_info (ior_info,
-                                                 index,
-                                                 ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (retval == -1)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("TAO (%P|%t) Error in finding index for \n")
-                          ACE_TEXT ("IOP::IOR \n")));
-            }
-          return;
-        }
-
-      this->target_spec_.target_specifier (*ior_info,
+      CORBA::ULong index = this->create_ior_info ();
+      this->target_spec_.target_specifier (this->ior_info_,
                                            index);
     }
 
@@ -531,7 +514,60 @@ TAO_GIOP_Invocation::location_forward (CORBA::Object_ptr forward,
   return TAO_INVOKE_RESTART;
 }
 
+CORBA::ULong
+TAO_GIOP_Invocation::create_ior_info (void)
+{
+  if (this->ior_info_.profiles.length () == 0)
+    {
+      // We are making a copy, it is expensive. We want a copy of the
+      // profiles as we dont want to modify the profile set held by
+      // the Stub classes. We may want to hold a lock for doing
+      // that. To avoid unnecssary complications we make a copy and
+      // get the info
+
+      // @@ There should be a better way to do this - Bala
+      // @@ Bala, your code is not exception-safe.  The call below
+      // allocates memory, and could very well return 0.  In such
+      // case, the second call below would seg fault.
+      TAO_MProfile *multi_prof =
+        this->stub_->make_profiles ();
+
+      // Get the number of elements
+      CORBA::ULong count = multi_prof->profile_count ();
+
+      // Set the number of elements in the sequence of tagged_profile
+      this->ior_info_.profiles.length (count);
+
+      // Call the create_tagged_profile one every member of the
+      // profile and make the sequence
+      for (CORBA::ULong index = 0; index < count; ++index)
+        {
+          TAO_Profile *prof = multi_prof->get_profile (index);
+
+          this->ior_info_.profiles[index] = prof->create_tagged_profile ();
+        }
+
+      delete multi_prof;
+    }
+
+  // Figure out the index of the profile we are using for invocation.
+
+  // @@ Bala, you are using base_profiles, which means this will not
+  // work if there was forwarding ...  But it seems the problem isn't
+  // just here, but the whole addressing mode thing won't work if
+  // there was forwarding.
 
+  const TAO_MProfile &mprofile = this->stub_->base_profiles ();
+
+  for (CORBA::ULong i = 0; i < mprofile.profile_count (); ++i)
+    {
+      if (mprofile.get_profile (i) == this->profile_)
+        return i;
+
+    }
+  // If there was forwarding the loop above won't find a match.
+  return mprofile.get_current_handle ();
+}
 
 void
 TAO_GIOP_Invocation::add_rt_service_context (CORBA_Environment &ACE_TRY_ENV)
@@ -935,15 +971,13 @@ TAO_GIOP_Oneway_Invocation::TAO_GIOP_Oneway_Invocation (
     const char *operation,
     CORBA::ULong opname_len,
     CORBA::Boolean argument_flag,
-    TAO_ORB_Core *orb_core,
-    int byte_order
+    TAO_ORB_Core *orb_core
   )
   : TAO_GIOP_Synch_Invocation (stub,
                                operation,
                                opname_len,
                                argument_flag,
-                               orb_core,
-                               byte_order),
+                               orb_core),
     sync_scope_ (TAO::SYNC_WITH_TRANSPORT)
 {
   int has_synchronization = 0;
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 3296c919009..7ddc8f11789 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -90,8 +90,7 @@ public:
                        const char *operation,
                        CORBA::ULong opname_len,
                        CORBA::Boolean argument_flag,
-                       TAO_ORB_Core *orb_core,
-                       int byte_order = TAO_ENCAP_BYTE_ORDER);
+                       TAO_ORB_Core *orb_core);
 
   /**
    * This destructor is virtual so that the derived synchronous
@@ -220,6 +219,12 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
+   * Create the IOP::IOR info. We will create the info at most once.
+   * Return index of the profile we are using to make the invocation.
+   */
+  CORBA::ULong create_ior_info (void);
+
+  /**
    * Add RT-related context to the service context list if the
    * invocation target supports RTCORBA::CLIENT_PROPAGATED priority
    * model.
@@ -294,6 +299,15 @@ protected:
   //@}
 
   /**
+   * The ior info. This is needed for GIOP 1.2, as the clients could
+   * receive an exception from the server asking for this info.  The
+   * exception that the client receives is LOC_NEEDS_ADDRESSING_MODE.
+   * If we receive an exception we will fill up this data at most
+   * *once* and send it to the server.
+   */
+  IOP::IOR ior_info_;
+
+  /**
    * Flag indicating whether RTCORBA-specific service context list
    * processing has taken place.  This is needed because
    * prepare_header() may get called multiple times, but we only need
@@ -343,8 +357,7 @@ public:
                              const char *operation,
                              CORBA::ULong opname_len,
                              CORBA::Boolean argument_flag,
-                             TAO_ORB_Core *orb_core,
-                             int byte_order = TAO_ENCAP_BYTE_ORDER);
+                             TAO_ORB_Core *orb_core);
 
   /// Destructor.
   virtual ~TAO_GIOP_Synch_Invocation (void);
@@ -388,8 +401,7 @@ public:
                               const char *operation,
                               CORBA::ULong opname_len,
                               CORBA::Boolean argument_flag,
-                              TAO_ORB_Core *orb_core,
-                              int byte_order = TAO_ENCAP_BYTE_ORDER);
+                              TAO_ORB_Core *orb_core);
 
   /// Destructor.
   virtual ~TAO_GIOP_Twoway_Invocation (void);
@@ -428,8 +440,7 @@ public:
                               const char *operation,
                               CORBA::ULong opname_len,
                               CORBA::Boolean argument_flag,
-                              TAO_ORB_Core *orb_core,
-                              int byte_order = TAO_ENCAP_BYTE_ORDER);
+                              TAO_ORB_Core *orb_core);
 
   /// Destructor.
   virtual ~TAO_GIOP_Oneway_Invocation (void);
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 3d9276bae1b..a5ae9d58abb 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -110,15 +110,13 @@ TAO_GIOP_Synch_Invocation::TAO_GIOP_Synch_Invocation (
     const char *operation,
     CORBA::ULong opname_len,
     CORBA::Boolean argument_flag,
-    TAO_ORB_Core *orb_core,
-    int byte_order
+    TAO_ORB_Core *orb_core
   )
   : TAO_GIOP_Invocation	(stub,
 			 operation,
 			 opname_len,
 			 argument_flag,
-			 orb_core,
-                         byte_order),
+			 orb_core),
     rd_	(orb_core,
 	 this->op_details_.service_info	())
 {
@@ -138,15 +136,13 @@ TAO_GIOP_Twoway_Invocation::TAO_GIOP_Twoway_Invocation (
     const char *operation,
     CORBA::ULong opname_len,
     CORBA::Boolean argument_flag,
-    TAO_ORB_Core *orb_core,
-    int byte_order
+    TAO_ORB_Core *orb_core
   )
   : TAO_GIOP_Synch_Invocation (stub,
 			       operation,
 			       opname_len,
 			       argument_flag,
-			       orb_core,
-                               byte_order)
+			       orb_core)
 {
 }
 
diff --git a/TAO/tao/Invocation_Endpoint_Selectors.cpp b/TAO/tao/Invocation_Endpoint_Selectors.cpp
index ac1c662f638..c5132e72b8a 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -39,9 +39,7 @@ TAO_Endpoint_Selector_Factory::get_selector (TAO_GIOP_Invocation
     invocation->endpoint_selection_state_;
 
   state.priority_model_policy_ =
-    invocation->stub_->exposed_priority_model (ACE_TRY_ENV);
-  ACE_CHECK;
-
+    invocation->stub_->exposed_priority_model ();
   state.private_connection_ =
     invocation->stub_->private_connection ();
 
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index 01881a9d1dd..e5aad8bf0a9 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -220,20 +220,18 @@ TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_MProfile::init_policy_list (CORBA::Environment &ACE_TRY_ENV)
+TAO_MProfile::init_policy_list (void)
 {
   // The first time this method is called
   // it causes the initialization of the policies
   // for the current profile.
 
-  this->get_current_profile ()->policies (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->get_current_profile ()->policies ();
   this->is_policy_list_initialized_ = 1;
 }
 
-CORBA::PolicyList *
-TAO_MProfile::policy_list (CORBA::Environment &ACE_TRY_ENV)
+CORBA::PolicyList*
+TAO_MProfile::policy_list (void)
 {
   if (!this->is_policy_list_initialized_)
     {
@@ -244,20 +242,10 @@ TAO_MProfile::policy_list (CORBA::Environment &ACE_TRY_ENV)
 
       if (this->policy_list_ == 0)
         {
-          this->create_policy_list (ACE_TRY_ENV);
-	  ACE_CHECK_RETURN (0);
-
-          this->init_policy_list (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          this->create_policy_list ();
+          this->init_policy_list ();
         }
     }
-  CORBA::PolicyList *ret_val = 0;
-  ACE_NEW_THROW_EX ( ret_val,
-                     CORBA::PolicyList (*this->policy_list_),
-                     CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                       CORBA::COMPLETED_NO)
-                     );
-  ACE_CHECK_RETURN (0);
-
-  return ret_val;
+
+  return this->policy_list_;
 }
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 252ec5e2b8a..d2cfce4a8f1 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -165,7 +165,7 @@ protected:
 
   /// This method handle the dynamic allocation of the data member
   /// <policy_list_>.
- void create_policy_list (CORBA::Environment &ACE_TRY_ENV);
+ void create_policy_list (void);
 
 public:
 
@@ -175,12 +175,12 @@ public:
 
   /// Gets the policies list associated with the profiles
   /// owned by the TAO_MProfile.
-  CORBA::PolicyList *policy_list (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::PolicyList * policy_list (void);
 
 protected:
 
   /// Initialize the policy list, demarsharling the policy.
-  void init_policy_list (CORBA::Environment &ACE_TRY_ENV);
+  void init_policy_list (void);
 
 protected:
   /// Stores the policy list for the profile of this MProfile.
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
index 1623cd10b18..d13887e406b 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -253,13 +253,19 @@ TAO_MProfile::add_profile (TAO_Profile *pfile)
 }
 
 ACE_INLINE void
-TAO_MProfile::create_policy_list (CORBA::Environment &ACE_TRY_ENV)
+TAO_MProfile::create_policy_list (void)
 {
-  ACE_NEW_THROW_EX (this->policy_list_,
-                    CORBA::PolicyList,
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO)
-                    );
+  // Precondition: Make sure that the policy list
+  // has not already allocated.
+  ACE_ASSERT (this->policy_list_ == 0);
+
+  ACE_NEW (this->policy_list_, CORBA::PolicyList ());
+
+  // Post-Condition: Make sure that the memory get allcated
+  // for real.
+  ACE_ASSERT (this->policy_list_ != 0);
+
+  // @@ Marina & Irfan I would raise an exception in this case.
 }
 
 
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index ee51930f4e2..0fc74a6df24 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -13,9 +13,11 @@ DIRS = \
   PortableServer \
   DynamicAny \
   DynamicInterface \
+  IFR_Client \
   IORManipulation \
   IORTable \
   Strategies \
+  Domain \
   SmartProxies
 
 # These are headers for things which are exported and must be
@@ -24,6 +26,11 @@ PUB_HDRS = \
   Pluggable \
   Transport \
   MProfile \
+  Flushing_Strategy \
+  Block_Flushing_Strategy \
+  Reactive_Flushing_Strategy \
+  Queued_Message \
+  Message_Sent_Callback \
   IIOP_Factory \
   IIOP_Profile \
   IIOP_Transport \
@@ -56,7 +63,6 @@ PUB_HDRS = \
   Reply_Dispatcher \
   Synch_Reply_Dispatcher \
   Asynch_Reply_Dispatcher \
-  Asynch_Timeout_Handler \
   BoundC \
   GIOPC \
   TAO_Export \
@@ -85,6 +91,10 @@ PLUGGABLE_PROTOCOLS_FILES = \
   Acceptor_Registry \
   Protocol_Factory \
   Acceptor_Filter \
+  Flushing_Strategy \
+  Block_Flushing_Strategy \
+  Reactive_Flushing_Strategy \
+  Queued_Message \
   iiop_endpoints \
   IIOP_Factory \
   IIOP_Lite_Factory \
@@ -149,6 +159,7 @@ ORB_CORE_FILES = \
   Remote_Object_Proxy_Impl \
   DomainC \
   TimeBaseC \
+  TimeBaseS \
   Principal \
   Sequence \
   MProfile \
@@ -197,15 +208,19 @@ ORB_CORE_FILES = \
   Reply_Dispatcher \
   Synch_Reply_Dispatcher \
   Asynch_Reply_Dispatcher \
-  Asynch_Timeout_Handler \
   IOPC \
+  IOPS \
   PollableC \
+  PollableS \
   CONV_FRAMEC \
+  CONV_FRAMES \
   Tagged_Components \
   Service_Context \
   GIOPC \
+  GIOPS \
   BoundsC \
   TAOC \
+  TAOS \
   Object_Loader \
   TAO_Singleton_Manager \
   DLL_ORB \
@@ -234,10 +249,7 @@ ORB_CORE_FILES = \
   BiDirPolicyC \
   BiDir_ORBInitializer \
   BiDir_PolicyFactory \
-  BiDir_Policy_i \
-  CodecFactory \
-  CodecFactory_ORBInitializer \
-  CDR_Encaps_Codec
+  BiDir_Policy_i
 
 DYNAMIC_ANY_FILES =
 
@@ -275,10 +287,10 @@ ifeq ($(minimum_corba),0)
 ORB_CORE_FILES += \
   Services \
   NVList \
-  IFR_Client_Adapter \
   Dynamic_Adapter
 
 INTERFACE_REPO_FILES += \
+  IFR_Client_Adapter \
   IFR_TypeCodes
 
 endif # minimum_corba
@@ -309,6 +321,7 @@ ORB_CORE_FILES += \
   RT_Protocols_Hooks \
   Pool_Per_Endpoint \
   RTCORBAC \
+  RTCORBAS \
   RT_PolicyFactory \
   RT_ORBInitializer \
   Private_Connection_Descriptor
@@ -387,11 +400,6 @@ BUILD   += TAO_COMPONENTS
 all.nested: all.local
 
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
-
-ifneq ($(ACE_HAS_GNUG_PRE_2_8),1)
-  DIRS += IFR_Client Domain
-endif # ACE_HAS_GNUG_PRE_2_8
-
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
@@ -592,17 +600,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -613,6 +614,11 @@ realclean:
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -654,6 +660,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -713,8 +721,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -834,65 +857,6 @@ realclean:
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  Exception.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/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Transport.inl ORB_Core.h ORB.h \
  Exception.h \
  Services.h \
@@ -930,10 +894,12 @@ realclean:
  LocalObject.i \
  Policy_Manager.i \
  Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -944,9 +910,16 @@ realclean:
  TAO_Singleton.inl \
  TAO_Singleton.cpp \
  TAO_Singleton.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 \
  TAO_Singleton_Manager.h \
  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
@@ -959,6 +932,21 @@ realclean:
  $(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_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
@@ -966,6 +954,14 @@ realclean:
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
  Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  Cache_Entries.h \
  Connection_Descriptor_Interface.h \
  Endpoint.h \
@@ -975,11 +971,33 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
- Protocols_Hooks.h RTCORBAC.h ORB_Core.i Client_Strategy_Factory.h \
- TAO_Export.h Wait_Strategy.h Transport_Mux_Strategy.h Stub.h \
+ Protocols_Hooks.h RTCORBAC.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ ORB_Core.i Client_Strategy_Factory.h TAO_Export.h Wait_Strategy.h \
+ Transport_Mux_Strategy.h Stub.h \
  MProfile.h \
  Profile.h \
  Tagged_Components.h \
@@ -1001,7 +1019,8 @@ realclean:
  Priority_Mapping.i \
  Priority_Mapping_Manager.i \
  TAOC.i \
- Sync_Strategies.i
+ Sync_Strategies.i \
+ Queued_Message.h Queued_Message.inl Flushing_Strategy.h
 
 .obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -1101,26 +1120,11 @@ realclean:
  corbafwd.i \
  Tagged_Components.h \
  IOPC.h \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -1128,14 +1132,27 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
@@ -1146,6 +1163,8 @@ realclean:
  ValueBase.i \
  ValueFactory.h \
  ValueFactory.i \
+ Any.h \
+ Any.i \
  TimeBaseC.h \
  TimeBaseC.i \
  PolicyC.h \
@@ -1240,8 +1259,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1468,17 +1502,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  params.h \
@@ -1492,6 +1519,11 @@ realclean:
  Services.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -1521,6 +1553,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -1580,8 +1614,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1787,8 +1836,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -1809,6 +1856,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -1837,8 +1886,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -1968,17 +2032,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Resource_Factory.h \
@@ -1995,6 +2052,11 @@ realclean:
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -2029,6 +2091,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -2088,8 +2152,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -2315,6 +2394,550 @@ realclean:
  corbafwd.i \
  Acceptor_Filter.i
 
+.obj/Flushing_Strategy.o .obj/Flushing_Strategy.so .shobj/Flushing_Strategy.o .shobj/Flushing_Strategy.so: Flushing_Strategy.cpp Flushing_Strategy.h \
+ $(ACE_ROOT)/ace/pre.h corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i
+
+.obj/Block_Flushing_Strategy.o .obj/Block_Flushing_Strategy.so .shobj/Block_Flushing_Strategy.o .shobj/Block_Flushing_Strategy.so: Block_Flushing_Strategy.cpp \
+ Block_Flushing_Strategy.h \
+ $(ACE_ROOT)/ace/pre.h \
+ Flushing_Strategy.h corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ Transport.h Exception.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Transport.inl Queued_Message.h Queued_Message.inl
+
+.obj/Reactive_Flushing_Strategy.o .obj/Reactive_Flushing_Strategy.so .shobj/Reactive_Flushing_Strategy.o .shobj/Reactive_Flushing_Strategy.so: Reactive_Flushing_Strategy.cpp \
+ Reactive_Flushing_Strategy.h \
+ $(ACE_ROOT)/ace/pre.h \
+ Flushing_Strategy.h corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ Transport.h Exception.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Transport.inl ORB_Core.h ORB.h \
+ Exception.h \
+ Services.h \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
+ Services.i \
+ CORBA_String.h \
+ CORBA_String.inl \
+ PolicyC.h \
+ CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
+ CurrentC.i \
+ Encodable.h \
+ CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ CDR.i \
+ Typecode.h \
+ Typecode.i \
+ PolicyC.i \
+ ORB.i \
+ Environment.h Policy_Manager.h \
+ LocalObject.h \
+ LocalObject.i \
+ Policy_Manager.i \
+ Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ Pluggable.h \
+ IOPC.h \
+ IOPC.i \
+ Pluggable.i \
+ Protocol_Factory.h \
+ params.h params.i \
+ TAO_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_Singleton.cpp \
+ TAO_Singleton.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 \
+ TAO_Singleton_Manager.h \
+ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
+ ValueBase.h \
+ ValueBase.i \
+ ValueFactory.h \
+ ValueFactory.i \
+ TimeBaseC.h \
+ TimeBaseC.i \
+ PollableC.h \
+ PollableC.i \
+ MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i PolicyC.h \
+ $(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_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ Parser_Registry.h \
+ Parser_Registry.i \
+ Service_Callbacks.h \
+ Service_Callbacks.i \
+ Fault_Tolerance_Service.h \
+ Fault_Tolerance_Service.i \
+ Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ Cache_Entries.h \
+ Connection_Descriptor_Interface.h \
+ Endpoint.h \
+ Endpoint.i \
+ Connection_Descriptor_Interface.inl \
+ Cache_Entries.inl \
+ Connection_Cache_Manager.inl \
+ Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
+ Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAC.h \
+ RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
+ RT_Policy_i.i \
+ Protocols_Hooks.h RTCORBAC.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ ORB_Core.i Queued_Message.h Queued_Message.inl
+
+.obj/Queued_Message.o .obj/Queued_Message.so .shobj/Queued_Message.o .shobj/Queued_Message.so: Queued_Message.cpp Queued_Message.h \
+ $(ACE_ROOT)/ace/pre.h corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ Queued_Message.inl Message_Sent_Callback.h Message_Sent_Callback.inl
+
 .obj/iiop_endpoints.o .obj/iiop_endpoints.so .shobj/iiop_endpoints.o .shobj/iiop_endpoints.so: iiop_endpoints.cpp iiop_endpoints.h \
  $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
@@ -2576,17 +3199,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  IIOP_Connection_Handler.h \
@@ -2688,6 +3304,11 @@ realclean:
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -2709,6 +3330,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -2737,8 +3360,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  ORB_Core.i \
@@ -2899,17 +3537,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  IIOP_Connection_Handler.h \
@@ -3011,6 +3642,11 @@ realclean:
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -3032,6 +3668,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -3060,8 +3698,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  ORB_Core.i \
@@ -3193,25 +3846,10 @@ realclean:
  corbafwd.i \
  Tagged_Components.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -3219,14 +3857,27 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
@@ -3278,6 +3929,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -3335,8 +3988,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -3453,6 +4121,40 @@ realclean:
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  Exception.i \
+ Transport.inl \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK.i \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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 \
@@ -3461,10 +4163,6 @@ realclean:
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -3479,18 +4177,6 @@ realclean:
  $(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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -3512,24 +4198,6 @@ realclean:
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.h \
@@ -3576,13 +4244,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  IOPC.h \
- Any.h \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Acceptor_Impl.h \
@@ -3596,6 +4257,11 @@ realclean:
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -3618,6 +4284,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -3646,8 +4314,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  ORB_Core.i \
@@ -3930,17 +4613,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Connector_Impl.h \
@@ -3975,6 +4651,11 @@ realclean:
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -4012,6 +4693,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -4037,8 +4720,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  ORB_Core.i \
@@ -4164,17 +4862,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  IIOP_Connection_Handler.h \
@@ -4295,6 +4986,11 @@ realclean:
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -4317,6 +5013,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -4345,8 +5043,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  ORB_Core.i \
@@ -4630,8 +5343,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -4647,6 +5358,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -4675,8 +5388,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  ORB_Core.i \
@@ -5219,8 +5947,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -5241,6 +5967,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -5285,8 +6013,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -5466,8 +6209,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -5488,6 +6229,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -5532,8 +6275,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -5664,17 +6422,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -5702,6 +6453,11 @@ realclean:
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -5727,6 +6483,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -5771,8 +6529,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -5794,6 +6567,9 @@ realclean:
  Single_Reactor.i \
  Priority_Mapping.h \
  Priority_Mapping.i \
+ Reactive_Flushing_Strategy.h \
+ Flushing_Strategy.h \
+ Block_Flushing_Strategy.h \
  $(ACE_ROOT)/ace/TP_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor.h \
  $(ACE_ROOT)/ace/Select_Reactor_T.h \
@@ -5939,17 +6715,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -6091,17 +6860,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -6911,8 +7673,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -7367,8 +8144,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -7633,8 +8425,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -7655,6 +8445,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -7714,8 +8506,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -7846,12 +8653,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -7903,6 +8708,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -7962,8 +8769,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -8128,12 +8950,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -8183,6 +9003,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -8242,8 +9064,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -8573,8 +9410,6 @@ realclean:
  Connector_Registry.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  params.h \
@@ -8608,6 +9443,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -8643,8 +9480,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -8666,12 +9518,10 @@ realclean:
  RT_Current.h \
  RT_Current.i \
  ORBInitInfo.h corbafwd.h PortableInterceptorC.h LocalObject.h \
- StringSeqC.h Sequence.h StringSeqC.i CodecFactory.h IOPC.h \
- ORBInitializer_Registry.h TAO_Singleton.h \
+ StringSeqC.h StringSeqC.i ORBInitializer_Registry.h TAO_Singleton.h \
  ORBInitializer_Registry.inl \
- CodecFactory_ORBInitializer.h RT_ORBInitializer.h \
- RT_PolicyFactory.h \
- Messaging_ORBInitializer.h BiDir_ORBInitializer.h ValueFactory_Map.h \
+ RT_ORBInitializer.h Messaging_ORBInitializer.h BiDir_ORBInitializer.h \
+ ValueFactory_Map.h \
  ValueFactory_Map.i \
  Object_KeyC.h \
  Object_KeyC.i \
@@ -8935,8 +9785,6 @@ realclean:
  Stub.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -8983,6 +9831,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -9042,8 +9892,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -9811,8 +10676,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -9988,7 +10868,7 @@ realclean:
  PollableC.i \
  MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \
  LocalObject.i \
- StringSeqC.h Sequence.h StringSeqC.i Invocation.h CDR.h Stub.h \
+ StringSeqC.h StringSeqC.i Invocation.h CDR.h Stub.h \
  Pluggable.h \
  Pluggable.i \
  MProfile.h \
@@ -10079,8 +10959,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -10236,7 +11131,136 @@ realclean:
  Exception.i \
  Typecode.i \
  Any.i \
- TimeBaseC.i
+ TimeBaseC.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i
+
+.obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp \
+ TimeBaseS.h \
+ $(ACE_ROOT)/ace/pre.h \
+ TimeBaseC.h \
+ Any.h \
+ CDR.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ CDR.i \
+ Environment.h \
+ Environment.i \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
+ Typecode.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.i \
+ 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 \
  Principal.h \
@@ -10561,25 +11585,10 @@ realclean:
  Profile.h \
  Tagged_Components.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -10587,14 +11596,27 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
@@ -10718,17 +11740,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -10739,6 +11754,11 @@ realclean:
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -10780,6 +11800,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -10838,8 +11860,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -10875,27 +11912,6 @@ realclean:
  Asynch_Invocation.i \
  ORB_Core.h Client_Strategy_Factory.h TAO_Export.h Sync_Strategies.h \
  Transport.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Transport.inl \
  TAOC.h \
  Sync_Strategies.i \
@@ -11196,8 +12212,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -11218,6 +12232,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -11277,8 +12293,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -11710,8 +12741,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -11732,6 +12761,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -11791,8 +12822,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -12205,8 +13251,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -12224,7 +13268,9 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  TAO_Singleton_Manager.h \
  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
@@ -12276,8 +13322,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -12435,8 +13496,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -12454,7 +13513,9 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  TAO_Singleton_Manager.h \
  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
@@ -12506,8 +13567,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -12639,14 +13715,7 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -12657,6 +13726,11 @@ realclean:
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -12698,6 +13772,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -12757,8 +13833,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -12787,33 +13878,11 @@ realclean:
  operation_details.i \
  target_specification.h Invocation_Endpoint_Selectors.h \
  Invocation_Endpoint_Selectors.i \
- Invocation.i Principal.h corbafwd.h OctetSeqC.h Sequence.h \
- OctetSeqC.i \
+ Invocation.i Principal.h corbafwd.h OctetSeqC.h OctetSeqC.i \
  Principal.i \
  Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  Dynamic_Adapter.h Object_KeyC.h debug.h Transport.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Transport.inl Pluggable.h Connector_Registry.h \
  Connector_Registry.i \
  Wait_Strategy.h Transport_Mux_Strategy.h Bind_Dispatcher_Guard.h \
@@ -12936,25 +14005,10 @@ realclean:
  Profile.h \
  Tagged_Components.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -12962,14 +14016,27 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
@@ -13014,6 +14081,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -13073,8 +14142,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -13211,25 +14295,10 @@ realclean:
  Profile.h \
  Tagged_Components.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -13237,14 +14306,27 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
@@ -13291,6 +14373,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -13350,8 +14434,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -13504,13 +14603,6 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -13521,6 +14613,11 @@ realclean:
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -13562,6 +14659,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -13621,8 +14720,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -13659,30 +14773,7 @@ realclean:
  Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  Transport_Mux_Strategy.h \
- Transport.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl \
- Asynch_Timeout_Handler.h
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/operation_details.o .obj/operation_details.so .shobj/operation_details.o .shobj/operation_details.so: operation_details.cpp \
  operation_details.h \
@@ -13784,25 +14875,10 @@ realclean:
  corbafwd.i \
  Service_Context.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -13810,6 +14886,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Service_Context.inl \
  target_specification.h \
@@ -13819,9 +14897,8 @@ realclean:
  operation_details.i
 
 .obj/PortableInterceptor.o .obj/PortableInterceptor.so .shobj/PortableInterceptor.o .shobj/PortableInterceptor.so: PortableInterceptor.cpp \
- PortableInterceptor.h \
- $(ACE_ROOT)/ace/pre.h \
  corbafwd.h \
+ $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -13916,6 +14993,7 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
+ PortableInterceptor.h \
  PortableInterceptorC.h \
  DynamicC.h \
  Any.h \
@@ -14064,9 +15142,9 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- PortableInterceptorC.h DynamicC.h \
+ PortableInterceptorC.h \
  corbafwd.h \
- Any.h \
+ DynamicC.h Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -14110,7 +15188,7 @@ realclean:
  PollableC.i \
  MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \
  LocalObject.i \
- StringSeqC.h Sequence.h StringSeqC.i Invocation.h CDR.h Stub.h \
+ StringSeqC.h StringSeqC.i Invocation.h CDR.h Stub.h \
  Pluggable.h \
  Pluggable.i \
  MProfile.h \
@@ -14201,8 +15279,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -14357,11 +15450,12 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
- DynamicC.i Any.h StringSeqC.h Sequence.h StringSeqC.i
+ DynamicC.i Any.h StringSeqC.h StringSeqC.i
 
 .obj/PortableInterceptorC.o .obj/PortableInterceptorC.so .shobj/PortableInterceptorC.o .shobj/PortableInterceptorC.so: PortableInterceptorC.cpp \
  PortableInterceptorC.h \
- $(ACE_ROOT)/ace/pre.h corbafwd.h \
+ $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -14456,9 +15550,7 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- DynamicC.h \
- corbafwd.h \
- Any.h \
+ DynamicC.h Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -14500,7 +15592,8 @@ realclean:
  IOPC.i \
  PollableC.h \
  PollableC.i \
- MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i CORBA_String.h \
+ MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i \
+ CORBA_String.h \
  CORBA_String.inl
 
 .obj/DynamicC.o .obj/DynamicC.so .shobj/DynamicC.o .shobj/DynamicC.so: DynamicC.cpp DynamicC.h \
@@ -14631,7 +15724,8 @@ realclean:
  StringSeqC.i
 
 .obj/OctetSeqC.o .obj/OctetSeqC.so .shobj/OctetSeqC.o .shobj/OctetSeqC.so: OctetSeqC.cpp OctetSeqC.h \
- $(ACE_ROOT)/ace/pre.h corbafwd.h \
+ $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -14727,12 +15821,10 @@ realclean:
  TAO_Export.h \
  corbafwd.i \
  Sequence.h \
- corbafwd.h \
  Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
  Sequence_T.h \
- Sequence.h \
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
@@ -14753,11 +15845,11 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  Exception.i \
  Typecode.i \
- Any.i CDR.h \
- Typecode.h
+ Any.i
 
 .obj/StringSeqC.o .obj/StringSeqC.so .shobj/StringSeqC.o .shobj/StringSeqC.so: StringSeqC.cpp StringSeqC.h \
- $(ACE_ROOT)/ace/pre.h corbafwd.h \
+ $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -14853,17 +15945,16 @@ realclean:
  TAO_Export.h \
  corbafwd.i \
  Sequence.h \
- corbafwd.h \
  Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
  Sequence_T.h \
- Sequence.h \
  Sequence_T.i \
  Sequence_T.cpp \
  Environment.h \
  Environment.i \
- StringSeqC.i Any.h \
+ StringSeqC.i \
+ Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -14879,8 +15970,7 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  Exception.i \
  Typecode.i \
- Any.i CDR.h \
- Typecode.h
+ Any.i
 
 .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \
  $(ACE_ROOT)/ace/pre.h corbafwd.h \
@@ -15024,8 +16114,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -15043,7 +16131,9 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  TAO_Singleton_Manager.h \
  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
@@ -15095,8 +16185,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h RTCORBAC.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -15141,27 +16246,6 @@ realclean:
  Acceptor_Registry.i \
  Sync_Strategies.h \
  Transport.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Transport.inl \
  TAOC.h \
  Priority_Mapping_Manager.h \
@@ -15196,7 +16280,7 @@ realclean:
  Invocation.i RT_Invocation_Endpoint_Selectors.h \
  Invocation_Endpoint_Selectors.h \
  RT_Invocation_Endpoint_Selectors.i \
- IORInfo.h LocalObject.h
+ IORInfo.h LocalObject.h Flushing_Strategy.h
 
 .obj/ORB_Table.o .obj/ORB_Table.so .shobj/ORB_Table.o .shobj/ORB_Table.so: ORB_Table.cpp ORB_Table.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -15375,14 +16459,14 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
  params.h params.i \
  TAO_Singleton_Manager.h TAO_Singleton.h Adapter.h Adapter.i \
- PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h DynamicC.i \
+ PolicyFactory_Registry.h PortableInterceptorC.h DynamicC.h \
+ Any.h \
+ Any.i DynamicC.i \
  MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
@@ -15412,8 +16496,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h RTCORBAC.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -15568,8 +16667,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -15590,6 +16687,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -15649,8 +16748,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -15993,17 +17107,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -16015,6 +17122,11 @@ realclean:
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -16040,6 +17152,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -16099,8 +17213,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -16318,65 +17447,6 @@ realclean:
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  Exception.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/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Transport.inl \
  TAOC.h \
  PolicyC.h \
@@ -16445,6 +17515,10 @@ realclean:
  Policy_Manager.h \
  Policy_Manager.i \
  Resource_Factory.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
  Protocol_Factory.h \
  params.h \
  params.i \
@@ -16453,6 +17527,11 @@ realclean:
  TAO_Singleton.h \
  TAO_Singleton.inl \
  TAO_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 \
  Adapter.h \
  Adapter.i \
  PolicyFactory_Registry.h \
@@ -16472,6 +17551,21 @@ realclean:
  $(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_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  Parser_Registry.h \
  Parser_Registry.i \
  Service_Callbacks.h \
@@ -16479,6 +17573,14 @@ realclean:
  Fault_Tolerance_Service.h \
  Fault_Tolerance_Service.i \
  Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  Cache_Entries.h \
  Connection_Descriptor_Interface.h \
  Endpoint.h \
@@ -16492,8 +17594,29 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
  Stub.i
 
@@ -16650,17 +17773,10 @@ realclean:
  Exception.i \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -16668,9 +17784,35 @@ realclean:
  IIOP_Factory.h CORBANAME_Parser.h \
  IOR_Parser.h \
  IOR_Parser.i \
- CORBANAME_Parser.i CORBALOC_Parser.h CORBALOC_Parser.i FILE_Parser.h \
- FILE_Parser.i DLL_Parser.h DLL_Parser.i Object_Loader.h \
- Object_Loader.i
+ CORBANAME_Parser.i CORBALOC_Parser.h \
+ ORB.h \
+ Services.h \
+ Services.i \
+ CORBA_String.h \
+ CORBA_String.inl \
+ PolicyC.h \
+ CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
+ CurrentC.i \
+ Encodable.h \
+ PolicyC.i \
+ ORB.i \
+ MProfile.h \
+ Profile.h \
+ Tagged_Components.h \
+ CONV_FRAMEC.h \
+ CONV_FRAMEC.i \
+ Tagged_Components.i \
+ GIOP_Message_State.h \
+ GIOP_Message_State.i \
+ Profile.i \
+ MProfile.i \
+ CORBALOC_Parser.i FILE_Parser.h FILE_Parser.i DLL_Parser.h \
+ DLL_Parser.i Object_Loader.h Object_Loader.i
 
 .obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp \
  TAO_Server_Request.h \
@@ -16774,23 +17916,10 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  Tagged_Profile.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -16798,6 +17927,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  GIOPC.h \
  Object_KeyC.h \
@@ -16808,11 +17939,18 @@ realclean:
  OctetSeqC.i \
  Service_Context.h \
  Service_Context.inl \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  TAO_Server_Request.i \
  Principal.h \
  Principal.i \
  ORB_Core.h \
  ORB.h \
+ Exception.h \
+ Exception.i \
  Services.h \
  Services.i \
  CORBA_String.h \
@@ -16821,6 +17959,8 @@ realclean:
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  ORB.i \
  Policy_Manager.h \
@@ -16852,6 +17992,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -16911,8 +18053,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -16931,29 +18088,7 @@ realclean:
  Pluggable_Messaging.i \
  GIOP_Utils.h \
  GIOP_Utils.i \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.cpp \
  Typecode.h \
@@ -17198,8 +18333,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -17384,8 +18534,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -17406,6 +18554,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -17465,8 +18615,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -17681,65 +18846,6 @@ realclean:
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  Exception.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/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
  Transport.inl
 
 .obj/Wait_On_Reactor.o .obj/Wait_On_Reactor.so .shobj/Wait_On_Reactor.o .shobj/Wait_On_Reactor.so: Wait_On_Reactor.cpp \
@@ -17888,8 +18994,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -17910,6 +19014,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -17969,8 +19075,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -17980,29 +19101,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/Wait_On_Leader_Follower.o .obj/Wait_On_Leader_Follower.so .shobj/Wait_On_Leader_Follower.o .shobj/Wait_On_Leader_Follower.so: Wait_On_Leader_Follower.cpp \
  Wait_On_Leader_Follower.h \
@@ -18150,8 +19249,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -18172,6 +19269,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -18231,8 +19330,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -18245,29 +19359,7 @@ realclean:
  Leader_Follower.h \
  Leader_Follower.i \
  debug.h \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/Transport_Mux_Strategy.o .obj/Transport_Mux_Strategy.so .shobj/Transport_Mux_Strategy.o .shobj/Transport_Mux_Strategy.so: Transport_Mux_Strategy.cpp \
  Transport_Mux_Strategy.h \
@@ -18282,7 +19374,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -18373,20 +19464,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -18394,6 +19471,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i
@@ -18412,7 +19491,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -18503,20 +19581,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -18524,6 +19588,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Reply_Dispatcher.h \
  Reply_Dispatcher.i \
@@ -18531,65 +19597,9 @@ realclean:
  Pluggable_Messaging_Utils.i \
  debug.h \
  Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Transport.inl
 
 .obj/Muxed_TMS.o .obj/Muxed_TMS.so .shobj/Muxed_TMS.o .shobj/Muxed_TMS.so: Muxed_TMS.cpp \
@@ -18606,7 +19616,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -18697,20 +19706,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -18718,6 +19713,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -18733,6 +19730,8 @@ realclean:
  $(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 \
@@ -18755,37 +19754,7 @@ realclean:
  Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i \
  Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
+ Exception.i \
  Transport.inl
 
 .obj/Reply_Dispatcher.o .obj/Reply_Dispatcher.so .shobj/Reply_Dispatcher.o .shobj/Reply_Dispatcher.so: Reply_Dispatcher.cpp \
@@ -18801,7 +19770,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -18892,20 +19860,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -18913,6 +19867,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Reply_Dispatcher.i
 
@@ -18930,7 +19886,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -19021,20 +19976,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -19042,20 +19983,33 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Reply_Dispatcher.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
  ORB_Core.h \
  ORB.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Services.h \
  Services.i \
  CORBA_String.h \
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  ORB.i \
  Policy_Manager.h \
@@ -19087,6 +20041,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -19146,8 +20102,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -19160,29 +20131,7 @@ realclean:
  Wait_Strategy.h \
  Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/Asynch_Reply_Dispatcher.o .obj/Asynch_Reply_Dispatcher.so .shobj/Asynch_Reply_Dispatcher.o .shobj/Asynch_Reply_Dispatcher.so: Asynch_Reply_Dispatcher.cpp \
  Asynch_Reply_Dispatcher.h \
@@ -19214,7 +20163,6 @@ realclean:
  Reply_Dispatcher.h \
  IOPC.h \
  TAO_Export.h \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -19289,20 +20237,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -19310,14 +20244,29 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Reply_Dispatcher.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
+ Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
  ValueFactory.i \
+ Any.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object.i \
+ Typecode.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.i \
+ Any.i \
  TimeBaseC.h \
  TimeBaseC.i \
  PolicyC.h \
@@ -19415,8 +20364,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -19429,36 +20393,11 @@ realclean:
  Leader_Follower.h \
  Leader_Follower.i \
  debug.h \
- Transport.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl \
- Asynch_Timeout_Handler.h
+ Transport.h corbafwd.h Exception.h Transport.inl
 
-.obj/Asynch_Timeout_Handler.o .obj/Asynch_Timeout_Handler.so .shobj/Asynch_Timeout_Handler.o .shobj/Asynch_Timeout_Handler.so: Asynch_Timeout_Handler.cpp \
- Asynch_Timeout_Handler.h \
+.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \
  $(ACE_ROOT)/ace/pre.h \
- orbconf.h \
- $(ACE_ROOT)/ace/OS.h \
+ TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -19467,6 +20406,14 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
+ CDR.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
@@ -19477,12 +20424,8 @@ realclean:
  $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/Flag_Manip.h \
  $(ACE_ROOT)/ace/Flag_Manip.i \
  $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -19494,11 +20437,6 @@ realclean:
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Event_Handler.i \
- TAO_Export.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
@@ -19529,6 +20467,8 @@ realclean:
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -19549,31 +20489,23 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  try_macros.h \
+ orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  varbase.h \
  corbafwd.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- Asynch_Reply_Dispatcher.h \
- Reply_Dispatcher.h \
- IOPC.h \
- Any.h \
- CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ IOPC.i Any.h \
  Object.h \
  Abstract_Servant_Base.h \
  Object_Proxy_Broker.h \
@@ -19585,37 +20517,11 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  Exception.i \
  Typecode.i \
- Any.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- IOPC.i \
- Reply_Dispatcher.i \
- MessagingC.h \
- Remote_Object_Proxy_Impl.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- PolicyC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i \
- Asynch_Reply_Dispatcher.i \
- Transport_Mux_Strategy.h
+ Any.i
 
-.obj/IOPC.o .obj/IOPC.so .shobj/IOPC.o .shobj/IOPC.so: IOPC.cpp IOPC.h \
- $(ACE_ROOT)/ace/pre.h TAO_Export.h \
+.obj/IOPS.o .obj/IOPS.so .shobj/IOPS.o .shobj/IOPS.so: IOPS.cpp IOPS.h \
+ $(ACE_ROOT)/ace/pre.h IOPC.h \
+ TAO_Export.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
@@ -19623,7 +20529,7 @@ realclean:
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl Any.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -19710,34 +20616,20 @@ realclean:
  orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  varbase.h \
- TAO_Export.h \
  corbafwd.i \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i Object.h \
- Exception.h CDR.h Sequence.h \
+ Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
  Sequence_T.h \
- Sequence.h \
  Sequence_T.i \
  Sequence_T.cpp \
- IOPC.i Typecode.h
+ Environment.h \
+ Environment.i \
+ IOPC.i IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i
 
 .obj/PollableC.o .obj/PollableC.so .shobj/PollableC.o .shobj/PollableC.so: PollableC.cpp PollableC.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -19863,8 +20755,6 @@ realclean:
  Typecode.h \
  Typecode.i \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -19916,6 +20806,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -19974,8 +20866,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -20008,6 +20915,118 @@ realclean:
  Invocation_Endpoint_Selectors.i \
  Invocation.i
 
+.obj/PollableS.o .obj/PollableS.so .shobj/PollableS.o .shobj/PollableS.so: PollableS.cpp PollableS.h PollableC.h \
+ $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ CDR.i PollableC.i \
+ PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i
+
 .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \
  CONV_FRAMEC.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -20134,6 +21153,124 @@ realclean:
  Typecode.i \
  Any.i
 
+.obj/CONV_FRAMES.o .obj/CONV_FRAMES.so .shobj/CONV_FRAMES.o .shobj/CONV_FRAMES.so: CONV_FRAMES.cpp \
+ CONV_FRAMES.h \
+ $(ACE_ROOT)/ace/pre.h \
+ CONV_FRAMEC.h \
+ CDR.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
+ CONV_FRAMEC.i \
+ CONV_FRAMES_T.h \
+ CONV_FRAMES_T.i \
+ CONV_FRAMES_T.cpp \
+ CONV_FRAMES.i
+
 .obj/Tagged_Components.o .obj/Tagged_Components.so .shobj/Tagged_Components.o .shobj/Tagged_Components.so: Tagged_Components.cpp \
  Tagged_Components.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -20147,7 +21284,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -20238,20 +21374,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -20259,6 +21381,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  CONV_FRAMEC.h \
  CONV_FRAMEC.i \
@@ -20266,8 +21390,19 @@ realclean:
  Profile.h \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
@@ -20308,6 +21443,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -20367,8 +21504,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -20392,7 +21544,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -20483,20 +21634,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -20504,6 +21641,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Service_Context.inl
 
@@ -20606,13 +21745,24 @@ realclean:
  TAO_Export.h \
  corbafwd.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ IOPC.i \
+ Object_KeyC.h \
+ Object_KeyC.i \
+ GIOPC.i \
+ Any.h \
  Object.h \
  Abstract_Servant_Base.h \
  Object_Proxy_Broker.h \
@@ -20624,7 +21774,110 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  Exception.i \
  Typecode.i \
- Any.i \
+ Any.i
+
+.obj/GIOPS.o .obj/GIOPS.so .shobj/GIOPS.o .shobj/GIOPS.so: GIOPS.cpp GIOPS.h GIOPC.h \
+ $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ IOPC.h \
+ CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ CDR.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -20632,10 +21885,15 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Object_KeyC.h \
  Object_KeyC.i \
- GIOPC.i
+ GIOPC.i GIOPS_T.h \
+ GIOPS_T.i \
+ GIOPS_T.cpp \
+ GIOPS.i
 
 .obj/BoundsC.o .obj/BoundsC.so .shobj/BoundsC.o .shobj/BoundsC.so: BoundsC.cpp \
  BoundsC.h \
@@ -20896,11 +22154,113 @@ realclean:
  LocalObject.h \
  LocalObject.i \
  Priority_Mapping_Manager.i \
- TAOC.i
+ TAOC.i TAOS.h \
+ TAOS_T.h \
+ TAOS_T.i \
+ TAOS_T.cpp \
+ TAOS.i
+
+.obj/TAOS.o .obj/TAOS.so .shobj/TAOS.o .shobj/TAOS.so: TAOS.cpp TAOS.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.i \
+ TAOS_T.h TAOS_T.i TAOS_T.cpp TAOS.i
 
 .obj/Object_Loader.o .obj/Object_Loader.so .shobj/Object_Loader.o .shobj/Object_Loader.so: Object_Loader.cpp Object_Loader.h \
  $(ACE_ROOT)/ace/pre.h \
- Exception.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/post.h \
@@ -20996,9 +22356,6 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
@@ -21480,8 +22837,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -21500,6 +22855,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -21559,8 +22916,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -21695,7 +23067,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -21786,20 +23157,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -21807,12 +23164,25 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Service_Callbacks.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i
 
 .obj/Parser_Registry.o .obj/Parser_Registry.so .shobj/Parser_Registry.o .shobj/Parser_Registry.so: Parser_Registry.cpp \
@@ -21963,8 +23333,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -21985,6 +23353,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -22042,8 +23412,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -22577,22 +23962,7 @@ realclean:
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
  IOR_Parser.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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- CORBALOC_Parser.i ORB_Core.h corbafwd.h ORB.h \
+ ORB.h \
  Services.h \
  Sequence.h \
  Managed_Types.h \
@@ -22623,16 +23993,40 @@ realclean:
  Typecode.i \
  PolicyC.i \
  ORB.i \
- Environment.h Policy_Manager.h \
+ MProfile.h \
+ Profile.h \
+ Tagged_Components.h \
+ IOPC.h \
+ IOPC.i \
+ CONV_FRAMEC.h \
+ CONV_FRAMEC.i \
+ Tagged_Components.i \
+ GIOP_Message_State.h \
+ GIOP_Message_State.i \
+ Profile.i \
+ MProfile.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/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ CORBALOC_Parser.i ORB_Core.h corbafwd.h ORB.h Environment.h \
+ Policy_Manager.h \
  LocalObject.h \
  LocalObject.i \
  Policy_Manager.i \
  Resource_Factory.h \
  Pluggable.h \
- IOPC.h \
- Any.h \
- Any.i \
- IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
  params.h params.i \
@@ -22649,7 +24043,9 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  TAO_Singleton_Manager.h \
  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
@@ -22686,8 +24082,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h RTCORBAC.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -22697,22 +24108,17 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i Stub.h \
- MProfile.h \
- Profile.h \
- Tagged_Components.h \
- CONV_FRAMEC.h \
- CONV_FRAMEC.i \
- Tagged_Components.i \
- GIOP_Message_State.h \
- GIOP_Message_State.i \
- Profile.i \
- MProfile.i \
- ORB.h \
  ORB_Core.h \
- Stub.i MProfile.h \
+ Stub.i \
  Connector_Registry.h \
  params.h \
- Connector_Registry.i
+ Connector_Registry.i \
+ IIOP_Endpoint.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ IIOP_Endpoint.i
 
 .obj/CORBANAME_Parser.o .obj/CORBANAME_Parser.so .shobj/CORBANAME_Parser.o .shobj/CORBANAME_Parser.so: CORBANAME_Parser.cpp CORBANAME_Parser.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -22853,14 +24259,7 @@ realclean:
  Typecode.h \
  Typecode.i \
  IOPC.h \
- Any.h \
  CDR.h \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -22871,6 +24270,11 @@ realclean:
  Tagged_Components.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
@@ -22908,6 +24312,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -22952,8 +24358,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -23085,25 +24506,10 @@ realclean:
  Bind_Dispatcher_Guard.i \
  Reply_Dispatcher.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -23111,6 +24517,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Reply_Dispatcher.i \
  Transport_Mux_Strategy.h
@@ -23218,23 +24626,10 @@ realclean:
  Fault_Tolerance_Service.i \
  Service_Callbacks.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -23242,6 +24637,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Service_Callbacks.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
@@ -23255,14 +24652,23 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  ORB_Core.h \
  ORB.h \
+ Exception.h \
+ Exception.i \
  Services.h \
  Services.i \
  CORBA_String.h \
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  ORB.i \
  Policy_Manager.h \
@@ -23290,6 +24696,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -23345,8 +24753,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -23604,9 +25027,9 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- PortableInterceptorC.h DynamicC.h \
+ PortableInterceptorC.h \
  corbafwd.h \
- Any.h \
+ DynamicC.h Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -23650,8 +25073,7 @@ realclean:
  PollableC.i \
  MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \
  LocalObject.i \
- StringSeqC.h Sequence.h StringSeqC.i CodecFactory.h TAO_Export.h \
- ORB_Core.h ORB.h \
+ StringSeqC.h StringSeqC.i ORB_Core.h ORB.h \
  Services.h \
  Services.i \
  CORBA_String.h \
@@ -23724,8 +25146,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h RTCORBAC.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -23747,7 +25184,8 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- PortableInterceptorC.h corbafwd.h \
+ PortableInterceptorC.h \
+ corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23834,9 +25272,7 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- DynamicC.h \
- corbafwd.h \
- Any.h \
+ DynamicC.h Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -23994,9 +25430,9 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- PortableInterceptorC.h DynamicC.h \
+ PortableInterceptorC.h \
  corbafwd.h \
- Any.h \
+ DynamicC.h Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -24457,8 +25893,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -24479,6 +25913,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -24507,8 +25943,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -24816,9 +26267,9 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i \
- PortableInterceptorC.h DynamicC.h \
+ PortableInterceptorC.h \
  corbafwd.h \
- Any.h \
+ DynamicC.h Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
@@ -25369,8 +26820,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -25669,8 +27135,6 @@ realclean:
  Stub.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  MProfile.h \
@@ -25715,6 +27179,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -25774,8 +27240,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -25788,424 +27269,6 @@ realclean:
  Stub.i \
  debug.h
 
-.obj/CodecFactory.o .obj/CodecFactory.so .shobj/CodecFactory.o .shobj/CodecFactory.so: CodecFactory.cpp CodecFactory.h \
- $(ACE_ROOT)/ace/pre.h TAO_Export.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl IOPC.h \
- Any.h CDR.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i Object.h \
- Exception.h CDR.h Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence.h \
- Sequence_T.i \
- Sequence_T.cpp \
- IOPC.i LocalObject.h \
- LocalObject.i \
- CDR_Encaps_Codec.h
-
-.obj/CodecFactory_ORBInitializer.o .obj/CodecFactory_ORBInitializer.so .shobj/CodecFactory_ORBInitializer.o .shobj/CodecFactory_ORBInitializer.so: CodecFactory_ORBInitializer.cpp \
- CodecFactory_ORBInitializer.h \
- $(ACE_ROOT)/ace/pre.h TAO_Export.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- PortableInterceptorC.h corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- DynamicC.h \
- corbafwd.h \
- Any.h \
- CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
- ValueBase.h \
- ValueBase.i \
- ValueFactory.h \
- ValueFactory.i \
- TimeBaseC.h \
- TimeBaseC.i \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- PolicyC.i \
- IOPC.h \
- IOPC.i \
- PollableC.h \
- PollableC.i \
- MessagingC.i CurrentC.h IOPC.h PortableInterceptorC.i LocalObject.h \
- LocalObject.i \
- CodecFactory.h
-
-.obj/CDR_Encaps_Codec.o .obj/CDR_Encaps_Codec.so .shobj/CDR_Encaps_Codec.o .shobj/CDR_Encaps_Codec.so: CDR_Encaps_Codec.cpp CDR.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.i \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- CDR.i OctetSeqC.h \
- corbafwd.h Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence.h \
- Sequence_T.i \
- Sequence_T.cpp \
- Environment.h \
- Environment.i \
- OctetSeqC.i Any.h \
- CDR.h \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i Typecode.h \
- Marshal.h \
- Principal.h \
- OctetSeqC.h \
- Principal.i \
- Any.h \
- ORB.h \
- Services.h \
- Services.i \
- CORBA_String.h \
- CORBA_String.inl \
- PolicyC.h \
- CurrentC.h \
- CurrentC.i \
- Encodable.h \
- PolicyC.i \
- ORB.i \
- Marshal.i \
- CDR_Encaps_Codec.h TAO_Export.h IOPC.h Object.h Exception.h IOPC.i \
- LocalObject.h \
- LocalObject.i
-
 .obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \
  Services.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -26481,113 +27544,6 @@ realclean:
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 
-.obj/IFR_Client_Adapter.o .obj/IFR_Client_Adapter.so .shobj/IFR_Client_Adapter.o .shobj/IFR_Client_Adapter.so: IFR_Client_Adapter.cpp \
- IFR_Client_Adapter.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- varbase.h \
- TAO_Export.h \
- corbafwd.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/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
- $(ACE_ROOT)/ace/Dynamic_Service.i \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-
 .obj/Dynamic_Adapter.o .obj/Dynamic_Adapter.so .shobj/Dynamic_Adapter.o .shobj/Dynamic_Adapter.so: Dynamic_Adapter.cpp \
  Dynamic_Adapter.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -26733,8 +27689,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -26755,6 +27709,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -26814,8 +27770,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -27066,8 +28037,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -27244,8 +28230,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -27266,6 +28250,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -27325,8 +28311,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -27587,8 +28588,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -28167,8 +29183,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -28279,25 +29310,10 @@ realclean:
  TAO_Export.h \
  corbafwd.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -28305,13 +29321,28 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  TimeBaseC.h \
+ Any.h \
+ Any.i \
  TimeBaseC.i \
  RTCORBAC.i \
  Priority_Mapping.i
@@ -28417,25 +29448,10 @@ realclean:
  Priority_Mapping.h \
  RTCORBAC.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -28443,13 +29459,28 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  TimeBaseC.h \
+ Any.h \
+ Any.i \
  TimeBaseC.i \
  RTCORBAC.i \
  Priority_Mapping.i \
@@ -28484,7 +29515,11 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- RTCORBAC.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPC.h \
+ TAO_Export.h \
+ CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -28554,16 +29589,27 @@ realclean:
  try_macros.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  varbase.h \
- TAO_Export.h \
  corbafwd.i \
- IOPC.h \
- Any.h \
- CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ IOPC.i \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseC.h \
+ Any.h \
  Object.h \
  Abstract_Servant_Base.h \
  Object_Proxy_Broker.h \
@@ -28576,22 +29622,22 @@ realclean:
  Exception.i \
  Typecode.i \
  Any.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- IOPC.i \
+ TimeBaseC.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAC.h \
  PolicyC.h \
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
- TimeBaseC.h \
- TimeBaseC.i \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  LocalObject.h \
  LocalObject.i \
  RT_Current.i \
@@ -28737,7 +29783,11 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- RTCORBAC.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPC.h \
+ TAO_Export.h \
+ CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -28807,16 +29857,27 @@ realclean:
  try_macros.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  varbase.h \
- TAO_Export.h \
  corbafwd.i \
- IOPC.h \
- Any.h \
- CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ IOPC.i \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseC.h \
+ Any.h \
  Object.h \
  Abstract_Servant_Base.h \
  Object_Proxy_Broker.h \
@@ -28829,22 +29890,22 @@ realclean:
  Exception.i \
  Typecode.i \
  Any.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- IOPC.i \
+ TimeBaseC.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAC.h \
  PolicyC.h \
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
- TimeBaseC.h \
- TimeBaseC.i \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  LocalObject.h \
  LocalObject.i \
  RT_ORB.h \
@@ -28904,7 +29965,11 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- RTCORBAC.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPC.h \
+ TAO_Export.h \
+ CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -28974,16 +30039,27 @@ realclean:
  try_macros.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  varbase.h \
- TAO_Export.h \
  corbafwd.i \
- IOPC.h \
- Any.h \
- CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ IOPC.i \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseC.h \
+ Any.h \
  Object.h \
  Abstract_Servant_Base.h \
  Object_Proxy_Broker.h \
@@ -28996,22 +30072,22 @@ realclean:
  Exception.i \
  Typecode.i \
  Any.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- IOPC.i \
+ TimeBaseC.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAC.h \
  PolicyC.h \
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
- TimeBaseC.h \
- TimeBaseC.i \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  LocalObject.h \
  LocalObject.i \
  RT_Policy_i.i \
@@ -29141,7 +30217,11 @@ realclean:
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- RTCORBAC.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPC.h \
+ TAO_Export.h \
+ CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -29211,16 +30291,27 @@ realclean:
  try_macros.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  varbase.h \
- TAO_Export.h \
  corbafwd.i \
- IOPC.h \
- Any.h \
- CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ IOPC.i \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseC.h \
+ Any.h \
  Object.h \
  Abstract_Servant_Base.h \
  Object_Proxy_Broker.h \
@@ -29233,22 +30324,22 @@ realclean:
  Exception.i \
  Typecode.i \
  Any.i \
- Sequence.h \
- Managed_Types.h \
- Managed_Types.i \
- Sequence.i \
- Sequence_T.h \
- Sequence_T.i \
- Sequence_T.cpp \
- IOPC.i \
+ TimeBaseC.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAC.h \
  PolicyC.h \
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
- TimeBaseC.h \
- TimeBaseC.i \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  LocalObject.h \
  LocalObject.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
@@ -29427,8 +30518,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -29449,6 +30538,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -29508,8 +30599,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -29523,7 +30629,11 @@ realclean:
  Object_Loader.i \
  RT_ORB.h RT_ORB.i \
  RT_Current.h \
- RT_Current.i
+ RT_Current.i \
+ Priority_Mapping_Manager.h \
+ Priority_Mapping.h \
+ Priority_Mapping.i \
+ Priority_Mapping_Manager.i
 
 .obj/RT_Protocols_Hooks.o .obj/RT_Protocols_Hooks.so .shobj/RT_Protocols_Hooks.o .shobj/RT_Protocols_Hooks.so: RT_Protocols_Hooks.cpp RT_Protocols_Hooks.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -29668,8 +30778,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -29687,7 +30795,9 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  TAO_Singleton_Manager.h \
  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
@@ -29739,8 +30849,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -29997,8 +31122,6 @@ realclean:
  Resource_Factory.h \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -30014,6 +31137,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -30050,8 +31175,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  ORB_Core.i \
@@ -30162,41 +31302,264 @@ realclean:
  varbase.h \
  TAO_Export.h \
  corbafwd.i IOPC.h \
- TAO_Export.h Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
+ Sequence.h \
+ Managed_Types.h \
+ Managed_Types.i \
+ Sequence.i \
+ Sequence_T.h \
+ Sequence_T.i \
+ Sequence_T.cpp \
  Environment.h \
  Environment.i \
+ IOPC.i PolicyC.h \
+ CurrentC.h \
  Object.h \
  Abstract_Servant_Base.h \
  Object_Proxy_Broker.h \
  Object_Proxy_Impl.h \
  Object.i \
- Typecode.h \
+ CurrentC.i \
+ Encodable.h \
  Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  Exception.i \
+ Typecode.h \
  Typecode.i \
- Any.i Object.h \
- Exception.h CDR.h Sequence.h \
+ PolicyC.i \
+ TimeBaseC.h Any.h \
+ Any.i \
+ TimeBaseC.i \
+ RTCORBAC.i TAOS.h \
+ TAOS_T.h \
+ TAOS_T.i \
+ TAOS_T.cpp \
+ TAOS.i \
+ RequestInfo_Util.h \
+ DynamicC.h \
+ DynamicC.i
+
+.obj/RTCORBAS.o .obj/RTCORBAS.so .shobj/RTCORBAS.o .shobj/RTCORBAS.so: RTCORBAS.cpp \
+ orbconf.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i RTCORBAS.h \
+ orbconf.h IOPS.h IOPC.h \
+ TAO_Export.h \
+ CDR.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ corbafwd.i \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ CDR.i \
+ Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
  Sequence.i \
  Sequence_T.h \
- Sequence.h \
  Sequence_T.i \
  Sequence_T.cpp \
- IOPC.i PolicyC.h \
+ Environment.h \
+ Environment.i \
+ IOPC.i IOPS_T.h IOPS_T.i IOPS_T.cpp IOPS.i TimeBaseS.h \
+ TimeBaseC.h \
+ Any.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
+ Typecode.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
+ Typecode.i \
+ Any.i \
+ TimeBaseC.i \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAC.h \
+ PolicyC.h \
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
  PolicyC.i \
- TimeBaseC.h Any.h \
- TimeBaseC.i \
- RTCORBAC.i
+ TimeBaseC.h RTCORBAC.i RTCORBAS_T.h RTCORBAS_T.i RTCORBAS_T.cpp \
+ RTCORBAS.i \
+ PortableServer/Object_Adapter.h \
+ PortableServer/portableserver_export.h \
+ PortableServer/Key_Adapters.h \
+ PortableServer/PortableServerC.h \
+ PortableServer/PortableServerC.i \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ PortableServer/Key_Adapters.i \
+ PortableServer/poa_macros.h \
+ PortableServer/RTPortableServerC.h \
+ RTCORBAC.h \
+ PortableServer/RTPortableServerC.i \
+ PortableServer/Servant_Base.h \
+ PortableServer/Servant_Base.i \
+ PortableServer/Active_Object_Map.h \
+ Server_Strategy_Factory.h \
+ PortableServer/Active_Object_Map.i \
+ Adapter.h \
+ Adapter.i \
+ LocalObject.h \
+ LocalObject.i \
+ PortableServer/Object_Adapter.i \
+ PortableServer/Operation_Table.h \
+ TAO_Singleton.h \
+ TAO_Singleton.inl \
+ TAO_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_Singleton_Manager.h \
+ TAO_Singleton_Manager.inl \
+ RequestInfo_Util.h \
+ DynamicC.h \
+ DynamicC.i
 
 .obj/RT_PolicyFactory.o .obj/RT_PolicyFactory.so .shobj/RT_PolicyFactory.o .shobj/RT_PolicyFactory.so: RT_PolicyFactory.cpp \
  RT_PolicyFactory.h \
@@ -30347,8 +31710,23 @@ realclean:
  LocalObject.h \
  LocalObject.i \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i
 
 .obj/RT_ORBInitializer.o .obj/RT_ORBInitializer.so .shobj/RT_ORBInitializer.o .shobj/RT_ORBInitializer.so: RT_ORBInitializer.cpp \
@@ -30503,6 +31881,21 @@ realclean:
  RTCORBAC.h \
  RTCORBAC.i \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  RT_Protocols_Hooks.h \
  Protocols_Hooks.h \
@@ -30594,19 +31987,7 @@ realclean:
  Priority_Mapping_Manager.h \
  Priority_Mapping.h \
  Priority_Mapping.i \
- Priority_Mapping_Manager.i \
- RT_ORB_Loader.h \
- Object_Loader.h \
- Object_Loader.i \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Svc_Conf.h \
- $(ACE_ROOT)/ace/Obstack.h \
- $(ACE_ROOT)/ace/Obstack.i \
- $(ACE_ROOT)/ace/Parse_Node.h \
- $(ACE_ROOT)/ace/Parse_Node.i
+ Priority_Mapping_Manager.i
 
 .obj/Private_Connection_Descriptor.o .obj/Private_Connection_Descriptor.so .shobj/Private_Connection_Descriptor.o .shobj/Private_Connection_Descriptor.so: Private_Connection_Descriptor.cpp \
  Private_Connection_Descriptor.h \
@@ -30712,6 +32093,113 @@ realclean:
  Connection_Descriptor_Interface.inl \
  Private_Connection_Descriptor.inl
 
+.obj/IFR_Client_Adapter.o .obj/IFR_Client_Adapter.so .shobj/IFR_Client_Adapter.o .shobj/IFR_Client_Adapter.so: IFR_Client_Adapter.cpp \
+ IFR_Client_Adapter.h \
+ $(ACE_ROOT)/ace/pre.h \
+ corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ try_macros.h \
+ orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ varbase.h \
+ TAO_Export.h \
+ corbafwd.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/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service_Base.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+
 .obj/IFR_TypeCodes.o .obj/IFR_TypeCodes.so .shobj/IFR_TypeCodes.o .shobj/IFR_TypeCodes.so: IFR_TypeCodes.cpp \
  corbafwd.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -30824,7 +32312,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -30915,20 +32402,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -30936,11 +32409,19 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Pluggable_Messaging_Utils.i \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Pluggable_Messaging.i \
  debug.h \
  Pluggable.h \
+ Typecode.h \
+ Typecode.i \
  Pluggable.i
 
 .obj/Pluggable_Messaging_Utils.o .obj/Pluggable_Messaging_Utils.so .shobj/Pluggable_Messaging_Utils.o .shobj/Pluggable_Messaging_Utils.so: Pluggable_Messaging_Utils.cpp \
@@ -30956,7 +32437,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -31047,20 +32527,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -31068,18 +32534,31 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Pluggable_Messaging_Utils.i \
  ORB_Core.h \
  ORB.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Services.h \
  Services.i \
  CORBA_String.h \
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  ORB.i \
  Policy_Manager.h \
@@ -31111,6 +32590,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -31170,8 +32651,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -31196,7 +32692,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -31287,20 +32782,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -31308,8 +32789,14 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Pluggable_Messaging_Utils.i \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Pluggable_Messaging.i \
  GIOP_Message_Generator_Parser_Impl.h \
  GIOP_Message_Generator_Parser_11.h \
@@ -31326,6 +32813,11 @@ realclean:
  GIOP_Message_State.i \
  GIOP_Message_Handler.inl \
  GIOP_Utils.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  GIOP_Utils.i \
  GIOP_Message_Base.i \
  operation_details.h \
@@ -31337,6 +32829,8 @@ realclean:
  target_specification.i \
  operation_details.i \
  GIOP_Utils.h Pluggable.h \
+ Typecode.h \
+ Typecode.i \
  Pluggable.i \
  debug.h ORB_Core.h corbafwd.h ORB.h \
  Services.h \
@@ -31374,7 +32868,9 @@ realclean:
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  TAO_Singleton_Manager.h \
  Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \
- DynamicC.h DynamicC.i MessagingC.h Remote_Object_Proxy_Impl.h \
+ DynamicC.h Any.h \
+ Any.i DynamicC.i \
+ MessagingC.h Remote_Object_Proxy_Impl.h \
  ValueBase.h \
  ValueBase.i \
  ValueFactory.h \
@@ -31426,8 +32922,23 @@ realclean:
  Connection_Cache_Manager.inl \
  Cleanup_Func_Registry.h Cleanup_Func_Registry.inl Object_Ref_Table.h \
  Interceptor_List.h Interceptor_List.inl RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h RTCORBAC.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -31443,33 +32954,11 @@ realclean:
  GIOPC.h \
  GIOPC.i \
  Tagged_Profile.i \
- OctetSeqC.h Sequence.h OctetSeqC.i Service_Context.h Object.h \
+ OctetSeqC.h OctetSeqC.i Service_Context.h Object.h \
  TAO_Server_Request.i GIOP_Message_Locate_Header.h \
  Tagged_Profile.h \
- GIOP_Message_Locate_Header.i \
- Transport.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ GIOP_Message_Headers.i \
+ Transport.h Exception.h Transport.inl
 
 .obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \
  GIOP_Message_Lite.h \
@@ -31486,7 +32975,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -31577,20 +33065,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -31598,10 +33072,21 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Pluggable_Messaging_Utils.i \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Pluggable_Messaging.i \
  GIOP_Utils.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  GIOP_Utils.i \
  GIOP_Message_State.h \
  GIOP_Message_State.i \
@@ -31612,8 +33097,12 @@ realclean:
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  TimeBaseC.h \
+ Any.h \
+ Any.i \
  TimeBaseC.i \
  Priority_Mapping_Manager.h \
  Priority_Mapping.h \
@@ -31715,6 +33204,21 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -31740,33 +33244,11 @@ realclean:
  OctetSeqC.h \
  OctetSeqC.i \
  TAO_Server_Request.i \
- GIOP_Message_Locate_Header.h \
- GIOP_Message_Locate_Header.i \
+ GIOP_Message_Headers.h \
+ GIOP_Message_Headers.i \
  Leader_Follower.h \
  Leader_Follower.i \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/GIOP_Message_Handler.o .obj/GIOP_Message_Handler.so .shobj/GIOP_Message_Handler.o .shobj/GIOP_Message_Handler.so: GIOP_Message_Handler.cpp \
  GIOP_Message_Handler.h \
@@ -31926,8 +33408,6 @@ realclean:
  $(ACE_ROOT)/ace/Service_Object.i \
  Pluggable.h \
  IOPC.h \
- Any.h \
- Any.i \
  IOPC.i \
  Pluggable.i \
  Protocol_Factory.h \
@@ -31948,6 +33428,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -32007,8 +33489,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -32027,29 +33524,7 @@ realclean:
  GIOP_Utils.h \
  GIOP_Utils.i \
  GIOP_Message_Base.i \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/GIOP_Message_Generator_Parser.o .obj/GIOP_Message_Generator_Parser.so .shobj/GIOP_Message_Generator_Parser.o .shobj/GIOP_Message_Generator_Parser.so: GIOP_Message_Generator_Parser.cpp \
  GIOP_Message_Generator_Parser.h \
@@ -32156,21 +33631,10 @@ realclean:
  GIOP_Message_Generator_Parser.inl \
  Pluggable_Messaging_Utils.h \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -32178,9 +33642,16 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  Pluggable_Messaging_Utils.i \
  GIOP_Utils.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  GIOP_Utils.i \
  Object_KeyC.h \
  Object_KeyC.i \
@@ -32303,16 +33774,10 @@ realclean:
  Object_Proxy_Impl.h \
  Object.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Typecode.h \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -32320,27 +33785,32 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  GIOP_Utils.i \
- GIOP_Message_Locate_Header.h \
+ GIOP_Message_Headers.h \
  Tagged_Profile.h \
  GIOPC.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
  Tagged_Profile.i \
- GIOP_Message_Locate_Header.i \
+ GIOP_Message_Headers.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
  target_specification.h \
  target_specification.i \
  operation_details.i \
- CDR.h Any.h debug.h OctetSeqC.h corbafwd.h Sequence.h OctetSeqC.i \
- Pluggable_Messaging_Utils.h \
+ CDR.h Any.h \
+ Typecode.h \
+ Typecode.i \
+ Any.i debug.h \
+ OctetSeqC.h OctetSeqC.i Pluggable_Messaging_Utils.h \
  Pluggable_Messaging_Utils.i \
- TAO_Server_Request.h Tagged_Profile.h Service_Context.h Object.h \
- TAO_Server_Request.i GIOP_Message_State.h \
+ TAO_Server_Request.h corbafwd.h Tagged_Profile.h Service_Context.h \
+ Object.h TAO_Server_Request.i GIOP_Message_State.h \
  GIOP_Message_State.i \
  CORBA_String.h \
  CORBA_String.inl
@@ -32567,16 +34037,10 @@ realclean:
  Object_Proxy_Impl.h \
  Object.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Typecode.h \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -32584,6 +34048,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  GIOP_Utils.i \
  GIOP_Message_State.h \
@@ -32595,13 +34061,17 @@ realclean:
  Object_KeyC.i \
  GIOPC.i \
  Tagged_Profile.i \
- GIOP_Message_Locate_Header.i \
+ GIOP_Message_Headers.i \
  operation_details.h \
  Service_Context.h \
  Service_Context.inl \
  target_specification.h \
  target_specification.i \
  operation_details.i \
+ Any.h \
+ Typecode.h \
+ Typecode.i \
+ Any.i \
  debug.h \
  OctetSeqC.h \
  OctetSeqC.i \
@@ -32717,6 +34187,21 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -32726,29 +34211,7 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/GIOP_Message_Generator_Parser_Impl.o .obj/GIOP_Message_Generator_Parser_Impl.so .shobj/GIOP_Message_Generator_Parser_Impl.o .shobj/GIOP_Message_Generator_Parser_Impl.so: \
  GIOP_Message_Generator_Parser_Impl.cpp \
@@ -32967,20 +34430,10 @@ realclean:
  Object_Proxy_Impl.h \
  Object.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -32988,11 +34441,17 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  GIOP_Utils.i \
  debug.h \
  ORB_Core.h \
  ORB.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Services.h \
  Services.i \
  CORBA_String.h \
@@ -33001,6 +34460,8 @@ realclean:
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  ORB.i \
  Policy_Manager.h \
@@ -33032,6 +34493,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -33091,8 +34554,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -33102,32 +34580,10 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  ORB_Core.i \
- Transport.h corbafwd.h Exception.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- Transport.inl
+ Transport.h corbafwd.h Exception.h Transport.inl
 
 .obj/GIOP_Message_Locate_Header.o .obj/GIOP_Message_Locate_Header.so .shobj/GIOP_Message_Locate_Header.o .shobj/GIOP_Message_Locate_Header.so: GIOP_Message_Locate_Header.cpp \
- GIOP_Message_Locate_Header.h \
+ GIOP_Message_Headers.h \
  $(ACE_ROOT)/ace/pre.h \
  Tagged_Profile.h \
  IOPC.h \
@@ -33140,7 +34596,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -33231,20 +34686,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -33252,13 +34693,15 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  GIOPC.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
  Tagged_Profile.i \
- GIOP_Message_Locate_Header.i
+ GIOP_Message_Headers.i
 
 .obj/target_specification.o .obj/target_specification.so .shobj/target_specification.o .shobj/target_specification.so: target_specification.cpp \
  target_specification.h \
@@ -33370,23 +34813,10 @@ realclean:
  Environment.i \
  Object_KeyC.i \
  IOPC.h \
- Any.h \
  CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  IOPC.i \
  target_specification.i
 
@@ -33500,16 +34930,6 @@ realclean:
  Object_Proxy_Impl.h \
  Object.i \
  IOPC.h \
- Any.h \
- Environment.h \
- Environment.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -33517,10 +34937,16 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  GIOP_Utils.i \
  ORB_Core.h \
  ORB.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Services.h \
  Services.i \
  CORBA_String.h \
@@ -33529,6 +34955,8 @@ realclean:
  CurrentC.h \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  ORB.i \
  Policy_Manager.h \
@@ -33560,6 +34988,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -33619,8 +35049,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -33644,7 +35089,6 @@ realclean:
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- Any.h \
  CDR.h \
  corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -33735,20 +35179,6 @@ realclean:
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  CDR.i \
- Environment.h \
- Environment.i \
- Object.h \
- Abstract_Servant_Base.h \
- Object_Proxy_Broker.h \
- Object_Proxy_Impl.h \
- Object.i \
- Typecode.h \
- Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- Exception.i \
- Typecode.i \
- Any.i \
  Sequence.h \
  Managed_Types.h \
  Managed_Types.i \
@@ -33756,6 +35186,8 @@ realclean:
  Sequence_T.h \
  Sequence_T.i \
  Sequence_T.cpp \
+ Environment.h \
+ Environment.i \
  IOPC.i \
  GIOPC.h \
  Object_KeyC.h \
@@ -33764,14 +35196,25 @@ realclean:
  Tagged_Profile.i \
  ORB_Core.h \
  ORB.h \
+ Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ Exception.i \
  Services.h \
  Services.i \
  CORBA_String.h \
  CORBA_String.inl \
  PolicyC.h \
  CurrentC.h \
+ Object.h \
+ Abstract_Servant_Base.h \
+ Object_Proxy_Broker.h \
+ Object_Proxy_Impl.h \
+ Object.i \
  CurrentC.i \
  Encodable.h \
+ Typecode.h \
+ Typecode.i \
  PolicyC.i \
  ORB.i \
  Policy_Manager.h \
@@ -33803,6 +35246,8 @@ realclean:
  PolicyFactory_Registry.h \
  PortableInterceptorC.h \
  DynamicC.h \
+ Any.h \
+ Any.i \
  DynamicC.i \
  MessagingC.h \
  Remote_Object_Proxy_Impl.h \
@@ -33862,8 +35307,23 @@ realclean:
  Interceptor_List.h \
  Interceptor_List.inl \
  RT_Policy_i.h \
+ RTCORBAS.h \
+ IOPS.h \
+ IOPS_T.h \
+ IOPS_T.i \
+ IOPS_T.cpp \
+ IOPS.i \
+ TimeBaseS.h \
+ TimeBaseS_T.h \
+ TimeBaseS_T.i \
+ TimeBaseS_T.cpp \
+ TimeBaseS.i \
  RTCORBAC.h \
  RTCORBAC.i \
+ RTCORBAS_T.h \
+ RTCORBAS_T.i \
+ RTCORBAS_T.cpp \
+ RTCORBAS.i \
  RT_Policy_i.i \
  Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index aa90885e1bc..1a849de6147 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -151,7 +151,6 @@ ORB_CORE_FILES = \
   Reply_Dispatcher.cpp \
   Synch_Reply_Dispatcher.cpp \
   Asynch_Reply_Dispatcher.cpp \
-  Asynch_Timeout_Handler.cpp \
   Dynamic_Adapter.cpp \
   IOPC.cpp \
   IOPS.cpp \
@@ -391,7 +390,6 @@ HEADER_FILES = \
   Reply_Dispatcher.h \
   Synch_Reply_Dispatcher.h \
   Asynch_Reply_Dispatcher.h \
-  Asynch_Timeout_Handler.h \
   WrongTransactionC.h \
   Dynamic_Adapter.h \
   corba.h \
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index d47cb382091..c7569660f45 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -24,7 +24,6 @@ OBJFILES = \
 	$(OBJDIR)\append.obj \
 	$(OBJDIR)\Asynch_Invocation.obj \
 	$(OBJDIR)\Asynch_Reply_Dispatcher.obj \
-	$(OBJDIR)\Asynch_Timeout_Handler.obj \
 	$(OBJDIR)\BiDir_ORBInitializer.obj \
 	$(OBJDIR)\BiDir_Policy_i.obj \
 	$(OBJDIR)\BiDir_PolicyFactory.obj \
@@ -34,19 +33,17 @@ OBJFILES = \
 	$(OBJDIR)\Buffering_Constraint_Policy.obj \
 	$(OBJDIR)\Cache_Entries.obj \
 	$(OBJDIR)\CDR.obj \
-	$(OBJDIR)\CDR_Encaps_Codec.obj \
 	$(OBJDIR)\Cleanup_Func_Registry.obj \
 	$(OBJDIR)\Client_Priority_Policy.obj \
 	$(OBJDIR)\Client_Strategy_Factory.obj \
 	$(OBJDIR)\ClientRequestInfo.obj \
-	$(OBJDIR)\CodecFactory.obj \
-	$(OBJDIR)\CodecFactory_ORBInitializer.obj \
 	$(OBJDIR)\Connection_Cache_Manager.obj \
 	$(OBJDIR)\Connection_Descriptor_Interface.obj \
 	$(OBJDIR)\Connection_handler.obj \
 	$(OBJDIR)\Connector_Registry.obj \
 	$(OBJDIR)\Connector_Impl.obj \
 	$(OBJDIR)\CONV_FRAMEC.obj \
+	$(OBJDIR)\CONV_FRAMES.obj \
 	$(OBJDIR)\corbafwd.obj \
 	$(OBJDIR)\CORBA_String.obj \
 	$(OBJDIR)\CORBALOC_Parser.obj \
@@ -76,6 +73,7 @@ OBJFILES = \
 	$(OBJDIR)\GIOP_Message_Generator_Parser_12.obj \
 	$(OBJDIR)\GIOP_Message_Generator_Parser_Impl.obj \
 	$(OBJDIR)\GIOP_Message_Handler.obj \
+	$(OBJDIR)\GIOP_Message_Headers.obj \
 	$(OBJDIR)\GIOP_Message_Lite.obj \
 	$(OBJDIR)\GIOP_Message_Locate_Header.obj \
 	$(OBJDIR)\GIOP_Message_State.obj \
@@ -97,6 +95,7 @@ OBJFILES = \
 	$(OBJDIR)\Invocation.obj \
 	$(OBJDIR)\Invocation_Endpoint_Selectors.obj \
 	$(OBJDIR)\IOPC.obj \
+	$(OBJDIR)\IOPS.obj \
 	$(OBJDIR)\IOR_Parser.obj \
 	$(OBJDIR)\IORInfo.obj \
 	$(OBJDIR)\Leader_Follower.obj \
@@ -138,6 +137,7 @@ OBJFILES = \
 	$(OBJDIR)\PolicyC.obj \
 	$(OBJDIR)\PolicyFactory_Registry.obj \
 	$(OBJDIR)\PollableC.obj \
+	$(OBJDIR)\PollableS.obj \
 	$(OBJDIR)\Pool_Per_Endpoint.obj \
 	$(OBJDIR)\PortableInterceptor.obj \
 	$(OBJDIR)\PortableInterceptorC.obj \
@@ -164,6 +164,7 @@ OBJFILES = \
 	$(OBJDIR)\RT_PolicyFactory.obj \
 	$(OBJDIR)\RT_Protocols_Hooks.obj \
 	$(OBJDIR)\RTCORBAC.obj \
+	$(OBJDIR)\RTCORBAS.obj \
 	$(OBJDIR)\Sequence.obj \
 	$(OBJDIR)\Server_Strategy_Factory.obj \
 	$(OBJDIR)\Services.obj \
@@ -181,6 +182,7 @@ OBJFILES = \
 	$(OBJDIR)\TAO_Server_Request.obj \
 	$(OBJDIR)\TAO_Singleton_Manager.obj \
 	$(OBJDIR)\TAOC.obj \
+	$(OBJDIR)\TAOS.obj \
 	$(OBJDIR)\target_specification.obj \
 	$(OBJDIR)\TimeBaseC.obj \
 	$(OBJDIR)\TimeBaseS.obj \
diff --git a/TAO/tao/Message_Sent_Callback.cpp b/TAO/tao/Message_Sent_Callback.cpp
new file mode 100644
index 00000000000..5508945fbde
--- /dev/null
+++ b/TAO/tao/Message_Sent_Callback.cpp
@@ -0,0 +1,14 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Message_Sent_Callback.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Message_Sent_Callback.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(tao, Message_Sent_Callback, "$Id$")
+
+TAO_Message_Sent_Callback::~TAO_Message_Sent_Callback (void)
+{
+}
diff --git a/TAO/tao/Message_Sent_Callback.h b/TAO/tao/Message_Sent_Callback.h
new file mode 100644
index 00000000000..5a3bccda8ed
--- /dev/null
+++ b/TAO/tao/Message_Sent_Callback.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Message_Sent_Callback.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_MESSAGE_SENT_CALLBACK_H
+#define TAO_MESSAGE_SENT_CALLBACK_H
+#include "ace/pre.h"
+
+#include "corbafwd.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Message_Sent_Callback
+ *
+ * @brief Encapsulate the signaling mechanism used to wake up threads
+ *        waiting for a message to be sent out.
+ *
+ * Please read the documentation in the TAO_Transport class to find
+ * out more about the design of the outgoing data path.
+ *
+ */
+class TAO_Export TAO_Message_Sent_Callback
+{
+public:
+  /// Constructor
+  TAO_Message_Sent_Callback (void);
+
+  /// Destructor
+  virtual ~TAO_Message_Sent_Callback (void);
+
+  /// The message has been successfully sent
+  virtual void send_completed (void) = 0;
+
+  /// The message has failed
+  virtual void send_failed (void) = 0;
+
+  /// The message has timedout
+  virtual void send_timeout (void) = 0;
+
+  /// The connection was closed before the message was sent
+  virtual void connection_closed (void) = 0;
+};
+
+#if defined (__ACE_INLINE__)
+# include "Message_Sent_Callback.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif  /* TAO_MESSAGE_SENT_CALLBACK_H */
diff --git a/TAO/tao/Message_Sent_Callback.inl b/TAO/tao/Message_Sent_Callback.inl
new file mode 100644
index 00000000000..e7b8f4d6668
--- /dev/null
+++ b/TAO/tao/Message_Sent_Callback.inl
@@ -0,0 +1,6 @@
+// $Id$
+
+ACE_INLINE
+TAO_Message_Sent_Callback::TAO_Message_Sent_Callback (void)
+{
+}
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 7ce7ac79570..678cf7362fe 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -2410,7 +2410,11 @@ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
 
 #endif /* end #if !defined */
 
-    virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &) = 0;    // set
+#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef _tao_seq_Octet _marshaled_exception_seq;
+  #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
+
+          virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &) = 0;    // set
     virtual const Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) const = 0;     // get method (read only)
     virtual Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) = 0;     // get method (read/write only)
 
@@ -2722,7 +2726,11 @@ TAO_NAMESPACE  OBV_Messaging
     virtual void byte_order (CORBA::Boolean);    // set
     virtual CORBA::Boolean byte_order (void) const;     // get method
 
-    virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &);    // set
+#if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef _tao_seq_Octet _marshaled_exception_seq;
+  #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
+
+          virtual void marshaled_exception (const Messaging::ExceptionHolder::_tao_seq_Octet &);    // set
     virtual const Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void) const;     // get method (read only)
     virtual Messaging::ExceptionHolder::_tao_seq_Octet &marshaled_exception (void);     // get method (read/write only)
 
diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp
index 54058e3b675..f82ec718d79 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -76,9 +76,6 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
   {
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
     result = this->dispatcher_table_.unbind (params.request_id_, rd);
-    //ACE_DEBUG ((LM_DEBUG,
-    //            "\n(%P|%t) TAO_Muxed_TMS::dispatch_reply: id = %d\n",
-    //            params.request_id_));
   }
 
   if (result != 0)
@@ -89,15 +86,10 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params &params)
                     ACE_TEXT ("unbind dispatcher failed: result = %d\n"),
                     result));
 
-      // This return value means that the mux strategy was not able
-      // to find a registered reply handler, either because the reply
-      // was not our reply - just forget about it - or it was ours, but
-      // the reply timed out - just forget about the reply.
-      return 0;
+      return -1;
     }
 
   // Dispatch the reply.
-  // They return 1 on success, and -1 on failure.
   return rd->dispatch_reply (params);
 
   // No need for idling Transport, it would have got idle'd soon after
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 0e513109b96..f5d540f94d1 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -22,10 +22,8 @@
 #include "Priority_Mapping_Manager.h"
 #include "RT_Current.h"
 
-#include "ORBInitInfo.h"
-#include "ORBInitializer_Registry.h"
-
-#include "CodecFactory_ORBInitializer.h"
+# include "ORBInitInfo.h"
+# include "ORBInitializer_Registry.h"
 
 #if TAO_HAS_RT_CORBA == 1
 # include "RT_ORBInitializer.h"         /* @@ This should go away! */
@@ -229,49 +227,49 @@ CORBA_ORB::destroy (CORBA::Environment &ACE_TRY_ENV)
   this->orb_core_ = 0;
 }
 
-void
+int
 CORBA_ORB::run (CORBA::Environment &ACE_TRY_ENV)
 {
-  this->run (0, ACE_TRY_ENV);
+  return this->run (0, ACE_TRY_ENV);
 }
 
-void
+int
 CORBA_ORB::run (ACE_Time_Value &tv, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->run (&tv, ACE_TRY_ENV);
+  return this->run (&tv, ACE_TRY_ENV);
 }
 
-void
+int
 CORBA_ORB::run (ACE_Time_Value *tv,
                 CORBA::Environment &ACE_TRY_ENV)
 {
   this->check_shutdown (ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (-1);
 
-  this->orb_core ()->run (tv, 0, ACE_TRY_ENV);
+  return this->orb_core ()->run (tv, 0, ACE_TRY_ENV);
 }
 
-void
+int
 CORBA_ORB::perform_work (CORBA::Environment &ACE_TRY_ENV)
 {
-  this->perform_work (0, ACE_TRY_ENV);
+  return this->perform_work (0, ACE_TRY_ENV);
 }
 
-void
+int
 CORBA_ORB::perform_work (ACE_Time_Value &tv, CORBA::Environment &ACE_TRY_ENV)
 {
-  this->perform_work (&tv, ACE_TRY_ENV);
+  return this->perform_work (&tv, ACE_TRY_ENV);
 }
 
-void
+int
 CORBA_ORB::perform_work (ACE_Time_Value *tv,
                          CORBA::Environment &ACE_TRY_ENV)
 {
   // This method should not be called if the ORB has been shutdown.
   this->check_shutdown (ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_CHECK_RETURN (-1);
 
-  this->orb_core ()->run (tv, 1, ACE_TRY_ENV);
+  return this->orb_core ()->run (tv, 1, ACE_TRY_ENV);
 }
 
 CORBA::Boolean
@@ -505,6 +503,22 @@ CORBA_ORB::resolve_rt_current (CORBA::Environment &/*ACE_TRY_ENV*/)
 }
 
 CORBA_Object_ptr
+CORBA_ORB::resolve_priority_mapping_manager (CORBA::Environment &/*ACE_TRY_ENV*/)
+{
+
+#if (TAO_HAS_RT_CORBA == 1)
+
+    return this->orb_core_->priority_mapping_manager ();
+
+#else
+
+  return CORBA_Object::_nil ();
+
+#endif /* TAO_HAS_RT_CORBA == 1 */
+
+}
+
+CORBA_Object_ptr
 CORBA_ORB::resolve_rt_orb (CORBA::Environment &ACE_TRY_ENV)
 {
 #if (TAO_HAS_RT_CORBA == 1)
@@ -890,6 +904,9 @@ CORBA_ORB::resolve_initial_references (const char *name,
   else if (ACE_OS::strcmp (name, TAO_OBJID_RTORB) == 0)
     return this->resolve_rt_orb (ACE_TRY_ENV);
 
+  else if (ACE_OS::strcmp (name, TAO_OBJID_PRIORITYMAPPINGMANAGER) == 0)
+    return this->resolve_priority_mapping_manager (ACE_TRY_ENV);
+
   else if (ACE_OS::strcmp (name, TAO_OBJID_RTCURRENT) == 0)
     return this->resolve_rt_current (ACE_TRY_ENV);
 
@@ -1042,23 +1059,6 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
       ACE_THROW (CORBA::INITIALIZE ());
     }
 
-  // Register the CodecFactory ORBInitializer.
-  PortableInterceptor::ORBInitializer_ptr tmp_cf_initializer;
-  ACE_NEW_THROW_EX (tmp_cf_initializer,
-                    TAO_CodecFactory_ORBInitializer,
-                    CORBA::NO_MEMORY (
-                      CORBA_SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-  PortableInterceptor::ORBInitializer_var cf_initializer =
-    tmp_cf_initializer;
-
-  PortableInterceptor::register_orb_initializer (cf_initializer.in (),
-                                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
   // -------------------------------------------------------------
   // @@ These ORB initializer instantiations should go away.  They
   //    should be registered via the service configurator, for
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index b79362babc0..7a5002d2366 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
+
 
 //=============================================================================
 /**
@@ -6,30 +7,31 @@
  *
  *  $Id$
  *
- *  Header file for CORBA's ORB type.
+ *   Header file for CORBA's <ORB> type and type.
+ *
  *
  *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
  *  @author Douglas C. Schmidt <schmidt@uci.edu>
  */
 //=============================================================================
 
+
 #ifndef TAO_ORB_H
 #define TAO_ORB_H
-
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Exception.h"
-#include "Services.h"
-#include "CORBA_String.h"
+#include "tao/Exception.h"
+#include "tao/Services.h"
+#include "tao/CORBA_String.h"
 
 // IRIX needs this for the throw specs
-#include "PolicyC.h"
+#include "tao/PolicyC.h"
 
 typedef enum
 {
@@ -39,7 +41,7 @@ typedef enum
   TAO_SERVICEID_INTERFACEREPOSERVICE
 } TAO_Service_ID;
 
-/// Forward declarations.
+// = Forward declarations.
 class TAO_MProfile;
 struct TAO_Dispatch_Context;
 class TAO_Client_Strategy_Factory;
@@ -217,28 +219,36 @@ public:
   /**
    * Instructs the ORB to initialize itself and run its event loop in
    * the current thread, not returning until the ORB has shut down.
-   * If an error occurs during initialization or at run-time, a CORBA
-   * system exception will be thrown.
+   * If an error occurs during initialization or a run-time this
+   * method will return -1.
    */
-  void run (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int run (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   /**
    * Instructs the ORB to initialize itself and run its event loop in
    * the current thread, not returning until the ORB has shut down.
-   * If an error occurs during initialization or at run-time, a CORBA
-   * system exception will be thrown.
+   * If an error occurs during initialization or a run-time this
+   * method will return -1.  If no requests arrive at this thread
+   * before the <tv> "relative" timeout elapses we return to the
+   * caller with a value of 0 (this allows timeouts).  Otherwise, if
+   * we've returned since we've been asked to shut down the value of 1
+   * is returned.
    */
-  void run (ACE_Time_Value &tv,
-            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int run (ACE_Time_Value &tv,
+           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   /**
    * Instructs the ORB to initialize itself and run its event loop in
    * the current thread, not returning until the ORB has shut down.
-   * If an error occurs during initialization or at run-time, a CORBA
-   * system exception will be thrown.
+   * If an error occurs during initialization or a run-time this
+   * method will return -1.  If <tv> is non-NULL, then if no requests
+   * arrive at this thread before the "relative" timeout elapses we
+   * return to the caller with a value of 0 (this allows timeouts).
+   * Otherwise, if we've returned since we've been asked to shut down
+   * the value of 1 is returned.
    */
-  void run (ACE_Time_Value *tv,
-            CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+  int run (ACE_Time_Value *tv,
+           CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
 
   /// Returns an indication of whether the ORB needs to perform some
   /// work.
@@ -251,14 +261,14 @@ public:
    * behavior can be modified by passing an appropriate
    * <ACE_Time_Value>.
    */
-  void perform_work (CORBA_Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  void perform_work (ACE_Time_Value &,
-                     CORBA_Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
-  void perform_work (ACE_Time_Value *,
-                     CORBA_Environment &ACE_TRY_ENV =
-                     TAO_default_environment ());
+  int perform_work (CORBA_Environment &ACE_TRY_ENV =
+                    TAO_default_environment ());
+  int perform_work (ACE_Time_Value &,
+                    CORBA_Environment &ACE_TRY_ENV =
+                    TAO_default_environment ());
+  int perform_work (ACE_Time_Value *,
+                    CORBA_Environment &ACE_TRY_ENV =
+                    TAO_default_environment ());
 
   /**
    * This operation instructs the ORB to shut down. Shutting down the
@@ -377,17 +387,21 @@ protected:
   CORBA_Object_ptr resolve_poa_current (CORBA_Environment &ACE_TRY_ENV);
 
   /// Resolve the Policy Manager for this ORB.
-  CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&);
-
   /// Resolve the Policy Current for this thread.
+  CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&);
   CORBA_Object_ptr resolve_policy_current (CORBA::Environment&);
 
+
+
   /// Resolve the RTORB.
   CORBA_Object_ptr resolve_rt_orb (CORBA_Environment &ACE_TRY_ENV);
 
   /// Resolve the RT Current.
   CORBA_Object_ptr resolve_rt_current (CORBA_Environment &ACE_TRY_ENV);
 
+  /// Resolve the Priority_Mapping_Manager.
+  CORBA_Object_ptr resolve_priority_mapping_manager (CORBA_Environment &ACE_TRY_ENV);
+
 private:
 
   /// Resolve the given service based on the service ID.
diff --git a/TAO/tao/ORBInitInfo.cpp b/TAO/tao/ORBInitInfo.cpp
index 53986960f1d..326a5f1a90c 100644
--- a/TAO/tao/ORBInitInfo.cpp
+++ b/TAO/tao/ORBInitInfo.cpp
@@ -5,11 +5,8 @@
 #include "ORBInitInfo.h"
 #include "ORB_Core.h"
 #include "StringSeqC.h"
-#include "CodecFactory.h"
 
-ACE_RCSID (TAO,
-           ORBInitInfo,
-           "$Id$")
+ACE_RCSID(tao, ORBInitInfo, "$Id$")
 
 
 TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core,
@@ -17,8 +14,7 @@ TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core,
                                   char *argv[])
   : orb_core_ (orb_core),
     argc_ (argc),
-    argv_ (argv),
-    codec_factory_ ()
+    argv_ (argv)
 {
 }
 
@@ -69,16 +65,6 @@ TAO_ORBInitInfo::orb_id (CORBA::Environment &ACE_TRY_ENV)
   return CORBA::string_dup (this->orb_core_->orbid ());
 }
 
-IOP::CodecFactory_ptr
-TAO_ORBInitInfo::codec_factory (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->check_validity (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (IOP::CodecFactory::_nil ());
-
-  return &(this->codec_factory_);
-}
-
 void
 TAO_ORBInitInfo::register_initial_reference (
     const char * id,
@@ -150,11 +136,7 @@ TAO_ORBInitInfo::add_client_request_interceptor (
                                     ACE_TRY_ENV);
 #else
   ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA_SystemException::_tao_minor_code (
-                 TAO_DEFAULT_MINOR_CODE,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
@@ -174,11 +156,7 @@ TAO_ORBInitInfo::add_server_request_interceptor (
 
 #else
   ACE_UNUSED_ARG (interceptor);
-  ACE_THROW (CORBA::NO_IMPLEMENT (
-               CORBA_SystemException::_tao_minor_code (
-                 TAO_DEFAULT_MINOR_CODE,
-                 ENOTSUP),
-               CORBA::COMPLETED_NO));
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
diff --git a/TAO/tao/ORBInitInfo.h b/TAO/tao/ORBInitInfo.h
index c5a3fa99b18..0f5e413b29e 100644
--- a/TAO/tao/ORBInitInfo.h
+++ b/TAO/tao/ORBInitInfo.h
@@ -24,7 +24,6 @@
 #include "PortableInterceptorC.h"
 #include "LocalObject.h"
 #include "StringSeqC.h"
-#include "CodecFactory.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -81,12 +80,6 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /// Return the CodecFactory for the ORB currently being
-  /// initialized.
-  virtual IOP::CodecFactory_ptr codec_factory (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   /// Register a mapping between a string and a corresponding object
   /// reference with the ORB being initialized.  This is particularly
   /// useful for registering references to local
@@ -219,9 +212,6 @@ private:
   /// The argument vector passed to CORBA::ORB_init().
   char **argv_;
 
-  /// Instance of the IOP::CodecFactory.  Returned by
-  /// ORBInitInfo::codec_factory ().  
-  TAO_CodecFactory codec_factory_;
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index de1aea36419..f352135f555 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -35,6 +35,8 @@
 
 #include "IORInfo.h"
 
+#include "Flushing_Strategy.h"
+
 #if defined(ACE_MVS)
 #include "ace/Codeset_IBM1047.h"
 #endif /* ACE_MVS */
@@ -43,9 +45,7 @@
 # include "ORB_Core.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID (TAO,
-           ORB_Core,
-           "$Id$")
+ACE_RCSID(tao, ORB_Core, "$Id$")
 
 
 // ****************************************************************
@@ -65,6 +65,10 @@ const char * TAO_ORB_Core::protocols_hooks_name_ = "Protocols_Hooks";
 const char * TAO_ORB_Core::dynamic_adapter_name_ = "Dynamic_Adapter";
 const char * TAO_ORB_Core::ifr_client_adapter_name_ = "IFR_Client_Adapter";
 
+#if (TAO_HAS_RT_CORBA == 1)
+CORBA::Object_ptr TAO_ORB_Core::priority_mapping_manager_ =
+  CORBA::Object::_nil ();
+#endif /* TAO_HAS_RT_CORBA == 1 */
 
 TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
   : protocols_hooks_ (0),
@@ -79,7 +83,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     ior_manip_factory_ (CORBA::Object::_nil ()),
     ior_table_ (CORBA::Object::_nil ()),
     orb_ (),
-    root_poa_ (CORBA::Object::_nil ()),
     orb_params_ (),
     init_ref_map_ (),
     object_ref_table_ (),
@@ -108,7 +111,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
-    poa_current_ (),
+    poa_current_ (0),
     adapter_registry_ (this),
     poa_adapter_ (0),
     tm_ (),
@@ -139,9 +142,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     priority_protocol_selector_ (0),
     bands_protocol_selector_ (0),
     client_priority_policy_selector_ (0),
-    rt_orb_ (),
-    rt_current_ (),
-    priority_mapping_manager_ (),
+    rt_orb_ (0),
+    rt_current_ (0),
 #endif /* TAO_HAS_RT_CORBA == 1 */
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
     eager_buffering_sync_strategy_ (0),
@@ -158,6 +160,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     parser_registry_ (),
     connection_cache_ (),
     bidir_giop_policy_ (0)
+  , flushing_strategy_ (0)
 {
 #if defined(ACE_MVS)
   ACE_NEW (this->from_iso8859_, ACE_IBM1047_ISO8859);
@@ -221,6 +224,8 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
 
 TAO_ORB_Core::~TAO_ORB_Core (void)
 {
+  delete this->flushing_strategy_;
+
   ACE_OS::free (this->orbid_);
 
   delete this->from_iso8859_;
@@ -235,9 +240,9 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
-  CORBA::release (this->policy_manager_);
+  delete this->policy_manager_;
   delete this->default_policies_;
-  CORBA::release (this->policy_current_);
+  delete this->policy_current_;
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
@@ -252,6 +257,8 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   delete this->priority_protocol_selector_;
   delete this->bands_protocol_selector_;
   delete this->client_priority_policy_selector_;
+  // delete this->rt_orb_;
+  // delete this->rt_current_;
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
 
@@ -915,7 +922,6 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   this->reactor_registry_->open (this);
 
 #if (TAO_HAS_RT_CORBA == 1)
-
   this->get_protocols_hooks()->set_priority_mapping (this,
                                                      trf,
                                                      ACE_TRY_ENV);
@@ -1042,6 +1048,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
   // init the ORB core's pointer
   this->protocol_factories_ = trf->get_protocol_factories ();
 
+  // Initialize the flushing strategy
+  this->flushing_strategy_ = trf->create_flushing_strategy ();
+
   // Now that we have a complete list of available protocols and their
   // related factory objects, set default policies and initialize the
   // registries!
@@ -1145,6 +1154,10 @@ TAO_ORB_Core::fini (void)
   // Wait for any server threads, ignoring any failures.
   (void) this->thr_mgr ()->wait ();
 
+#if (TAO_HAS_RT_CORBA == 1)
+  CORBA::release (TAO_ORB_Core::priority_mapping_manager_);
+#endif /* TAO_HAS_RT_CORBA == 1 */
+
   CORBA::release (this->implrepo_service_);
 
   CORBA::release (this->typecode_factory_);
@@ -1543,8 +1556,8 @@ TAO_ORB_Core::inherit_from_parent_thread (
 CORBA::Object_ptr
 TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV)
 {
-  if (!CORBA::is_nil (this->root_poa_))
-    return CORBA::Object::_duplicate (this->root_poa_);
+  if (!CORBA::is_nil (this->root_poa_.in ()))
+    return CORBA::Object::_duplicate (this->root_poa_.in ());
 
   TAO_Adapter_Factory *factory =
     ACE_Dynamic_Service<TAO_Adapter_Factory>::instance ("TAO_POA");
@@ -1570,15 +1583,12 @@ TAO_ORB_Core::root_poa (CORBA::Environment &ACE_TRY_ENV)
   poa_adapter->open (ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  // @@ poa_adapter->root() is busted.  It doesn't return a
-  //    duplicate.  As such, this->root_poa_ is an Object_ptr, and is
-  //    not released by the ORB_Core.
   this->root_poa_ = poa_adapter->root ();
 
   this->adapter_registry_.insert (poa_adapter, ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
-  return CORBA::Object::_duplicate (this->root_poa_);
+  return CORBA::Object::_duplicate (this->root_poa_.in ());
 }
 
 TAO_Adapter *
@@ -1670,8 +1680,7 @@ TAO_ORB_Core::create_stub_object (const TAO_ObjectKey &key,
         {
           // Get the ith profile
           profile = mp.get_profile (i);
-          profile->policies (policy_list, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
+          profile->policies (policy_list);
         }
     }
 
@@ -1991,55 +2000,10 @@ TAO_ORB_Core::destroy (CORBA_Environment &ACE_TRY_ENV)
                        *ACE_Static_Object_Lock::instance ()));
     TAO_ORB_Table::instance ()->unbind (this->orbid_);
   }
-
-  // Invoke Interceptor::destroy() on all registered interceptors.
-  this->destroy_interceptors (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-TAO_ORB_Core::destroy_interceptors (CORBA::Environment &ACE_TRY_ENV)
-{
-  size_t len = 0;
-
-#if TAO_HAS_INTERCEPTORS == 1
-  TAO_ClientRequestInterceptor_List::TYPE &client_interceptors =
-    this->client_request_interceptors_.interceptors ();
-
-  len = client_interceptors.size ();
-  for (size_t i = 0; i < len; ++i)
-    {
-      client_interceptors[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  TAO_ServerRequestInterceptor_List::TYPE &server_interceptors =
-    this->server_request_interceptors_.interceptors ();
-
-  len = server_interceptors.size ();
-  for (size_t j = 0; j < len; ++j)
-    {
-      server_interceptors[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#ifdef TAO_HAS_EXCEPTIONS
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-#endif  /* TAO_HAS_EXCEPTIONS */
-
-  TAO_IORInterceptor_List::TYPE &ior_interceptors =
-    this->ior_interceptors_.interceptors ();
-
-  len = ior_interceptors.size ();
-  for (size_t k = 0; k < len; ++k)
-    {
-      ior_interceptors[k]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
 }
 
 // Set up listening endpoints.
+
 int
 TAO_ORB_Core::open (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -2258,7 +2222,7 @@ TAO_ORB_Core::resolve_rir (const char *name,
   return CORBA::Object::_nil ();
 }
 
-CORBA::ORB::ObjectIdList_ptr
+CORBA_ORB_ObjectIdList_ptr
 TAO_ORB_Core::list_initial_references (CORBA::Environment &ACE_TRY_ENV)
 {
   // Unsupported initial services should NOT be included in the below list!
@@ -2270,18 +2234,16 @@ TAO_ORB_Core::list_initial_references (CORBA::Environment &ACE_TRY_ENV)
     sizeof (initial_services) / sizeof (initial_services[0]);
 
   const size_t total_size =
-    initial_services_size
-    + this->init_ref_map_.current_size ();
-//     + this->object_ref_table_.current_size ();
+    initial_services_size + this->init_ref_map_.current_size ();
 
-  CORBA::ORB::ObjectIdList_ptr tmp = 0;
+  CORBA_ORB_ObjectIdList_ptr tmp = 0;
 
   ACE_NEW_THROW_EX (tmp,
                     CORBA_ORB_ObjectIdList (total_size),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  CORBA::ORB::ObjectIdList_var list = tmp;
+  CORBA_ORB_ObjectIdList_var list = tmp;
   list->length (total_size);
 
   CORBA::ULong index = 0;
@@ -2293,23 +2255,12 @@ TAO_ORB_Core::list_initial_references (CORBA::Environment &ACE_TRY_ENV)
 
   // Now iterate over the initial references created by the user and
   // add them to the sequence.
+  InitRefMap::iterator end  = this->init_ref_map_.end ();
 
-//   // References registered via
-//   // ORBInitInfo::register_initial_reference().
-//   TAO_Object_Ref_Table::Iterator end = this->object_ref_table_.end ();
-
-//   for (TAO_Object_Ref_Table::Iterator i = this-> object_ref_table_.begin ();
-//        i != end;
-//        ++i, ++index)
-//     list[index] = (*i).int_id_;
-
-  // References registered via INS.
-  InitRefMap::iterator end = this->init_ref_map_.end ();
-
-  for (InitRefMap::iterator j = this-> init_ref_map_.begin ();
-       j != end;
-       ++j, ++index)
-    list[index] = (*j).int_id_.c_str ();
+  for (InitRefMap::iterator i =this-> init_ref_map_.begin ();
+       i != end;
+       ++i, ++index)
+    list[index] = (*i).int_id_.c_str ();
 
   return list._retn ();
 }
@@ -2713,29 +2664,21 @@ TAO_ORB_Core::stubless_relative_roundtrip_timeout (void)
 CORBA::Object_ptr
 TAO_ORB_Core::priority_mapping_manager (void)
 {
-  if (CORBA::is_nil (this->priority_mapping_manager_.in ()))
+  return
+    CORBA::Object::_duplicate (TAO_ORB_Core::priority_mapping_manager_);
+}
+
+void
+TAO_ORB_Core::priority_mapping_manager (CORBA::Object_ptr manager)
+{
+  if (TAO_ORB_Core::priority_mapping_manager_ != manager)
     {
-      ACE_TRY_NEW_ENV
-        {
-          this->priority_mapping_manager_ =
-            this->object_ref_table_.resolve_initial_references (
-              "PriorityMappingManager",
-              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          if (TAO_debug_level > 1)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Could not resolve "
-                        "\"PriorityMappingManager\".\n"));
+      // Release the old reference before setting the new one.
+      CORBA::release (TAO_ORB_Core::priority_mapping_manager_);
 
-          return CORBA::Object::_nil ();
-        }
-      ACE_ENDTRY;
+      TAO_ORB_Core::priority_mapping_manager_ =
+        CORBA::Object::_duplicate (manager);
     }
-
-  return CORBA::Object::_duplicate (this->priority_mapping_manager_.in ());
 }
 
 CORBA::Policy *
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index c5e9f44182f..17113eccd7b 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -82,6 +82,8 @@ class TAO_Message_State_Factory;
 class TAO_ServerRequest;
 class TAO_Protocols_Hooks;
 
+class TAO_Flushing_Strategy;
+
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
 class TAO_Eager_Buffering_Sync_Strategy;
@@ -576,7 +578,10 @@ public:
   /// Access the priority mapping manager class.  This is a TAO
   /// extension but there is no standard for setting priority mapping
   /// either.
+  //@{
   CORBA::Object_ptr priority_mapping_manager (void);
+  static void priority_mapping_manager (CORBA::Object_ptr manager);
+  //@}
 
   /// Methods for obtaining ORB implementation default values for RT
   /// policies.
@@ -853,22 +858,30 @@ public:
 
   /// Set and Get methods to indicate whether a BiDir IIOP policy has
   /// been set in the POA.
-  /// @note At present, the value will be true even if one of the POA's
-  ///       is set with the Bi Dir GIOP policy.
+  /// @@ At present, the value will be true even if one of the POA's
+  ///    is set with the Bi Dir GIOP policy.
   CORBA::Boolean bidir_giop_policy (void);
   void bidir_giop_policy (CORBA::Boolean);
 
-
-
   /// Return the table that maps object key/name to de-stringified
   /// object reference.  It is needed for supporting local objects in
   /// the resolve_initial_references() mechanism.
   TAO_Object_Ref_Table &object_ref_table (void);
 
+  /// Return the flushing strategy
+  /**
+   * The flushing strategy is created by the resource factory, and it
+   * is used by the ORB to control the mechanism used to flush the
+   * outgoing data queues.
+   * The flushing strategies are stateless, therefore, there is only
+   * one per ORB.
+   */
+  TAO_Flushing_Strategy *flushing_strategy (void);
+
 protected:
 
-  /// Destructor is protected since the ORB Core is a reference
-  /// counted object.
+  /// Destructor is protected since the ORB Core should only be
+  /// allocated on the heap.
   ~TAO_ORB_Core (void);
 
   /// Initialize the guts of the ORB Core.  It is intended that this be
@@ -879,6 +892,7 @@ protected:
   /// destructor.
   int fini (void);
 
+
   /// Implement the input_cdr_*_allocator() routines using pre-fetched
   /// TSS resources.  This minimizes the number of calls to them.
   //@{
@@ -906,10 +920,6 @@ protected:
   /// callbacks  which can be dynamically loaded.
   void services_callbacks_init (void);
 
-  /// Helper method that invokes Interceptor::destroy() on all
-  /// registered interceptors when ORB::destroy() is called.
-  void destroy_interceptors (CORBA::Environment &ACE_TRY_ENV);
-
 private:
 
   /// The ORB Core should not be copied.
@@ -975,10 +985,10 @@ protected:
    */
   CORBA::ORB_var orb_;
 
-  /// Object reference to the root POA.  It will eventually be the
-  /// object reference returned by calls to
+  /// Pointer to the root POA.  It will eventually be the pointer
+  /// returned by calls to
   ///   CORBA::ORB::resolve_initial_references ("RootPOA").
-  CORBA::Object_ptr root_poa_;
+  CORBA::Object_var root_poa_;
 
   /// Parameters used by the ORB.
   TAO_ORB_Parameters orb_params_;
@@ -1151,16 +1161,17 @@ protected:
   TAO_Protocol_Endpoint_Selector *protocol_endpoint_selector_;
   TAO_Priority_Protocol_Selector *priority_protocol_selector_;
   TAO_Bands_Protocol_Selector *bands_protocol_selector_;
-  TAO_Client_Priority_Policy_Selector *client_priority_policy_selector_;
+  TAO_Client_Priority_Policy_Selector
+  *client_priority_policy_selector_;
 
   /// Implementation of RTCORBA::RTORB interface.
-  CORBA::Object_var rt_orb_;
+  CORBA::Object_ptr rt_orb_;
 
   /// Implementation of RTCORBA::RTCurrent interface.
-  CORBA::Object_var rt_current_;
+  CORBA::Object_ptr rt_current_;
 
   /// Manager for setting priority mapping.
-  CORBA::Object_var priority_mapping_manager_;
+  static CORBA::Object_ptr priority_mapping_manager_;
 
   // RT ORB specific command line argument parsing.
   int RT_ORB_init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV);
@@ -1203,6 +1214,9 @@ protected:
 
   /// Bir Dir GIOP policy value
   CORBA::Boolean bidir_giop_policy_;
+
+  /// Hold the flushing strategy
+  TAO_Flushing_Strategy *flushing_strategy_;
 };
 
 // ****************************************************************
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index b8cc9db3212..fce8b81dffe 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -47,6 +47,11 @@ TAO_ORB_Core::object_ref_table (void)
   return this->object_ref_table_;
 }
 
+ACE_INLINE TAO_Flushing_Strategy *
+TAO_ORB_Core::flushing_strategy (void)
+{
+  return this->flushing_strategy_;
+}
 
 ACE_INLINE CORBA::Boolean
 TAO_ORB_Core::service_profile_selection (TAO_MProfile &mprofile,
@@ -578,23 +583,6 @@ ACE_INLINE CORBA::Object_ptr
 TAO_ORB_Core::poa_current (void)
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0);
-
-  if (CORBA::is_nil (this->poa_current_.in ()))
-    {
-      ACE_TRY_NEW_ENV
-        {
-          // @@ This is a hack.  FIXME!
-          // This forces the POACurrent to be initialized.
-          CORBA::Object_var root = this->root_poa (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          return CORBA::Object::_nil ();
-        }
-      ACE_ENDTRY;
-    }
-
   return CORBA::Object::_duplicate (this->poa_current_.in ());
 }
 
@@ -681,41 +669,25 @@ TAO_ORB_Core::client_priority_policy_selector (void)
 ACE_INLINE CORBA::Object_ptr
 TAO_ORB_Core::rt_orb (CORBA::Environment &ACE_TRY_ENV)
 {
-  if (CORBA::is_nil (this->rt_orb_.in ()))
+if (CORBA::is_nil (this->rt_orb_))
     {
       this->resolve_rt_orb_i (ACE_TRY_ENV);
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
     }
-
-  return CORBA::Object::_duplicate (this->rt_orb_.in ());
+  return CORBA::Object::_duplicate (this->rt_orb_);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_ORB_Core::rt_current (void)
 {
-  if (CORBA::is_nil (this->rt_current_.in ()))
-    {
-      ACE_TRY_NEW_ENV
-        {
-          // Make sure the RT ORB is loaded and initialized since it
-          // also initializes the RTCurrent object.
-          this->resolve_rt_orb_i (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          return CORBA::Object::_nil ();
-        }
-      ACE_ENDTRY;
-    }
-
-  return CORBA::Object::_duplicate (this->rt_current_.in ());
+  return CORBA::Object::_duplicate (this->rt_current_);
 }
 
 ACE_INLINE void
 TAO_ORB_Core::rt_current (CORBA::Object_ptr current)
 {
-  this->rt_current_ = CORBA::Object::_duplicate (current);
+  this->rt_current_ =
+    CORBA::Object::_duplicate (current);
 }
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
@@ -812,7 +784,7 @@ TAO_ORB_Core_Auto_Ptr::reset (TAO_ORB_Core *p)
 ACE_INLINE TAO_ORB_Core *
 TAO_ORB_Core_Auto_Ptr::operator-> () const
 {
-  ACE_TRACE ("TAO_ORB_Core_Auto_Ptr::operator->");
+  ACE_TRACE ("auto_ptr::operator->");
   return this->get ();
 }
 
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 531587a3bcf..8afcab558a7 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -575,8 +575,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_WARNING,
-                      "TAO (%P|%t) WARNING: extracting object from "
-                      "default ORB_Core\n"));
+                      ACE_TEXT ("WARNING: extracting object from default ORB_Core\n")));
         }
     }
 
@@ -598,13 +597,12 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
       //    example, hostname lookup failed when binding the
       //    ACE_INET_Addr to the IIOP profile in being created.
 
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "TAO (%P|%t) ERROR: Could not create all "
-                         "profiles while extracting object\n"
-                         "TAO (%P|%t) reference from the CDR stream.\n"
-                         "TAO (%P|%t) ERROR: This may be due to an address "
-                         "resolution problem (e.g. DNS).\n"),
-                        0);
+      ACE_DEBUG ((LM_ERROR,
+                  ACE_TEXT ("TAO (%P|%t) Could not create all ")
+                  ACE_TEXT ("profiles.\n")
+                  ACE_TEXT ("This may be due to an address ")
+                  ACE_TEXT ("resolution problem (e.g. DNS).\n")));
+      return 0;
     }
 
   // Ownership of type_hint is given to TAO_Stub
diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h
index 951cd270cc3..e95d9bf545f 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -1,4 +1,5 @@
-// ================================================================
+
+//=============================================================================
 /**
  *  @file   Object_Loader.h
  *
@@ -6,13 +7,14 @@
  *
  *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
  */
-// ================================================================
+//=============================================================================
+
 
 #ifndef TAO_OBJECT_LOADER_H
 #define TAO_OBJECT_LOADER_H
 #include "ace/pre.h"
 
-#include "tao/Exception.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,11 +29,8 @@
  * ORB.
  *
  * Many services and components of the ORB can be dynamically
- * loaded, often this components are returned to the application via
- * an object reference (CORBA::Object_ptr).  This class is used to
- * dynamically load such components, and encapsulate the creation of
- * the object reference.
- *
+ * loaded, this is the class used to implement ....
+ * @@ TODO
  */
 class TAO_Export TAO_Object_Loader : public ACE_Service_Object
 {
@@ -48,7 +47,7 @@ public:
                                            int argc,
                                            char *argv [],
                                            CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    ACE_THROW_SPEC (()) = 0;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index 751255dc14b..8259c45604d 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -8,11 +8,11 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//          -Ge 1
-//          -Wb,export_macro=TAO_Export
-//          -Wb,export_include="corbafwd.h"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
+//          -Ge 1 \
+//          -Wb,export_macro=TAO_Export \
+//          -Wb,export_include="tao/corbafwd.h" \
+//          -Wb,pre_include="ace/pre.h" \
+//          -Wb,post_include="ace/post.h" \
 //          OctetSeq.pidl
 //
 //   Patches for changes to the generated code are available in the
@@ -20,16 +20,13 @@
 // ================================================================
 
 
-#ifndef TAO_CORBA_OCTET_SEQ_IDL
-#define TAO_CORBA_OCTET_SEQ_IDL
+#ifndef TAO_OCTET_SEQ_IDL
+#define TAO_OCTET_SEQ_IDL
 
 #pragma prefix "omg.org"
 
-module CORBA
-{
-  typedef sequence<octet> OctetSeq;
-};
+typedef sequence<octet> OctetSeq;
 
 #pragma prefix ""
 
-#endif  /* TAO_CORBA_OCTET_SEQ_IDL */
+#endif  /* TAO_OCTET_SEQ_IDL */
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index bd19401dada..a5c7169a382 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -21,52 +21,46 @@
 
 #include "OctetSeqC.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
 #if !defined (__ACE_INLINE__)
 #include "OctetSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any.h"
-#include "CDR.h"
-#include "Typecode.h"
+#include "tao/Any.h"
 
-#if !defined (_CORBA_OCTETSEQ_CS_)
-#define _CORBA_OCTETSEQ_CS_
+#if !defined (TAO_OCTETSEQ_CS)
+#define TAO_OCTETSEQ_CS
 
 // *************************************************************
-// CORBA::OctetSeq
+// CORBA_OctetSeq
 // *************************************************************
 
 CORBA_OctetSeq::CORBA_OctetSeq (void)
 {}
 CORBA_OctetSeq::CORBA_OctetSeq (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 */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_OctetSeq::CORBA_OctetSeq (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 */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_OctetSeq::CORBA_OctetSeq (const CORBA_OctetSeq &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 */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_OctetSeq::~CORBA_OctetSeq (void) // dtor
@@ -83,8 +77,8 @@ void CORBA_OctetSeq::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_CORBA_OctetSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f63), ACE_NTOHL (0x74657453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-  9, ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x0),  // name = OctetSeq
+  17, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:CORBA_OctetSeq:1.0
+  9, ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x0),  // name = CORBA_OctetSeq
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -94,10 +88,7 @@ static const CORBA::Long _oc_CORBA_OctetSeq[] =
 
 };
 static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
-TAO_NAMESPACE_END
+CORBA::TypeCode_ptr _tc_CORBA_OctetSeq = &_tc_TAO_tc_CORBA_OctetSeq;
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -108,7 +99,7 @@ void operator<<= (
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_OctetSeq,
+        _tc_CORBA_OctetSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
@@ -120,7 +111,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_OctetSeq *_tao_elem) // non copyin
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::_tc_OctetSeq,
+      _tc_CORBA_OctetSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
@@ -143,7 +134,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (CORBA::_tc_OctetSeq, ACE_TRY_ENV)) // not equal
+    if (!type->equivalent (_tc_CORBA_OctetSeq, ACE_TRY_ENV)) // not equal
       {
         return 0;
       }
@@ -167,7 +158,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_OctetSeq,
+            _tc_CORBA_OctetSeq,
             1,
             ACE_static_cast (void *, tmp),
             CORBA_OctetSeq::_tao_any_destructor
@@ -196,20 +187,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_OctetSeq *)&_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 == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -226,14 +217,14 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_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);
@@ -242,11 +233,12 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
 }
+
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index 1faaeb8ee23..6fb751c2d8f 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -19,17 +19,18 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_OCTETSEQC_H_
-#define _TAO_IDL_CORBA_OCTETSEQC_H_
+#ifndef _TAO_IDL_OCTETSEQC_H_
+#define _TAO_IDL_OCTETSEQC_H_
 
 #include "ace/pre.h"
-#include "corbafwd.h"
+
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Sequence.h"
+#include "tao/Sequence.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -50,128 +51,125 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-#if !defined (_CORBA_OCTETSEQ_CH_)
-#define _CORBA_OCTETSEQ_CH_
-
-  class CORBA_OctetSeq;
-  class CORBA_OctetSeq_var;
-  
-  // *************************************************************
-  // CORBA::OctetSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_OctetSeq : public 
+
+#if !defined (TAO_OCTETSEQ_CH)
+#define TAO_OCTETSEQ_CH
+
+class CORBA_OctetSeq;
+class CORBA_OctetSeq_var;
+
+// *************************************************************
+// CORBA_OctetSeq
+// *************************************************************
+
+class TAO_Export CORBA_OctetSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_Sequence<CORBA::Octet>
+  TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_OctetSeq (void); // default ctor
-    CORBA_OctetSeq (CORBA::ULong max); // uses max size
-    CORBA_OctetSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::Octet *buffer, 
-      CORBA::Boolean release = 0
-    );
-    CORBA_OctetSeq (const CORBA_OctetSeq &); // copy ctor
-    ~CORBA_OctetSeq (void);
-    static void _tao_any_destructor (void*);
+  TAO_Unbounded_Sequence<CORBA::Octet>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+{
+public:
+  CORBA_OctetSeq (void); // default ctor
+  CORBA_OctetSeq (CORBA::ULong max); // uses max size
+  CORBA_OctetSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::Octet *buffer,
+    CORBA::Boolean release = 0
+  );
+  CORBA_OctetSeq (const CORBA_OctetSeq &); // copy ctor
+  ~CORBA_OctetSeq (void);
+  static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_OctetSeq_var _var_type;
+  typedef CORBA_OctetSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    CORBA_OctetSeq (
-        CORBA::ULong length,
-        const ACE_Message_Block* mb
-      )
-      : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
+  CORBA_OctetSeq (
+      CORBA::ULong length,
+      const ACE_Message_Block* mb
+    )
+    : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
 #endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
 
-  };
-  
+};
+
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_OCTETSEQ___VAR_CH_)
-#define _CORBA_OCTETSEQ___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::OctetSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_OctetSeq_var
-  {
-  public:
-    CORBA_OctetSeq_var (void); // default constructor
-    CORBA_OctetSeq_var (CORBA_OctetSeq *);
-    CORBA_OctetSeq_var (const CORBA_OctetSeq_var &); // copy constructor
-    CORBA_OctetSeq_var (const CORBA_OctetSeq &); // fixed-size base types only
-    ~CORBA_OctetSeq_var (void); // destructor
-    
-    CORBA_OctetSeq_var &operator= (CORBA_OctetSeq *);
-    CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq_var &);
-    CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq &); // fixed-size base types only
-    CORBA_OctetSeq *operator-> (void);
-    const CORBA_OctetSeq *operator-> (void) const;
-    
-    operator const CORBA_OctetSeq &() const;
-    operator CORBA_OctetSeq &();
-    operator CORBA_OctetSeq &() const;
-    
-    CORBA::Octet & operator[] (CORBA::ULong index);
-    const CORBA::Octet & operator[] (CORBA::ULong index) const;
-    
-    // in, inout, out, _retn 
-    const CORBA_OctetSeq &in (void) const;
-    CORBA_OctetSeq &inout (void);
-    CORBA_OctetSeq *&out (void);
-    CORBA_OctetSeq *_retn (void);
-    CORBA_OctetSeq *ptr (void) const;
-
-  private:
-    CORBA_OctetSeq *ptr_;
-  };
+#if !defined (TAO_OCTETSEQ___VAR_CH)
+#define TAO_OCTETSEQ___VAR_CH
+
+// *************************************************************
+// class CORBA_OctetSeq_var
+// *************************************************************
+
+class TAO_Export CORBA_OctetSeq_var
+{
+public:
+  CORBA_OctetSeq_var (void); // default constructor
+  CORBA_OctetSeq_var (CORBA_OctetSeq *);
+  CORBA_OctetSeq_var (const CORBA_OctetSeq_var &); // copy constructor
+  CORBA_OctetSeq_var (const CORBA_OctetSeq &); // fixed-size base types only
+  ~CORBA_OctetSeq_var (void); // destructor
+
+  CORBA_OctetSeq_var &operator= (CORBA_OctetSeq *);
+  CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq_var &);
+  CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq &); // fixed-size base types only
+  CORBA_OctetSeq *operator-> (void);
+  const CORBA_OctetSeq *operator-> (void) const;
+
+  operator const CORBA_OctetSeq &() const;
+  operator CORBA_OctetSeq &();
+  operator CORBA_OctetSeq &() const;
+
+  CORBA::Octet & operator[] (CORBA::ULong index);
+  const CORBA::Octet & operator[] (CORBA::ULong index) const;
+
+  // in, inout, out, _retn
+  const CORBA_OctetSeq &in (void) const;
+  CORBA_OctetSeq &inout (void);
+  CORBA_OctetSeq *&out (void);
+  CORBA_OctetSeq *_retn (void);
+  CORBA_OctetSeq *ptr (void) const;
+
+private:
+  CORBA_OctetSeq *ptr_;
+};
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_OCTETSEQ___OUT_CH_)
-#define _CORBA_OCTETSEQ___OUT_CH_
-
-  class TAO_Export CORBA_OctetSeq_out
-  {
-  public:
-    CORBA_OctetSeq_out (CORBA_OctetSeq *&);
-    CORBA_OctetSeq_out (CORBA_OctetSeq_var &);
-    CORBA_OctetSeq_out (const CORBA_OctetSeq_out &);
-    CORBA_OctetSeq_out &operator= (const CORBA_OctetSeq_out &);
-    CORBA_OctetSeq_out &operator= (CORBA_OctetSeq *);
-    operator CORBA_OctetSeq *&();
-    CORBA_OctetSeq *&ptr (void);
-    CORBA_OctetSeq *operator-> (void);
-    CORBA::Octet & operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_OctetSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_OctetSeq_var &);
-  };
+#if !defined (TAO_OCTETSEQ___OUT_CH)
+#define TAO_OCTETSEQ___OUT_CH
+
+class TAO_Export CORBA_OctetSeq_out
+{
+public:
+  CORBA_OctetSeq_out (CORBA_OctetSeq *&);
+  CORBA_OctetSeq_out (CORBA_OctetSeq_var &);
+  CORBA_OctetSeq_out (const CORBA_OctetSeq_out &);
+  CORBA_OctetSeq_out &operator= (const CORBA_OctetSeq_out &);
+  CORBA_OctetSeq_out &operator= (CORBA_OctetSeq *);
+  operator CORBA_OctetSeq *&();
+  CORBA_OctetSeq *&ptr (void);
+  CORBA_OctetSeq *operator-> (void);
+  CORBA::Octet & operator[] (CORBA::ULong index);
+
+private:
+  CORBA_OctetSeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_OctetSeq_var &);
+};
 
 
 #endif /* end #if !defined */
 
-// Proxy Broker Factory function pointer declarations.
+extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_OctetSeq;
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA_OctetSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA_OctetSeq*); // noncopying version
@@ -181,8 +179,8 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_OctetSeq
 #ifndef __ACE_INLINE__
 
 
-#if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
-#define _TAO_CDR_OP_CORBA_OctetSeq_H_
+#if !defined TAO_TAO_CDR_OP_CORBA_OctetSeq_H
+#define TAO_TAO_CDR_OP_CORBA_OctetSeq_H
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -193,7 +191,7 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA_OctetSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
+#endif /* TAO_TAO_CDR_OP_CORBA_OctetSeq_H */
 
 
 #endif /* __ACE_INLINE__ */
@@ -207,9 +205,5 @@ TAO_Export CORBA::Boolean operator>> (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/OctetSeqC.i b/TAO/tao/OctetSeqC.i
index 01ffb2d3fba..67f4514fe1d 100644
--- a/TAO/tao/OctetSeqC.i
+++ b/TAO/tao/OctetSeqC.i
@@ -20,11 +20,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_CORBA_OCTETSEQ_CI_)
-#define _CORBA_OCTETSEQ_CI_
+#if !defined (TAO_OCTETSEQ_CI)
+#define TAO_OCTETSEQ_CI
 
 // *************************************************************
-// Inline operations for class CORBA::OctetSeq_var
+// Inline operations for class CORBA_OctetSeq_var
 // *************************************************************
 
 ACE_INLINE
@@ -67,8 +67,8 @@ CORBA_OctetSeq_var::operator= (CORBA_OctetSeq *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA_OctetSeq_var &
-CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p)
+ACE_INLINE CORBA_OctetSeq_var &
+CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -79,8 +79,7 @@ CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p)
         }
       else
         {
-          CORBA_OctetSeq *deep_copy =
-            new CORBA_OctetSeq (*p.ptr_);
+          CORBA_OctetSeq *deep_copy = new CORBA_OctetSeq (*p.ptr_);
           
           if (deep_copy != 0)
             {
@@ -250,8 +249,8 @@ CORBA_OctetSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_
-#define _TAO_CDR_OP_CORBA_OctetSeq_I_
+#if !defined TAO_TAO_CDR_OP_CORBA_OctetSeq_I
+#define TAO_TAO_CDR_OP_CORBA_OctetSeq_I
 
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
@@ -262,5 +261,5 @@ CORBA::Boolean TAO_Export operator>> (
     CORBA_OctetSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */
+#endif /* TAO_TAO_CDR_OP_CORBA_OctetSeq_I */
 
diff --git a/TAO/tao/PP_Memory_Management.txt b/TAO/tao/PP_Memory_Management.txt
deleted file mode 100644
index f9516139582..00000000000
--- a/TAO/tao/PP_Memory_Management.txt
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
-
-@page PP_Memory_Management Memory Management Rules for TAO's Pluggable Protocol Framework
-
-@section background Background
-
-    This document proposes a clearer set of memory management rules
-    for the pluggable protocols framework.
-    To understand this proposal some basic background on how does the
-    pluggable protocol framework works, and how each abstraction
-    relates to the other components in the ORB.
-
-    The pluggable protocol framework uses the Acceptor and Connector
-    patterns, unlike ACE, however, it must treat all of them
-    homogenously.
-    The basic abstraction in TAO's pluggable protocol framework is the
-    <CODE>TAO_Transport</CODE>,
-    an instance of this class represents a single connection, for
-    example, the IIOP plugin uses one instance of TAO_Transport for
-    each socket.
-    To integrate this abstraction with the ACE_Reactor framework,
-    all the protocols implemented so far use
-    specializations of the ACE_Svc_Handler class.
-    However, the original design considered the possibility of using
-    protocols without any ACE abstractions, though in practice this
-    hasn't happenned so far,
-    all changes to the framework should keep this possibility open.
-
-    This is the main source of memory management problems in the
-    pluggable protocol framework:
-    a single entity (a connection) is represented by two instances of
-    two separate classes.  On one side the ORB uses an instance of the
-    TAO_Transport abstraction, on the other the Reactor uses an
-    instance of an ACE_Svc_Handler.
-
-    To complicate matters even further the ORB caches both passively
-    accepted and actively established connections.
-    The actively established connections are cached by the client-side
-    to minimize or amortize the cost of connection establishment.
-    The passively accepted connections are kept in the same cache
-    mainly to support bi-directional GIOP, however, they also allow us
-    to close both accepted and established idle connections using a
-    single component, this is useful when the ORB shutdowns, but it is
-    crucial in the implementation of connection recycling strategies,
-    where the total number of connections kept by the ORB must be
-    known.
-
-    The design must also support multithreaded clients and servers, in
-    both cases multiple threads may be using a connection
-    simultaneously, for example, multiple client threads can be
-    waiting for replys over the same connection, or multiple server
-    threads can be servicing requests received on the same connection,
-    or, if bi-dir GIOP is enabled, maybe a mix of both.
-
-    Some aspects of the GIOP protocol require special treatment of
-    connections with pending requests, both on the server and client
-    side.
-    On the server side connections that have pending requests cannot
-    be closed (section 15.5.1.1 in the CORBA/IIOP 2.4 specification),
-    therefore, the ORB needs to know how many requests are pending, at
-    all times.
-    Despite this, it is possible that the underlying connection is
-    broken, for example, because the client crashed.  In such cases,
-    the ORB should be able to reclaim the OS resources, but the
-    TAO_Transport must remain valid until the upcall threads finish.
-    Similarly, the client side should be able to distinguish between
-    orderly and abortive disconnects, essentially the ORB needs to
-    know if a <CODE>CloseConnection</CODE> message has been received.
-
-    Finally we must never forget that the ORB can be used in
-    thread-per-connection mode.  In this concurrency model there is no
-    reactor used to detect when the connection can accept more input,
-    though normally this is a global setting, it is possible for a
-    pluggable protocol to *always* work in thread-per-connection and
-    no other architecture.
-    Similarly, the ORB can be configured to wait for replys using
-    read() operations, instead of the more generic wait-on-reactor or
-    wait-on-leader-follower strategies.
-    Therefore, we cannot always rely on the Reactor framework to
-    perform all the memory management for us.
-
-@section requirements Requirements
-
-    To summarize, the TAO_Transport class should:
-
-    - Not be deleted until all threads using it is released by all the
-      threads using it.
-    - As many OS and ORB resources must be released when the ORB
-      detects that the connection has been terminated.  For example,
-      the socket should be closed and the ACE_Svc_Handler, if any,
-      should be destroyed.
-    - Not be deleted until it is removed from the connection cache.
-    - Support a mechanism to proactively close the connection.
-    - Keep track of the number of pending requests in a connection.
-
-@section rules Memory Management Rules
-
-    Instances of TAO_Transport are reference counted,
-    this is a simple way to share it among the threads using it to
-    send or receive invocations, the cache, and the potential
-    connection handler using it.
-    However, the service handler should follow the standard rules for
-    the Reactor, i.e. the Reactor owns it, and is destroyed as soon as
-    the connection is closed.
-
-    The underlying connection can be closed by the remote peer,
-    in this case, either the Reactor or the thread blocked on
-    <CODE>read()</CODE> will detect the problem.
-    Following the normal conventions, the ACE_Svc_Handler would be
-    closed as soon as this is detected.
-    The corresponding TAO_Transport must be informed, otherwise it
-    could attempt to use a connection already closed.
-
-    Finally if the connection is proactively closed, the TAO_Transport
-    informs the ACE_Svc_Handler, at this point the ACE_Svc_Handler
-    commits suicide by removing itself from the reactor.
-    Notice that it must still callback the TAO_Transport in this
-    case.
-
-@section data Processing Incoming and Outgoing Data
-
-    The final aspect to consider is the processing of incoming and
-    outgoing data.  We are still working on this problem, but the
-    current approach is more complex than it has to be.
-    The usual path is as follows: the Reactor signals (via
-    handle_input) that there is some data available in the socket.
-    The message is forwarded from the ACE_Svc_Handler to the
-    TAO_Transport, then to several helper classes in the pluggable
-    protocol framework.  Eventually a method is invoked on the
-    TAO_Tranport to read the actual data, this forwards on the
-    ACE_Svc_Handler (again), and eventually returns.
-
-    A much simpler approach would be to read the data on the
-    handle_input() method itself, and forward the data up the stream.
-
-*/
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 8b9b64e7fe5..b90bf7773e6 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -173,6 +173,7 @@ TAO_Connector::make_mprofile (const char *string,
           this->make_profile (endpoint.c_str (),
                               profile,
                               ACE_TRY_ENV);
+
           ACE_CHECK_RETURN (-1);
           // Failure:  Problem during profile creation
 
@@ -181,8 +182,6 @@ TAO_Connector::make_mprofile (const char *string,
           // Give up ownership of the profile.
           if (mprofile.give_profile (profile) == -1)
             {
-              profile->_decr_refcnt ();
-
               ACE_THROW_RETURN (CORBA::INV_OBJREF (
                                   CORBA_SystemException::_tao_minor_code (
                                      TAO_MPROFILE_CREATION_ERROR,
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
index 94f332f2382..be7acbe38da 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -1002,14 +1002,14 @@ void
 TAO_Policy_Manager_Impl::server_protocol (TAO_ServerProtocolPolicy *server_protocol)
 {
   CORBA::release (this->server_protocol_);
-  this->server_protocol_ = RTCORBA::ServerProtocolPolicy::_duplicate (server_protocol);
+  this->server_protocol_ = server_protocol;
 }
 
 void
 TAO_Policy_Manager_Impl::client_protocol (TAO_ClientProtocolPolicy *client_protocol)
 {
   CORBA::release (this->client_protocol_);
-  this->client_protocol_ = RTCORBA::ClientProtocolPolicy::_duplicate (client_protocol);
+  this->client_protocol_ = client_protocol;
 }
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/PortableInterceptor.cpp b/TAO/tao/PortableInterceptor.cpp
index 6bc4021d9a3..fc50eedcd2d 100644
--- a/TAO/tao/PortableInterceptor.cpp
+++ b/TAO/tao/PortableInterceptor.cpp
@@ -1,23 +1,24 @@
 // $Id$:
 
+#include "tao/corbafwd.h"
 #include "tao/PortableInterceptor.h"
 
-#if TAO_HAS_INTERCEPTORS == 1
+#if (TAO_HAS_INTERCEPTORS == 1)
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableInterceptor.i"
 #endif /* defined INLINE */
 
-TAO_ClientRequestInterceptor_Adapter::
-~TAO_ClientRequestInterceptor_Adapter (void)
-{
-}
-
-// -------------------------------------------------------------------
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
 
-TAO_ServerRequestInterceptor_Adapter::
-~TAO_ServerRequestInterceptor_Adapter (void)
-{
-}
+// Followings are the defualt no-op implementation of client-side and
+// server-side interceptors.  The sole purpose to to let user
+// overwrite only the interception operations they are interested in
+// without providing others.
 
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
+// ** Users should always provide a name by dupping a string.
+//  char * POA_PortableInterceptor::
+//  Interceptor::name (CORBA::Environment &)
+//  {
+//    return CORBA::string_dup ("TAO default");
+//  }
diff --git a/TAO/tao/PortableInterceptor.i b/TAO/tao/PortableInterceptor.i
index 83b10444fef..7b8613ea68c 100644
--- a/TAO/tao/PortableInterceptor.i
+++ b/TAO/tao/PortableInterceptor.i
@@ -12,6 +12,12 @@ TAO_ClientRequestInterceptor_Adapter::TAO_ClientRequestInterceptor_Adapter
   this->len_ = interceptors.size ();
 }
 
+ACE_INLINE
+TAO_ClientRequestInterceptor_Adapter::
+~TAO_ClientRequestInterceptor_Adapter (void)
+{
+}
+
 ACE_INLINE void
 TAO_ClientRequestInterceptor_Adapter::
 send_request (PortableInterceptor::ClientRequestInfo_ptr ri,
@@ -141,6 +147,12 @@ TAO_ServerRequestInterceptor_Adapter::TAO_ServerRequestInterceptor_Adapter
   this->len_ = interceptors.size ();
 }
 
+ACE_INLINE
+TAO_ServerRequestInterceptor_Adapter::
+~TAO_ServerRequestInterceptor_Adapter (void)
+{
+}
+
 ACE_INLINE void
 TAO_ServerRequestInterceptor_Adapter::
 receive_request_service_contexts (
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index a36b8d0b4e5..766e604acae 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -24,12 +24,7 @@
 // This file contains the interface definitions for "Portable"
 // Interceptor support.
 // The following is from orbos/99-12-02 Portable Interceptors spec,
-// the full IDL is downloadable from orbos/99-12-02.
-//
-// Additional updates from ptc/00-08-05 are also included.  Changes
-// include:
-//    - addition of the Interceptor::destroy() method
-//    - move of CodecFactory and Codec interfaces to the IOP module
+// the full IDL is downloadable from orbos/99-12-02
 
 // File: PortableInterceptor.idl
 #ifndef _PORTABLE_INTERCEPTOR_IDL_
@@ -52,7 +47,6 @@ module PortableInterceptor {
 
   local interface Interceptor {
     readonly attribute string name;
-    void destroy ();
   };
 
   exception ForwardRequest {
@@ -103,7 +97,10 @@ module PortableInterceptor {
     readonly attribute any received_exception;
     readonly attribute CORBA::RepositoryId received_exception_id;
     IOP::TaggedComponent get_effective_component (in IOP::ComponentId id);
-    IOP::TaggedComponentSeq get_effective_components (in IOP::ComponentId id);
+
+    // Removed it for starters
+    // IOP_N::TaggedComponentSeq get_effective_components (in IOP::ComponentId id);
+
     CORBA::Policy get_request_policy (in CORBA::PolicyType type);
     void add_request_service_context (
       in IOP::ServiceContext service_context,
@@ -166,7 +163,9 @@ module PortableInterceptor {
 
     readonly attribute CORBA::StringSeq arguments;
     readonly attribute string orb_id;
-    readonly attribute IOP::CodecFactory codec_factory;
+
+    // Shall not need this for starters
+    // readonly attribute IOP_N::CodecFactory codec_factory;
 
     void register_initial_reference (in ObjectId id, in Object obj)
       raises (InvalidName);
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 4a9f05edc20..0355ed31545 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -21,20 +21,15 @@
 
 #include "PortableInterceptorC.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
 #if !defined (__ACE_INLINE__)
 #include "PortableInterceptorC.i"
 #endif /* !defined INLINE */
 
-#include "CORBA_String.h"
+#include "tao/CORBA_String.h"
 
 // default constructor
-PortableInterceptor::Interceptor::Interceptor ()
-{
-  }
+PortableInterceptor::Interceptor::Interceptor (void)
+{}
 
 // destructor
 PortableInterceptor::Interceptor::~Interceptor (void)
@@ -88,7 +83,7 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -162,7 +157,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -175,7 +170,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -335,7 +330,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -348,7 +343,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -381,9 +376,8 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
 
 
 // default constructor
-PortableInterceptor::Current::Current ()
-{
-  }
+PortableInterceptor::Current::Current (void)
+{}
 
 // destructor
 PortableInterceptor::Current::~Current (void)
@@ -449,7 +443,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -462,9 +456,8 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const
 
 
 // default constructor
-PortableInterceptor::RequestInfo::RequestInfo ()
-{
-  }
+PortableInterceptor::RequestInfo::RequestInfo (void)
+{}
 
 // destructor
 PortableInterceptor::RequestInfo::~RequestInfo (void)
@@ -518,7 +511,7 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -531,9 +524,8 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co
 
 
 // default constructor
-PortableInterceptor::ClientRequestInfo::ClientRequestInfo ()
-{
-  }
+PortableInterceptor::ClientRequestInfo::ClientRequestInfo (void)
+{}
 
 // destructor
 PortableInterceptor::ClientRequestInfo::~ClientRequestInfo (void)
@@ -599,7 +591,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -612,9 +604,8 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
 
 
 // default constructor
-PortableInterceptor::ServerRequestInfo::ServerRequestInfo ()
-{
-  }
+PortableInterceptor::ServerRequestInfo::ServerRequestInfo (void)
+{}
 
 // destructor
 PortableInterceptor::ServerRequestInfo::~ServerRequestInfo (void)
@@ -680,7 +671,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -693,9 +684,8 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
 
 
 // default constructor
-PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor ()
-{
-  }
+PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor (void)
+{}
 
 // destructor
 PortableInterceptor::ClientRequestInterceptor::~ClientRequestInterceptor (void)
@@ -761,7 +751,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -774,9 +764,8 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository
 
 
 // default constructor
-PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor ()
-{
-  }
+PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void)
+{}
 
 // destructor
 PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void)
@@ -842,7 +831,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -855,9 +844,8 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository
 
 
 // default constructor
-PortableInterceptor::IORInfo::IORInfo ()
-{
-  }
+PortableInterceptor::IORInfo::IORInfo (void)
+{}
 
 // destructor
 PortableInterceptor::IORInfo::~IORInfo (void)
@@ -911,7 +899,7 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -924,9 +912,8 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
 
 
 // default constructor
-PortableInterceptor::IORInterceptor::IORInterceptor ()
-{
-  }
+PortableInterceptor::IORInterceptor::IORInterceptor (void)
+{}
 
 // destructor
 PortableInterceptor::IORInterceptor::~IORInterceptor (void)
@@ -992,7 +979,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1005,9 +992,8 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void)
 
 
 // default constructor
-PortableInterceptor::PolicyFactory::PolicyFactory ()
-{
-  }
+PortableInterceptor::PolicyFactory::PolicyFactory (void)
+{}
 
 // destructor
 PortableInterceptor::PolicyFactory::~PolicyFactory (void)
@@ -1061,7 +1047,7 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1074,9 +1060,8 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void)
 
 
 // default constructor
-PortableInterceptor::ORBInitInfo::ORBInitInfo ()
-{
-  }
+PortableInterceptor::ORBInitInfo::ORBInitInfo (void)
+{}
 
 // destructor
 PortableInterceptor::ORBInitInfo::~ORBInitInfo (void)
@@ -1130,7 +1115,7 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1289,9 +1274,8 @@ CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
 
 
 // default constructor
-PortableInterceptor::ORBInitializer::ORBInitializer ()
-{
-  }
+PortableInterceptor::ORBInitializer::ORBInitializer (void)
+{}
 
 // destructor
 PortableInterceptor::ORBInitializer::~ORBInitializer (void)
@@ -1345,7 +1329,7 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-    
+
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1615,4 +1599,3 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
   #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index d5d92d38e32..4a424a219f4 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -23,8 +23,7 @@
 #define _TAO_IDL_PORTABLEINTERCEPTORC_H_
 
 #include "ace/pre.h"
-
-#include "corbafwd.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -54,10 +53,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 TAO_NAMESPACE  PortableInterceptor
 {
 
@@ -164,20 +159,12 @@ class TAO_Export Interceptor : public virtual CORBA_Object
         CORBA::SystemException
       )) = 0;
 
-    virtual void destroy (
-        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    Interceptor ();
-
+    Interceptor (void);
     virtual ~Interceptor (void);
   private:
     Interceptor (const Interceptor &);
@@ -428,8 +415,7 @@ class TAO_Export Current: public virtual CORBA::Current
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    Current ();
-
+    Current (void);
     virtual ~Current (void);
   private:
     Current (const Current &);
@@ -537,7 +523,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       }
 
     virtual CORBA::ULong request_id (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -545,7 +531,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual char * operation (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -553,7 +539,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::ParameterList * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -561,7 +547,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::ExceptionList * exceptions (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -569,7 +555,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::ContextList * contexts (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -577,7 +563,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual Dynamic::RequestContext * operation_context (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -585,7 +571,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Any * result (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -593,27 +579,27 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Boolean response_expected (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-#if TAO_HAS_CORBA_MESSAGING == 1
+#if (TAO_HAS_CORBA_MESSAGING == 1)
 
     virtual Messaging::SyncScope sync_scope (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-#endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
+#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
     virtual PortableInterceptor::ReplyStatus reply_status (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -621,7 +607,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual CORBA::Object_ptr forward_reference (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -661,8 +647,7 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    RequestInfo ();
-
+    RequestInfo (void);
     virtual ~RequestInfo (void);
   private:
     RequestInfo (const RequestInfo &);
@@ -770,7 +755,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       }
 
     virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -778,7 +763,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual CORBA::Object_ptr effective_target (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -786,7 +771,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual IOP::TaggedProfile * effective_profile (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -794,7 +779,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual CORBA::Any * received_exception (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -802,7 +787,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
       )) = 0;
 
     virtual char * received_exception_id (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -811,17 +796,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
 
     virtual IOP::TaggedComponent * get_effective_component (
         IOP::ComponentId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual IOP::TaggedComponentSeq * get_effective_components (
-        IOP::ComponentId id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -829,8 +804,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
 
     virtual CORBA::Policy_ptr get_request_policy (
         CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -839,8 +813,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     virtual void add_request_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -851,8 +824,7 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    ClientRequestInfo ();
-
+    ClientRequestInfo (void);
     virtual ~ClientRequestInfo (void);
   private:
     ClientRequestInfo (const ClientRequestInfo &);
@@ -960,32 +932,28 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
       }
 
     virtual CORBA::Any * sending_exception (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::OctetSeq * object_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual CORBA::OctetSeq * adapter_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
     virtual char * target_most_derived_interface (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -993,8 +961,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
 
     virtual CORBA::Policy_ptr get_server_policy (
         CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1003,9 +970,8 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     virtual void set_slot (
         PortableInterceptor::SlotId id,
         const CORBA::Any & data,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::InvalidSlot
@@ -1013,8 +979,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
 
     virtual CORBA::Boolean target_is_a (
         const char * id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1023,9 +988,8 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     virtual void add_reply_service_context (
         const IOP::ServiceContext & service_context,
         CORBA::Boolean replace,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1035,8 +999,7 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    ServerRequestInfo ();
-
+    ServerRequestInfo (void);
     virtual ~ServerRequestInfo (void);
   private:
     ServerRequestInfo (const ServerRequestInfo &);
@@ -1146,7 +1109,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     virtual void send_request (
         PortableInterceptor::ClientRequestInfo_ptr ri
         TAO_ENV_ARG_DECL_WITH_DEFAULTS
-      )
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
@@ -1163,7 +1126,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     virtual void receive_reply (
         PortableInterceptor::ClientRequestInfo_ptr ri
         TAO_ENV_ARG_DECL_WITH_DEFAULTS
-      )
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1171,7 +1134,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     virtual void receive_exception (
         PortableInterceptor::ClientRequestInfo_ptr ri
         TAO_ENV_ARG_DECL_WITH_DEFAULTS
-      )
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
@@ -1191,8 +1154,7 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    ClientRequestInterceptor ();
-
+    ClientRequestInterceptor (void);
     virtual ~ClientRequestInterceptor (void);
   private:
     ClientRequestInterceptor (const ClientRequestInterceptor &);
@@ -1311,7 +1273,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     virtual void receive_request (
         PortableInterceptor::ServerRequestInfo_ptr ri
         TAO_ENV_ARG_DECL_WITH_DEFAULTS
-      )
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
@@ -1320,7 +1282,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     virtual void send_reply (
         PortableInterceptor::ServerRequestInfo_ptr ri
         TAO_ENV_ARG_DECL_WITH_DEFAULTS
-      )
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
@@ -1328,7 +1290,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     virtual void send_exception (
         PortableInterceptor::ServerRequestInfo_ptr ri
         TAO_ENV_ARG_DECL_WITH_DEFAULTS
-      )
+        )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         PortableInterceptor::ForwardRequest
@@ -1348,8 +1310,7 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    ServerRequestInterceptor ();
-
+    ServerRequestInterceptor (void);
     virtual ~ServerRequestInterceptor (void);
   private:
     ServerRequestInterceptor (const ServerRequestInterceptor &);
@@ -1458,8 +1419,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
 
     virtual CORBA::Policy_ptr get_effective_policy (
         CORBA::PolicyType type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1467,8 +1427,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
 
     virtual void add_ior_component (
         const IOP::TaggedComponent & component,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1477,8 +1436,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     virtual void add_ior_component_to_profile (
         const IOP::TaggedComponent & component,
         IOP::ProfileId profile_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
+        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
@@ -1489,8 +1447,7 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    IORInfo ();
-
+    IORInfo (void);
     virtual ~IORInfo (void);
   private:
     IORInfo (const IORInfo &);
@@ -1610,8 +1567,7 @@ class TAO_Export IORInterceptor: public virtual Interceptor
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    IORInterceptor ();
-
+    IORInterceptor (void);
     virtual ~IORInterceptor (void);
   private:
     IORInterceptor (const IORInterceptor &);
@@ -1733,8 +1689,7 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    PolicyFactory ();
-
+    PolicyFactory (void);
     virtual ~PolicyFactory (void);
   private:
     PolicyFactory (const PolicyFactory &);
@@ -1931,7 +1886,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
 #endif /* end #if !defined */
 
     virtual CORBA::StringSeq * arguments (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1939,15 +1894,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual char * orb_id (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual IOP::CodecFactory_ptr codec_factory (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -2006,7 +1953,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
       )) = 0;
 
     virtual PortableInterceptor::SlotId allocate_slot_id (
-        CORBA::Environment &ACE_TRY_ENV =
+                CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -2028,8 +1975,7 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    ORBInitInfo ();
-
+    ORBInitInfo (void);
     virtual ~ORBInitInfo (void);
   private:
     ORBInitInfo (const ORBInitInfo &);
@@ -2157,8 +2103,7 @@ class TAO_Export ORBInitializer : public virtual CORBA_Object
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    ORBInitializer ();
-
+    ORBInitializer (void);
     virtual ~ORBInitializer (void);
   private:
     ORBInitializer (const ORBInitializer &);
@@ -2168,17 +2113,15 @@ class TAO_Export ORBInitializer : public virtual CORBA_Object
 
 #endif /* end #if !defined */
 
-/// Register an ORBInitializer with the global ORBInitializer
-/// table.
-TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
-  ORBInitializer_ptr init,
-  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ /// Register an ORBInitializer with the global ORBInitializer
+ /// table.
+ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
+   ORBInitializer_ptr init,
+   CORBA::Environment & = TAO_default_environment ());
 
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
-// Proxy Broker Factory function pointer declarations.
-
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated
@@ -2208,9 +2151,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::Inval
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile
index b357d03eb95..8024d0a922a 100644
--- a/TAO/tao/PortableServer/Makefile
+++ b/TAO/tao/PortableServer/Makefile
@@ -873,6 +873,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1026,17 +1041,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i
 
@@ -1318,6 +1326,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -2347,6 +2370,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -2630,6 +2668,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -3096,8 +3149,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -3394,6 +3462,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -3643,8 +3726,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -4266,8 +4364,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -4564,6 +4677,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -4730,8 +4858,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -4752,6 +4878,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -4811,8 +4939,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -4824,20 +4967,15 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/ORB_Core.i \
  PortableServerC.h portableserver_export.h PortableServerC.i \
  Servant_Base.h Servant_Base.i Collocated_Object.h Collocated_Object.i \
- $(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 \
- ThruPOA_Object_Proxy_Impl.h \
- portableserver_export.h \
- Direct_Object_Proxy_Impl.h \
- ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/OctetSeqC.h \
  $(TAO_ROOT)/tao/OctetSeqC.i \
- ServerRequestInfo.inl \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
  MessagingS_T.h MessagingS_T.i MessagingS_T.cpp MessagingS.i \
  Operation_Table.h Object_Adapter.h Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
@@ -4982,25 +5120,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Acceptor_Filter.i \
  $(TAO_ROOT)/tao/RTCORBAC.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -5008,13 +5131,28 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/RTCORBAC.i \
  RT_Acceptor_Filters.i \
diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp
index 8c1dcbad4a2..090ab78e4fd 100644
--- a/TAO/tao/PortableServer/ORB_Manager.cpp
+++ b/TAO/tao/PortableServer/ORB_Manager.cpp
@@ -273,9 +273,14 @@ TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV,
   this->poa_manager_->activate (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run (tv, ACE_TRY_ENV);
+  int status = this->orb_->run (tv, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  if (status == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"),
+                       ACE_TEXT ("run")),
+                      -1);
   return 0;
 }
 
@@ -286,9 +291,14 @@ TAO_ORB_Manager::run (ACE_Time_Value &tv,
   this->poa_manager_->activate (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run (tv, ACE_TRY_ENV);
+  int status = this->orb_->run (tv, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  if (status == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"),
+                       ACE_TEXT ("run")),
+                      -1);
   return 0;
 }
 
@@ -313,9 +323,14 @@ TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV)
   this->poa_manager_->activate (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
-  this->orb_->run (ACE_TRY_ENV);
+  int status = this->orb_->run (ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
+  if (status == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"),
+                       ACE_TEXT ("run")),
+                      -1);
   return 0;
 }
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 07f4668ad49..07ed3fdde40 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -22,9 +22,7 @@
 # include "Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PortableServer,
-           Object_Adapter,
-           "$Id$")
+ACE_RCSID(tao, Object_Adapter, "$Id$")
 
 // Timeprobes class
 #include "tao/Timeprobe.h"
@@ -520,13 +518,18 @@ TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
 void
 TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
 {
+  // Only set the auto_ptr if poa_manager is allocated here.
+  auto_ptr<TAO_POA_Manager> safe_poa_manager;
+
   TAO_POA_Manager *poa_manager;
   ACE_NEW_THROW_EX (poa_manager,
                     TAO_POA_Manager (*this),
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  PortableServer::POAManager_var safe_poa_manager = poa_manager;
+  ACE_AUTO_PTR_RESET (safe_poa_manager,
+                      poa_manager,
+                      TAO_POA_Manager);
 
 #if 0
   TAO_POA_Policies root_poa_policies (this->orb_core_,
@@ -550,9 +553,8 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
 #endif /* 0 */
 
   // Construct a new POA
-  TAO_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
   ACE_NEW_THROW_EX (this->root_,
-                    TAO_POA (root_poa_name,
+                    TAO_POA (TAO_DEFAULT_ROOTPOA_NAME,
                              *poa_manager,
                              policies,
                              0,
@@ -569,10 +571,11 @@ TAO_Object_Adapter::open (CORBA::Environment &ACE_TRY_ENV)
   // been destroyed yet or not.
   this->root_->_add_ref ();
 
-  // Release the POA_Manager_var since we got here without error.  The
-  // TAO_POA object takes ownership of the POA_Manager object
-  // (actually it shares the ownership with its peers).
-  (void) safe_poa_manager._retn ();
+  // Release the auto_ptr since we got here without error, the TAO_POA
+  // object takes ownership of the POA_Manager object (actually it
+  // shares the ownership with its peers).
+
+  (void) safe_poa_manager.release ();
 }
 
 void
@@ -633,15 +636,17 @@ TAO_Object_Adapter::dispatch (TAO_ObjectKey &key,
       return TAO_Adapter::DS_MISMATCHED_KEY;
     }
 
-  int result = 0;
-
 #if TAO_HAS_INTERCEPTORS == 1
   TAO_ServerRequestInterceptor_Adapter sri_adapter (
     this->orb_core_.server_request_interceptors (),
     request.interceptor_count ());
 
   TAO_ServerRequestInfo ri (request);
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
+  int result = 0;
 
+#if TAO_HAS_INTERCEPTORS == 1
   ACE_TRY
     {
       // The receive_request_service_contexts() interception point
@@ -1529,7 +1534,7 @@ TAO_Object_Adapter::Priority_Model_Processing::pre_invoke (
           if (poa_.orb_core ().get_protocols_hooks ()->
               set_thread_priority (&poa_.orb_core (),
                                    target_priority,
-                                   ACE_TRY_ENV)
+                                   ACE_TRY_ENV) 
               == -1)
             ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 9e3a0661ab0..9f634a93cc5 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -374,17 +374,17 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                              ACE_TRY_ENV),
                     CORBA::NO_MEMORY ());
 
-  // Give ownership of the new map to the POA_var.  Note, that it
-  // is important for the POA_var to take ownership before
+  // Give ownership of the new map to the auto pointer.  Note, that it
+  // is important for the auto pointer to take ownership before
   // checking for exception since we may need to delete the new map.
-  PortableServer::POA_var new_poa = poa;
+  auto_ptr<TAO_POA> new_poa (poa);
 
   // Check for exception in construction of the POA.
   ACE_CHECK_RETURN (0);
 
   // Add to children map
   result = this->children_.bind (adapter_name,
-                                 poa);
+                                 new_poa.get ());
   if (result != 0)
     {
       ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
@@ -402,13 +402,9 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
   // initialized, the application can initialize the POA by invoking
   // find_POA with a TRUE activate parameter.
 
-  // Everything is fine. Don't let the POA_var release the
+  // Everything is fine. Don't let the auto_ptr delete the
   // implementation.
-  (void) new_poa._retn ();  // We could do a "return new_poa._retn()"
-                            // but the return type doesn't match this
-                            // method's return type.
-
-  return poa;
+  return new_poa.release ();
 }
 
 PortableServer::POA_ptr
@@ -4166,7 +4162,7 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
 
 #if (TAO_HAS_RT_CORBA == 1)
 
-      if (this->policies ().priority_bands () != 0)
+      if (this->policies ().priority_bands () == 0)
         {
           TAO_Priority_Acceptor_Filter
             filter (this->policies ().server_protocol ()->protocols_rep (),
@@ -4178,17 +4174,9 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key,
                                                      &filter,
                                                      ACE_TRY_ENV);
         }
-
-      else
-        {
-          data = this->orb_core_.create_stub_object (key,
-                                                     type_id,
-                                                     client_exposed_policies._retn (),
-                                                     this->acceptor_filter_,
-                                                     ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
 #endif /* TAO_HAS_RT_CORBA == 1 */
+
+      ACE_CHECK_RETURN (0);
     }
   else
     {
@@ -4336,25 +4324,10 @@ TAO_POA::imr_notify_startup (CORBA_Environment &ACE_TRY_ENV)
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Informing IMR that we are running at: %s\n", curr_addr.in ()));
 
-  ACE_TRY
-    {
-      imr_admin->server_is_running (this->name ().c_str (),
-                                    curr_addr.in (),
-                                    svr.in (),
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_RE_THROW;
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-          CORBA_SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-          CORBA::COMPLETED_NO));
-    }
-  ACE_ENDTRY;
+  imr_admin->server_is_running (this->name ().c_str (),
+                                curr_addr.in (),
+                                svr.in (),
+                                ACE_TRY_ENV);
   ACE_CHECK;
 
   if (TAO_debug_level > 0)
@@ -4400,7 +4373,9 @@ template class ACE_Array<PortableServer::ObjectId>;
 template class ACE_Array_Base<PortableServer::ObjectId>;
 
 //template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
+template class ACE_Auto_Basic_Ptr<TAO_POA>;
 template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
+template class ACE_Auto_Basic_Ptr<TAO_POA_Manager>;
 template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
 template class ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>;
 template class ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
@@ -4414,7 +4389,9 @@ template class ACE_Write_Guard<ACE_Lock>;
 template class ACE_Read_Guard<ACE_Lock>;
 
 //template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
+template class auto_ptr<TAO_POA>;
 template class auto_ptr<TAO_Active_Object_Map>;
+template class auto_ptr<TAO_POA_Manager>;
 template class ACE_Node<TAO_POA *>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -4423,7 +4400,9 @@ template class ACE_Node<TAO_POA *>;
 #pragma instantiate ACE_Array_Base<PortableServer::ObjectId>
 
 //#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA_Manager>
 #pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>
 #pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
@@ -4437,6 +4416,8 @@ template class ACE_Node<TAO_POA *>;
 #pragma instantiate ACE_Read_Guard<ACE_Lock>
 
 //#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
+#pragma instantiate auto_ptr<TAO_POA>
 #pragma instantiate auto_ptr<TAO_Active_Object_Map>
+#pragma instantiate auto_ptr<TAO_POA_Manager>
 #pragma instantiate ACE_Node<TAO_POA *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index ee9bd0e96b1..06ed32203bc 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -325,11 +325,10 @@ TAO_ServantBase_var::~TAO_ServantBase_var (void)
 TAO_ServantBase_var &
 TAO_ServantBase_var::operator= (TAO_ServantBase *p)
 {
-  if (this->ptr_ == p)
-    return *this;
-
   if (this->ptr_ != 0)
-    this->ptr_->_remove_ref ();
+    {
+      this->ptr_->_remove_ref ();
+    }
 
   this->ptr_ = p;
 
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index fa590c398f5..c469667ca5c 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -5,11 +5,8 @@
 #include "ServerRequestInfo.h"
 
 #include "tao/TAO_Server_Request.h"
-#include "tao/PolicyC.h"
 
-ACE_RCSID (TAO_PortableServer,
-           ServerRequestInfo,
-           "$Id$")
+ACE_RCSID (PortableServer, ServerRequestInfo, "$Id$")
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
@@ -20,9 +17,6 @@ ACE_RCSID (TAO_PortableServer,
 TAO_ServerRequestInfo::TAO_ServerRequestInfo (
   TAO_ServerRequest &server_request)
   : server_request_ (server_request),
-    forward_reference_ (),
-    //    poa_current_ (),
-    adapter_id_ (),
     caught_exception_ (0),
     reply_status_ (-1)
 {
@@ -46,40 +40,40 @@ Dynamic::ParameterList *
 TAO_ServerRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 Dynamic::ExceptionList *
 TAO_ServerRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 Dynamic::ContextList *
 TAO_ServerRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 Dynamic::RequestContext *
 TAO_ServerRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 CORBA::Any *
 TAO_ServerRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    0);
+  // @@ Need the minor code once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
 }
 
 CORBA::Boolean
@@ -97,8 +91,8 @@ TAO_ServerRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
   if (this->server_request_.sync_with_server ())
     return Messaging::SYNC_WITH_SERVER;
 
-  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                    -1);
+  // @@ Need the minor once it becomes available.
+  ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), -1);
 }
 #endif  /* TAO_HAS_CORBA_MESSAGING */
 
@@ -108,8 +102,7 @@ TAO_ServerRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
 {
   if (this->reply_status_ == -1)
     // A reply hasn't been received yet.
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
-                      -1);
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), -1);
 
   return this->reply_status_;
 }
@@ -118,8 +111,10 @@ CORBA::Object_ptr
 TAO_ServerRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
-    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10, CORBA::COMPLETED_NO),
+  if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD
+      && this->reply_status_ !=
+           PortableInterceptor::LOCATION_FORWARD_PERMANENT)
+    ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (),
                       CORBA::Object::_nil ());
 
   // We don't get the forward reference from the TAO_ServerRequest
@@ -176,7 +171,11 @@ TAO_ServerRequestInfo::get_request_service_context (
         return safe_service_context._retn ();
       }
 
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (23, CORBA::COMPLETED_NO),
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO_DEFAULT_MINOR_CODE,
+                        EINVAL), // @@ Need minor code from PI spec!
+                      CORBA::COMPLETED_NO),
                     0);
 }
 
@@ -211,7 +210,11 @@ TAO_ServerRequestInfo::get_reply_service_context (
         return safe_service_context._retn ();
       }
 
-  ACE_THROW_RETURN (CORBA::BAD_PARAM (23, CORBA::COMPLETED_NO),
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO_DEFAULT_MINOR_CODE,
+                        EINVAL), // @@ Need minor code from PI spec!
+                      CORBA::COMPLETED_NO),
                     0);
 }
 
@@ -226,14 +229,12 @@ TAO_ServerRequestInfo::sending_exception (CORBA::Environment &ACE_TRY_ENV)
   if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
       && this->reply_status_ != PortableInterceptor::USER_EXCEPTION)
     {
-      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (10,
-                                              CORBA::COMPLETED_NO),
-                        0);
+      // @@ Need the minor code once it is available.
+      ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0);
     }
 
-  // The spec says that if it is a user exception which cannot be
-  // inserted then the UNKNOWN exception should be thrown with minor
-  // code 1.
+  // The spec says that if it is a user exception which cant be inserted
+  // then the UNKNOWN exception needs to be thrown with minor code TBD_U.
 
   CORBA::Any * temp = 0;
 
@@ -267,38 +268,11 @@ CORBA::OctetSeq *
 TAO_ServerRequestInfo::object_id (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-#if 0
-  if (CORBA::is_nil (this->poa_current_.in ()))
-    {
-      CORBA::Object_var p =
-        this->server_request_.orb_core ()->poa_current ();
-
-      this->poa_current_ =
-        PortableServer::Current::_narrow (p.in (),
-                                          ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (CORBA::is_nil (this->poa_current_.in ()))
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  ACE_TRY
-    {
-      CORBA::OctetSeq_var obj_id =
-        this->poa_current_->get_object_id (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return obj_id._retn ();
-    }
-  ACE_CATCH (PortableServer::Current::NoContext, exc)
-    {
-      // Convert the NoContext exception to a NO_RESOURCES exception.
-
-      ACE_THROW_RETURN (CORBA::NO_RESOURCES (1, CORBA::COMPLETED_NO),
-                        0);
-    }
-  ACE_ENDTRY;
-#endif  /* 0 */
+//   if (this->object_id_.in () == 0)
+//     {
+//       // @@ Need the minor code once it is available.
+//       ACE_THROW_RETURN (CORBA::NO_RESOURCES (), 0);
+//     }
 
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA::SystemException::_tao_minor_code (
@@ -314,9 +288,8 @@ TAO_ServerRequestInfo::adapter_id (CORBA::Environment &ACE_TRY_ENV)
 {
 //   if (this->adapter_id_.in () == 0)
 //     {
-//       ACE_THROW_RETURN (CORBA::NO_RESOURCES (1,
-//                                              CORBA::COMPLETED_NO),
-//                         0);
+//       // @@ Need the minor code once it is available.
+//       ACE_THROW_RETURN (CORBA::NO_RESOURCES (), 0);
 //     }
 
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
@@ -332,20 +305,16 @@ TAO_ServerRequestInfo::target_most_derived_interface (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_RESOURCES (1, CORBA::COMPLETED_NO), 0);
+  // @@ Need the minor code once it is available.
+  ACE_THROW_RETURN (CORBA::NO_RESOURCES (), 0);
 }
 
 CORBA::Policy_ptr
 TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOTSUP),
-                      CORBA::COMPLETED_NO),
-                    CORBA::Policy::_nil ());
+  return 0;
 }
 
 void
@@ -367,7 +336,8 @@ TAO_ServerRequestInfo::target_is_a (const char * /* id */,
                                     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_RESOURCES (1, CORBA::COMPLETED_NO), 0);
+  // @@ Need the minor code once it is available.
+  ACE_THROW_RETURN (CORBA::NO_RESOURCES (), 0);
 }
 
 void
@@ -395,7 +365,8 @@ TAO_ServerRequestInfo::add_reply_service_context (
               return;
             }
           else
-            ACE_THROW (CORBA::BAD_INV_ORDER (11, CORBA::COMPLETED_NO));
+            // @@ Need the minor code once it becomes available.
+            ACE_THROW (CORBA::BAD_INV_ORDER ());
         }
     }
 
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.inl b/TAO/tao/PortableServer/ServerRequestInfo.inl
index 6f548eae3c9..994b8529519 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.inl
+++ b/TAO/tao/PortableServer/ServerRequestInfo.inl
@@ -28,7 +28,12 @@ TAO_ServerRequestInfo::forward_reference (
   // Note that we're converting the ForwardRequest exception in to a
   // LOCATION_FORWARD reply, so we do not set the exception status.
 
-  this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
+  if (exc.permanent)
+    this->reply_status_ =
+      PortableInterceptor::LOCATION_FORWARD_PERMANENT;
+  else
+    this->reply_status_ = 
+      PortableInterceptor::LOCATION_FORWARD;
 
   this->forward_reference_ =
     CORBA::Object::_duplicate (exc.forward.in ());
@@ -40,6 +45,10 @@ TAO_ServerRequestInfo::forward_reference (CORBA::Object_ptr obj)
   // We only get here if a servant manager threw a
   // PortableServer::ForwardRequest exception.
 
+  // LOCATION_FORWARD_PERMANENT is not supported by TAO, so assume
+  // that a LOCATION_FORWARD reply will be sent.
+  // @@ LOCATION_FORWARD_PERMANENT will apparently be dropped from
+  // future GIOP specifications.
   this->reply_status_ = PortableInterceptor::LOCATION_FORWARD;
 
   this->forward_reference_ = CORBA::Object::_duplicate (obj);
diff --git a/TAO/tao/Priority_Mapping_Manager.h b/TAO/tao/Priority_Mapping_Manager.h
index b24f96105d7..d89e6878e36 100644
--- a/TAO/tao/Priority_Mapping_Manager.h
+++ b/TAO/tao/Priority_Mapping_Manager.h
@@ -38,21 +38,25 @@ class TAO_Priority_Mapping_Manager_var;
 typedef TAO_Priority_Mapping_Manager *TAO_Priority_Mapping_Manager_ptr;
 
 
-/**
- * @class TAO_Priority_Mapping_Manager
- *
- * @brief Priority_Mapping_Manager pseudo-objref.
- *
- * Allows setting of user-defined Priority_Mapping at run-time.
- */
 class TAO_Export TAO_Priority_Mapping_Manager :
   public virtual TAO_Local_RefCounted_Object
 {
+  // = TITLE
+  //   Priority_Mapping_Manager pseudo-objref.
+  //
+  // = DESCRIPTION
+  //   Allows setting of user-defined Priority_Mapping at run-time.
+  //
 
 public:
   /// Constructor.
   TAO_Priority_Mapping_Manager (void);
 
+  /// Destructor.
+  ~TAO_Priority_Mapping_Manager (void);
+
+  // = Interface methods.
+
   ///
   void mapping (RTCORBA::PriorityMapping * mapping);
 
@@ -86,14 +90,7 @@ public:
 
   virtual const char* _interface_repository_id (void) const;
 
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  ~TAO_Priority_Mapping_Manager (void);
-
 private:
-
   TAO_Priority_Mapping_Manager (const TAO_Priority_Mapping_Manager &);
   void operator= (const TAO_Priority_Mapping_Manager &);
 
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 0946ee60593..727c208639b 100644
--- a/TAO/tao/Profile.cpp
+++ b/TAO/tao/Profile.cpp
@@ -37,8 +37,7 @@ TAO_Profile::add_tagged_component (const IOP::TaggedComponent &component,
 }
 
 void
-TAO_Profile::policies (CORBA::PolicyList *policy_list,
-                       CORBA::Environment &)
+TAO_Profile::policies (CORBA::PolicyList *policy_list)
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -83,7 +82,12 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list,
           buf += iterator->length ();
         }
 
+      //policy_value_seq[i] = pv;
 
+      // Reset the CDR buffer index so that the buffer can
+      // be reused for the next conversion.
+
+      //out_CDR.reset ();
     }
 
   TAO_OutputCDR out_cdr;
@@ -125,7 +129,7 @@ TAO_Profile::policies (CORBA::PolicyList *policy_list,
 
 
 CORBA::PolicyList&
-TAO_Profile::policies (CORBA::Environment &)
+TAO_Profile::policies (void)
 {
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -150,7 +154,7 @@ TAO_Profile::policies (CORBA::Environment &)
           // Extract the Byte Order
           CORBA::Boolean byte_order;
           if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-              return *(stub_->base_profiles ().policy_list_);
+              return *(stub_->base_profiles ().policy_list ());
           in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
 
           // Now we take out the Messaging::PolicyValueSeq out from the
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 85e8cdab4a9..73beeadf18d 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -147,11 +147,10 @@ public:
 
   /// This method sets the client exposed policies, i.e., the ones
   /// propagated in the IOR, for this profile.
-  virtual void policies (CORBA::PolicyList *policy_list,
-                         CORBA::Environment &ACE_TRY_ENV);
+  virtual void policies (CORBA::PolicyList *policy_list);
 
   /// Accessor for the client exposed policies of this profile.
-  virtual CORBA::PolicyList&  policies (CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::PolicyList&  policies (void);
 
   /// Sets the TAO_Stub to which this profile is associated.
   virtual void the_stub (TAO_Stub *stub);
diff --git a/TAO/tao/Queued_Message.cpp b/TAO/tao/Queued_Message.cpp
new file mode 100644
index 00000000000..94ad78e1662
--- /dev/null
+++ b/TAO/tao/Queued_Message.cpp
@@ -0,0 +1,112 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Queued_Message.h"
+#include "Message_Sent_Callback.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Queued_Message.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(tao, Queued_Message, "$Id$")
+
+TAO_Queued_Message::TAO_Queued_Message (ACE_Message_Block *contents,
+                                        int own_contents,
+                                        TAO_Message_Sent_Callback *callback)
+  : contents_ (contents)
+  , own_contents_ (own_contents)
+  , callback_ (callback)
+  , current_block_ (contents)
+  , next_ (0)
+  , prev_ (0)
+{
+}
+
+TAO_Queued_Message::~TAO_Queued_Message (void)
+{
+  if (this->own_contents_)
+    {
+      ACE_Message_Block *i = this->contents_;
+      while (i != 0)
+        {
+          ACE_Message_Block *cont = i->cont (); i->cont (0);
+          ACE_Message_Block::release (i);
+          i = cont;
+        }
+    }
+}
+
+void
+TAO_Queued_Message::connection_closed (void)
+{
+  if (this->callback_ != 0)
+    {
+      if (this->done ())
+        {
+          this->callback_->connection_closed ();
+        }
+      else
+        {
+          this->callback_->send_failed ();
+        }
+    }
+}
+
+void
+TAO_Queued_Message::destroy (void)
+{
+  delete this;
+}
+
+void
+TAO_Queued_Message::bytes_transferred (size_t byte_count)
+{
+  while (!this->done () && byte_count > 0)
+    {
+      size_t l = this->current_block_->length ();
+      if (byte_count < l)
+        {
+          this->current_block_->rd_ptr (byte_count);
+          return;
+        }
+      byte_count -= l;
+      this->current_block_ = this->current_block_->cont ();
+    }
+}
+
+void
+TAO_Queued_Message::remove_from_list (TAO_Queued_Message *&head,
+                                      TAO_Queued_Message *&tail)
+{
+  if (this->prev_ != 0)
+    this->prev_->next_ = this->next_;
+  else
+    head = this->next_;
+
+  if (this->next_ != 0)
+    this->next_->prev_ = this->prev_;
+  else
+    tail = this->prev_;
+
+  this->next_ = 0;
+  this->prev_ = 0;
+}
+
+void
+TAO_Queued_Message::push_back (TAO_Queued_Message *&head,
+                               TAO_Queued_Message *&tail)
+{
+  if (tail == 0)
+    {
+      tail = this;
+      head = this;
+      this->next_ = 0;
+      this->prev_ = 0;
+      return;
+    }
+
+  tail->next_ = this;
+  this->prev_ = tail;
+  this->next_ = 0;
+  tail = this;
+}
diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h
new file mode 100644
index 00000000000..25d4a018b9e
--- /dev/null
+++ b/TAO/tao/Queued_Message.h
@@ -0,0 +1,183 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Queued_Message.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_QUEUED_MESSAGE_H
+#define TAO_QUEUED_MESSAGE_H
+#include "ace/pre.h"
+
+#include "corbafwd.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class ACE_Message_Block;
+class TAO_Message_Sent_Callback;
+
+/**
+ * @class TAO_Queued_Message
+ *
+ * @brief Implement an queued message for the outgoing path in the
+ *        TAO_Transport class
+ *
+ * Please read the documentation in the TAO_Transport class to find
+ * out more about the design of the outgoing data path.
+ *
+ * In some configurations TAO needs to maintain a per-connection queue
+ * of outgoing messages.  This queue is drained by the pluggable
+ * protocols framework, normally under control of the ACE_Reactor, but
+ * other configurations are conceivable.  The elements in the queue
+ * may may removed early, for example, because the application can
+ * specify timeouts for each message, or because the underlying
+ * connection is broken.
+ *
+ * In many cases the message corresponds to some application request,
+ * the application may be blocked waiting for the request to be sent,
+ * even more importantlyl, the ORB can be configured to use the
+ * Leader/Followers strategy, in which case one of the waiting threads
+ * can be required to wake up before its message completes
+ * each message may contain a 'Sent_Notifier'
+ *
+ * <H4>NOTE:</H4> The contents of the ACE_Message_Block may have been
+ * allocated from TSS storage, in that case we cannot steal them.
+ * However, we do not need to perform a deep copy all the time, for
+ * example, in a twoway request the sending thread blocks until the
+ * data goes out.  The queued message can borrow the memory as it will
+ * be deallocated by the sending thread when it finishes.
+ * Oneways and asynchronous calls are another story.
+ *
+ * @todo: Change the ORB to allocate oneway and AMI buffer from global
+ *        memory, to avoid the data copy in this path.  What happens
+ *        if the there is no queueing?  Can we check that before
+ *        allocating the memory?
+ *
+ */
+class TAO_Export TAO_Queued_Message
+{
+public:
+  /// Constructor
+  /**
+   * @param contents The message block chain that must be sent.
+   *
+   * @param own_contents If this flag is true then this object assumes
+   * ownership of the contents.
+   *
+   * @param callback A callback interface to signal any waiting
+   * threads about the status of the message.  It is null if there are
+   * no waiting threads.
+   */
+  TAO_Queued_Message (ACE_Message_Block *contents,
+                      int own_contents,
+                      TAO_Message_Sent_Callback *callback = 0);
+
+  /// Destructor
+  virtual ~TAO_Queued_Message (void);
+
+  /// Get the message block
+  ACE_Message_Block *mb (void) const;
+
+  /// The transport has successfully sent more data, adjust internal
+  /// status
+  void bytes_transferred (size_t byte_count);
+
+  /// Return 0 if the message has not been completely sent
+  int done (void) const;
+
+  /// The underlying connection has been closed, release resources and
+  /// signal waiting threads.
+  void connection_closed (void);
+
+  /// Reclaim resources
+  void destroy (void);
+
+  /** @name Intrusive list manipulation
+   *
+   * The messages are put in a doubled linked list (for easy insertion
+   * and removal).  To minimize memory allocations the list is
+   * intrusive, i.e. each element in the list contains the pointers
+   * for the next and previous element.
+   *
+   * The following methods are used to manipulate this implicit list.
+   *
+   * @todo: We should implement this as a base template, something
+   *        like:<BR>
+   * template<class T> Intrusive_Node {<BR>
+   * public:<BR><BR>
+   *   void next (T *);<BR>
+   *   T* next () const;<BR><BR>
+   * private:<BR>
+   *   T* next_;<BR>
+   * };<BR>
+   * and use it as follows:<BR>
+   * class TAO_Queued_Message : public Intrusive_Node<TAO_Queued_Message><BR>
+   * {<BR>
+   * };<BR>
+   *
+   */
+  //@{
+  /// Set/get the next element in the list
+  virtual TAO_Queued_Message *next (void) const;
+
+  /// Set/get the previous element in the list
+  virtual TAO_Queued_Message *prev (void) const;
+
+  /// Remove this element from the list
+  virtual void remove_from_list (TAO_Queued_Message *&head,
+                                 TAO_Queued_Message *&tail);
+
+  /// Insert the current element after position.
+  /**
+   * If position is null then we assume that we are inserting the
+   * current element into an empty list.
+   */
+  virtual void push_back (TAO_Queued_Message *&head,
+                          TAO_Queued_Message *&tail);
+  //@}
+
+private:
+  /// The contents of the message.
+  /**
+   * The message is normally generated by a TAO_OutputCDR stream.  The
+   * application marshals the payload, possibly generating a chain of
+   * message block connected via the 'cont()' field.
+   */
+  ACE_Message_Block *contents_;
+
+  /// If not zero the @c contents_ are owned by this object
+  int own_contents_;
+
+  /// If not null, this is the object that we signal to indicate that
+  /// the message was sent.
+  /**
+   * The signaling mechanism used to wakeup the thread waiting for
+   * this message to complete changes
+   */
+  TAO_Message_Sent_Callback *callback_;
+
+  /// The current message block
+  /**
+   * The message may be set in multiple writev() operations.  This
+   * point keeps track of the next message to send out.
+   */
+  ACE_Message_Block *current_block_;
+
+  /// Implement an intrusive double-linked list for the message queue
+  TAO_Queued_Message *next_;
+  TAO_Queued_Message *prev_;
+};
+
+#if defined (__ACE_INLINE__)
+# include "Queued_Message.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/post.h"
+#endif  /* TAO_QUEUED_MESSAGE_H */
diff --git a/TAO/tao/Queued_Message.inl b/TAO/tao/Queued_Message.inl
new file mode 100644
index 00000000000..76a86e62d1c
--- /dev/null
+++ b/TAO/tao/Queued_Message.inl
@@ -0,0 +1,25 @@
+// $Id$
+
+ACE_INLINE ACE_Message_Block *
+TAO_Queued_Message::mb (void) const
+{
+  return this->contents_;
+}
+
+ACE_INLINE int
+TAO_Queued_Message::done (void) const
+{
+  return this->contents_ != 0;
+}
+
+ACE_INLINE TAO_Queued_Message *
+TAO_Queued_Message::next (void) const
+{
+  return this->next_;
+}
+
+ACE_INLINE TAO_Queued_Message *
+TAO_Queued_Message::prev (void) const
+{
+  return this->prev_;
+}
diff --git a/TAO/tao/RTCORBA.pidl b/TAO/tao/RTCORBA.pidl
index 2fa76e95847..541eee6d551 100644
--- a/TAO/tao/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA.pidl
@@ -11,17 +11,24 @@
 //
 // = DESCRIPTION
 //
-//   The RTCORBA module specified in CORBA v2.4.2 Chapter 24
-//   (February, 2001).
+//   The RTCORBA module specified in ptc/99-05-03 (Real-Time
+//   CORBA Joint Revised Submission May 28, 1999).
 //
 //   Changes to the original OMG idl:
-//     1.  Two TAO-specific interfaces, UnixDomainProtocolProperties
+//     1.  All RT policies have been assigned PolicyType values
+//         from the range reserved for TAO.  0x54410002 through
+//         0x54410007 are used for RT Policies.  This is in effect
+//         until OMG will standardize PolicyType values (currently RT
+//         CORBA spec contains question marks instead of values).
+//     2.  All interfaces in RTCORBA module have been made <local>.
+//         Original idl defined most interfaces as local, but not
+//         all.  It is unclear whether that was intentional or a
+//         result of sloppiness.  Until the former is proved, the
+//         latter will be assumed and all interfaces made <local>.
+//     3.  Two TAO-specific interfaces, UnixDomainProtocolProperties
 //         and SharedMemoryProtocolProperties, have been added to allow
 //         configuration of TAO's UIOP and SHMEM pluggable protocols
 //         through RTCORBA Protocol Policies.
-//     2.  TAO-specific support for named mutexes has been added.
-//     3.  Added RT_ORB::create_tcp_protocol_properties which seems
-//         to come and go from the formal specification, but is needed.
 //
 //   This file was used to generate the code in
 //   RTCORBA{C,S,S_T}.{h,i,cpp} The command used to generate code
@@ -69,7 +76,6 @@ module RTCORBA
 
   // Threadpool types.
   typedef unsigned long ThreadpoolId;
-
   struct ThreadpoolLane
   {
     Priority lane_priority;
@@ -81,7 +87,7 @@ module RTCORBA
   // RT Policies.
 
   // Priority Model Policy.
-  const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
+  const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 0x54410002;
   enum PriorityModel
   {
     CLIENT_PROPAGATED,
@@ -90,52 +96,37 @@ module RTCORBA
 
   local interface PriorityModelPolicy : CORBA::Policy
   {
-      readonly attribute PriorityModel priority_model;
-      readonly attribute Priority server_priority;
+    readonly attribute PriorityModel priority_model;
+    readonly attribute Priority server_priority;
   };
 
   // Threadpool Policy.
-  const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41;
+  const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 0x54410003;
   local interface ThreadpoolPolicy : CORBA::Policy
   {
-      readonly attribute ThreadpoolId threadpool;
-  };
-
-  // Protocol Properties.
-  local interface ProtocolProperties {};
-
-  struct Protocol
-  {
-      IOP::ProfileId protocol_type;
-      ProtocolProperties orb_protocol_properties;
-      ProtocolProperties transport_protocol_properties;
+    readonly attribute ThreadpoolId threadpool;
   };
 
-  typedef sequence <Protocol> ProtocolList;
-
-  // Server Protocol Policy
-  const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42;
+  // Private Connection Policy
+  const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 0x54410006;
+  local interface PrivateConnectionPolicy : CORBA::Policy {};
 
-  // Locality constrained interface
-  local interface ServerProtocolPolicy : CORBA::Policy
+  // PriorityBandedConnectionPolicy.
+  struct PriorityBand
   {
-    readonly attribute ProtocolList protocols;
+    Priority low;
+    Priority high;
   };
+  typedef sequence <PriorityBand> PriorityBands;
 
-  // Client Protocol Policy
-  const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43;
-
-  // Locality constrained interface
-  local interface ClientProtocolPolicy : CORBA::Policy
+  const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 0x54410007;
+  local interface PriorityBandedConnectionPolicy : CORBA::Policy
   {
-    readonly attribute ProtocolList protocols;
+    readonly attribute PriorityBands priority_bands;
   };
 
-  // Private Connection Policy
-  const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44;
-
-  // Locality constrained interface
-  local interface PrivateConnectionPolicy : CORBA::Policy {};
+  // Protocol Properties.
+  local interface ProtocolProperties {};
 
   local interface TCPProtocolProperties : ProtocolProperties
   {
@@ -168,18 +159,26 @@ module RTCORBA
 
   // End of TAO-specific interfaces.
 
-  // PriorityBandedConnectionPolicy.
-  struct PriorityBand
+  struct Protocol
   {
-    Priority low;
-    Priority high;
+    IOP::ProfileId protocol_type;
+    ProtocolProperties orb_protocol_properties;
+    ProtocolProperties transport_protocol_properties;
   };
-  typedef sequence <PriorityBand> PriorityBands;
+  typedef sequence <Protocol> ProtocolList;
 
-  const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
-  local interface PriorityBandedConnectionPolicy : CORBA::Policy
+  // Server Protocol Policy
+  const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 0x54410004;
+  local interface ServerProtocolPolicy : CORBA::Policy
   {
-    readonly attribute PriorityBands priority_bands;
+    readonly attribute ProtocolList protocols;
+  };
+
+  // Client Protocol Policy
+  const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 0x54410005;
+  local interface ClientProtocolPolicy : CORBA::Policy
+  {
+    readonly attribute ProtocolList protocols;
   };
 
   // RT Current.
@@ -204,7 +203,6 @@ module RTCORBA
     Mutex create_mutex ();
     void destroy_mutex (in Mutex the_mutex);
 
-    // TAO specific
     // Named Mutex creation/opening
     exception MutexNotFound {};
     Mutex create_named_mutex (in string name,
@@ -212,15 +210,6 @@ module RTCORBA
     Mutex open_named_mutex (in string name)
       raises (MutexNotFound);
 
-    // End TAO specific
-
-    TCPProtocolProperties create_tcp_protocol_properties(
-                                                     in long send_buffer_size,
-                                                     in long recv_buffer_size,
-                                                     in boolean keep_alive,
-                                                     in boolean dont_route,
-                                                     in boolean no_delay );
-
     // Threadpool creation/destruction.
     exception InvalidThreadpool {};
 
@@ -251,12 +240,11 @@ module RTCORBA
     PriorityBandedConnectionPolicy
       create_priority_banded_connection_policy (in PriorityBands priority_bands);
 
+    PrivateConnectionPolicy create_private_connection_policy ();
 
     ServerProtocolPolicy create_server_protocol_policy (in ProtocolList protocols);
 
     ClientProtocolPolicy create_client_protocol_policy (in ProtocolList protocols);
-
-    PrivateConnectionPolicy create_private_connection_policy ();
   };
 };
 
diff --git a/TAO/tao/RTCORBAC.cpp b/TAO/tao/RTCORBAC.cpp
index 765967945c0..04d86bdab5f 100644
--- a/TAO/tao/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBAC.cpp
@@ -23,8 +23,13 @@
 
 #if (TAO_HAS_RT_CORBA == 1)
 
+#include "tao/TAOS.h"
 #include "tao/Typecode.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/RequestInfo_Util.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -249,7 +254,7 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadpoolLanes, &_tc_TAO_tc_RTCO
 TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_MODEL_POLICY_TYPE, 40U)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_MODEL_POLICY_TYPE, 1413545986U)
 TAO_NAMESPACE_END
 static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
 {
@@ -348,7 +353,7 @@ const char* RTCORBA::PriorityModelPolicy::_interface_repository_id (void) const
 
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREADPOOL_POLICY_TYPE, 41U)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREADPOOL_POLICY_TYPE, 1413545987U)
 TAO_NAMESPACE_END
 
 // default constructor
@@ -431,61 +436,77 @@ const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0";
 }
 
+TAO_NAMESPACE_TYPE (const CORBA::ULong)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIVATE_CONNECTION_POLICY_TYPE, 1413545990U)
+TAO_NAMESPACE_END
 
 // default constructor
-RTCORBA::ProtocolProperties::ProtocolProperties ()
+RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy ()
 {
   }
 
 // destructor
-RTCORBA::ProtocolProperties::~ProtocolProperties (void)
+RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
 {}
 
-RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow (
+RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  return ProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PrivateConnectionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_unchecked_narrow (
+RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return ProtocolProperties::_nil ();
+    return PrivateConnectionPolicy::_nil ();
   return
       ACE_reinterpret_cast
         (
-          ProtocolProperties_ptr,
+          PrivateConnectionPolicy_ptr,
             obj->_tao_QueryInterface
               (
                 ACE_reinterpret_cast
                   (
                     ptr_arith_t,
-                    &ProtocolProperties::_narrow
+                    &PrivateConnectionPolicy::_narrow
                   )
               )
         );
 }
 
-RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
+RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
+void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_narrow))
+      &ACE_NESTED_CLASS (::RTCORBA, PrivateConnectionPolicy)::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &::CORBA::Policy::_narrow))
+    retv = ACE_reinterpret_cast
+      (
+        void *,
+        ACE_static_cast
+          (
+            CORBA::Policy_ptr,
+            this
+          )
+      );
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
@@ -495,50 +516,86 @@ void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const
+const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0";
+  return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
+}
+
+static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
+  13, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x0),  // name = PriorityBand
+  2, // member count
+  4, ACE_NTOHL (0x6c6f7700),  // name = low
+  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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+    9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
+    CORBA::tk_short,
+
+
+  5, ACE_NTOHL (0x68696768), ACE_NTOHL (0x0),  // name = high
+  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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+    9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
+    CORBA::tk_short,
+
+
+};
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand (CORBA::tk_struct, sizeof (_oc_RTCORBA_PriorityBand), (char *) &_oc_RTCORBA_PriorityBand, 0, sizeof (RTCORBA::PriorityBand));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityBand, &_tc_TAO_tc_RTCORBA_PriorityBand)
+TAO_NAMESPACE_END
+void RTCORBA::PriorityBand::_tao_any_destructor (void *x)
+{
+  PriorityBand *tmp = ACE_static_cast (PriorityBand*,x);
+  delete tmp;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_
 
   void
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_allocate_buffer (CORBA::ULong length)
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_allocate_buffer (CORBA::ULong length)
   {
-    RTCORBA::Protocol* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (length);
+    RTCORBA::PriorityBand* tmp = 0;
+    tmp = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (length);
 
     if (this->buffer_ != 0)
     {
-      RTCORBA::Protocol *old = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_);
+      RTCORBA::PriorityBand *old = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
 
       if (this->release_)
-        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (old);
+        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (old);
 
     }
     this->buffer_ = tmp;
   }
 
   void
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_deallocate_buffer (void)
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
 
-    RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_);
+    RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_);
 
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
+    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
     this->buffer_ = 0;
   }
 
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Dtor.
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
@@ -549,196 +606,152 @@ const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
-#if !defined (_RTCORBA_PROTOCOLLIST_CS_)
-#define _RTCORBA_PROTOCOLLIST_CS_
+#if !defined (_RTCORBA_PRIORITYBANDS_CS_)
+#define _RTCORBA_PRIORITYBANDS_CS_
 
 // *************************************************************
-// RTCORBA::ProtocolList
+// RTCORBA::PriorityBands
 // *************************************************************
 
-RTCORBA::ProtocolList::ProtocolList (void)
+RTCORBA::PriorityBands::PriorityBands (void)
 {}
-RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max) // uses max size
+RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max) // uses max size
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
+  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<RTCORBA::Protocol>
+  TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
-RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max, CORBA::ULong length, RTCORBA::Protocol *buffer, CORBA::Boolean release)
+RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max, CORBA::ULong length, RTCORBA::PriorityBand *buffer, CORBA::Boolean release)
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
+  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<RTCORBA::Protocol>
+  TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
-RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq) // copy ctor
+RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq) // copy ctor
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
+  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<RTCORBA::Protocol>
+  TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
-RTCORBA::ProtocolList::~ProtocolList (void) // dtor
+RTCORBA::PriorityBands::~PriorityBands (void) // dtor
 {}
-void RTCORBA::ProtocolList::_tao_any_destructor (void *x)
+void RTCORBA::PriorityBands::_tao_any_destructor (void *x)
 {
-  ProtocolList *tmp = ACE_static_cast (ProtocolList*,x);
+  PriorityBands *tmp = ACE_static_cast (PriorityBands*,x);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 42U)
-TAO_NAMESPACE_END
-
-// default constructor
-RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy ()
-{
-  }
-
-// destructor
-RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
-{}
-
-RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &ACE_TRY_ENV
-  )
+static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
 {
-  return ServerProtocolPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x733a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
+  14, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x73000000),  // name = PriorityBands
+  CORBA::tk_sequence, // typecode kind
+  252, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    236, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
+      13, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x0),  // name = PriorityBand
+      2, // member count
+      4, ACE_NTOHL (0x6c6f7700),  // name = low
+      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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+        9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
+        CORBA::tk_short,
 
-RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &
-  )
-{
-  if (CORBA::is_nil (obj))
-    return ServerProtocolPolicy::_nil ();
-  return
-      ACE_reinterpret_cast
-        (
-          ServerProtocolPolicy_ptr,
-            obj->_tao_QueryInterface
-              (
-                ACE_reinterpret_cast
-                  (
-                    ptr_arith_t,
-                    &ServerProtocolPolicy::_narrow
-                  )
-              )
-        );
-}
 
-RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_add_ref ();
-  return obj;
-}
+      5, ACE_NTOHL (0x68696768), ACE_NTOHL (0x0),  // name = high
+      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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+        9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
+        CORBA::tk_short,
 
-void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ServerProtocolPolicy)::_narrow))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_narrow))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
 
-  if (retv)
-    this->_add_ref ();
-  return retv;
-}
 
-const char* RTCORBA::ServerProtocolPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0";
-}
+    0U,
 
+};
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands (CORBA::tk_alias, sizeof (_oc_RTCORBA_PriorityBands), (char *) &_oc_RTCORBA_PriorityBands, 0, sizeof (RTCORBA::PriorityBands));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityBands, &_tc_TAO_tc_RTCORBA_PriorityBands)
+TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 43U)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_BANDED_CONNECTION_POLICY_TYPE, 1413545991U)
 TAO_NAMESPACE_END
 
 // default constructor
-RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy ()
+RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy ()
 {
   }
 
 // destructor
-RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
+RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
 {}
 
-RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow (
+RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  return ClientProtocolPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return PriorityBandedConnectionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
+RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return ClientProtocolPolicy::_nil ();
+    return PriorityBandedConnectionPolicy::_nil ();
   return
       ACE_reinterpret_cast
         (
-          ClientProtocolPolicy_ptr,
+          PriorityBandedConnectionPolicy_ptr,
             obj->_tao_QueryInterface
               (
                 ACE_reinterpret_cast
                   (
                     ptr_arith_t,
-                    &ClientProtocolPolicy::_narrow
+                    &PriorityBandedConnectionPolicy::_narrow
                   )
               )
         );
 }
 
-RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
+RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPolicy_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
+void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, ClientProtocolPolicy)::_narrow))
+      &ACE_NESTED_CLASS (::RTCORBA, PriorityBandedConnectionPolicy)::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
@@ -761,82 +774,66 @@ void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* RTCORBA::ClientProtocolPolicy::_interface_repository_id (void) const
+const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0";
+  return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0";
 }
 
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIVATE_CONNECTION_POLICY_TYPE, 44U)
-TAO_NAMESPACE_END
 
 // default constructor
-RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy ()
+RTCORBA::ProtocolProperties::ProtocolProperties ()
 {
   }
 
 // destructor
-RTCORBA::PrivateConnectionPolicy::~PrivateConnectionPolicy (void)
+RTCORBA::ProtocolProperties::~ProtocolProperties (void)
 {}
 
-RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_narrow (
+RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  return PrivateConnectionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ProtocolProperties::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-RTCORBA::PrivateConnectionPolicy_ptr RTCORBA::PrivateConnectionPolicy::_unchecked_narrow (
+RTCORBA::ProtocolProperties_ptr RTCORBA::ProtocolProperties::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return PrivateConnectionPolicy::_nil ();
+    return ProtocolProperties::_nil ();
   return
       ACE_reinterpret_cast
         (
-          PrivateConnectionPolicy_ptr,
+          ProtocolProperties_ptr,
             obj->_tao_QueryInterface
               (
                 ACE_reinterpret_cast
                   (
                     ptr_arith_t,
-                    &PrivateConnectionPolicy::_narrow
+                    &ProtocolProperties::_narrow
                   )
               )
         );
 }
 
-RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy::_duplicate (PrivateConnectionPolicy_ptr obj)
+RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties::_duplicate (ProtocolProperties_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
+void *RTCORBA::ProtocolProperties::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, PrivateConnectionPolicy)::_narrow))
+      &ACE_NESTED_CLASS (::RTCORBA, ProtocolProperties)::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Policy::_narrow))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Policy_ptr,
-            this
-          )
-      );
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
@@ -846,9 +843,9 @@ void *RTCORBA::PrivateConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) const
+const char* RTCORBA::ProtocolProperties::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
+  return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0";
 }
 
 //////////////////////////////////////////////////////
@@ -1189,81 +1186,45 @@ const char* RTCORBA::SharedMemoryProtocolProperties::_interface_repository_id (v
   return "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0";
 }
 
-static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-  13, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x0),  // name = PriorityBand
-  2, // member count
-  4, ACE_NTOHL (0x6c6f7700),  // name = low
-  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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-    9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-
-  5, ACE_NTOHL (0x68696768), ACE_NTOHL (0x0),  // name = high
-  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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-    9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-
-};
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand (CORBA::tk_struct, sizeof (_oc_RTCORBA_PriorityBand), (char *) &_oc_RTCORBA_PriorityBand, 0, sizeof (RTCORBA::PriorityBand));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityBand, &_tc_TAO_tc_RTCORBA_PriorityBand)
-TAO_NAMESPACE_END
-void RTCORBA::PriorityBand::_tao_any_destructor (void *x)
-{
-  PriorityBand *tmp = ACE_static_cast (PriorityBand*,x);
-  delete tmp;
-}
-
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CS_
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_)
+#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CS_
 
   void
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_allocate_buffer (CORBA::ULong length)
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_allocate_buffer (CORBA::ULong length)
   {
-    RTCORBA::PriorityBand* tmp = 0;
-    tmp = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (length);
+    RTCORBA::Protocol* tmp = 0;
+    tmp = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (length);
 
     if (this->buffer_ != 0)
     {
-      RTCORBA::PriorityBand *old = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_);
+      RTCORBA::Protocol *old = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
 
       if (this->release_)
-        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (old);
+        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (old);
 
     }
     this->buffer_ = tmp;
   }
 
   void
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_deallocate_buffer (void)
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
 
-    RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *,this->buffer_);
+    RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *,this->buffer_);
 
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
+    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
     this->buffer_ = 0;
   }
 
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Dtor.
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
@@ -1274,152 +1235,196 @@ void RTCORBA::PriorityBand::_tao_any_destructor (void *x)
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
-#if !defined (_RTCORBA_PRIORITYBANDS_CS_)
-#define _RTCORBA_PRIORITYBANDS_CS_
+#if !defined (_RTCORBA_PROTOCOLLIST_CS_)
+#define _RTCORBA_PROTOCOLLIST_CS_
 
 // *************************************************************
-// RTCORBA::PriorityBands
+// RTCORBA::ProtocolList
 // *************************************************************
 
-RTCORBA::PriorityBands::PriorityBands (void)
+RTCORBA::ProtocolList::ProtocolList (void)
 {}
-RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max) // uses max size
+RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max) // uses max size
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
+  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
+  TAO_Unbounded_Sequence<RTCORBA::Protocol>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
-RTCORBA::PriorityBands::PriorityBands (CORBA::ULong max, CORBA::ULong length, RTCORBA::PriorityBand *buffer, CORBA::Boolean release)
+RTCORBA::ProtocolList::ProtocolList (CORBA::ULong max, CORBA::ULong length, RTCORBA::Protocol *buffer, CORBA::Boolean release)
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
+  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
+  TAO_Unbounded_Sequence<RTCORBA::Protocol>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
-RTCORBA::PriorityBands::PriorityBands (const PriorityBands &seq) // copy ctor
+RTCORBA::ProtocolList::ProtocolList (const ProtocolList &seq) // copy ctor
   :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
+  _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<RTCORBA::PriorityBand>
+  TAO_Unbounded_Sequence<RTCORBA::Protocol>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
-RTCORBA::PriorityBands::~PriorityBands (void) // dtor
+RTCORBA::ProtocolList::~ProtocolList (void) // dtor
 {}
-void RTCORBA::PriorityBands::_tao_any_destructor (void *x)
+void RTCORBA::ProtocolList::_tao_any_destructor (void *x)
 {
-  PriorityBands *tmp = ACE_static_cast (PriorityBands*,x);
+  ProtocolList *tmp = ACE_static_cast (ProtocolList*,x);
   delete tmp;
 }
 
 
 #endif /* end #if !defined */
 
-static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
+TAO_NAMESPACE_TYPE (const CORBA::ULong)
+TAO_NAMESPACE_BEGIN (RTCORBA)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 1413545988U)
+TAO_NAMESPACE_END
+
+// default constructor
+RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy ()
 {
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x733a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
-  14, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x73000000),  // name = PriorityBands
-  CORBA::tk_sequence, // typecode kind
-  252, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    236, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-      13, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x42616e64), ACE_NTOHL (0x0),  // name = PriorityBand
-      2, // member count
-      4, ACE_NTOHL (0x6c6f7700),  // name = low
-      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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
+  }
 
+// destructor
+RTCORBA::ServerProtocolPolicy::~ServerProtocolPolicy (void)
+{}
 
-      5, ACE_NTOHL (0x68696768), ACE_NTOHL (0x0),  // name = high
-      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 (0x5254434f), ACE_NTOHL (0x5242412f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
+RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_narrow (
+    CORBA::Object_ptr obj,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ServerProtocolPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+}
 
+RTCORBA::ServerProtocolPolicy_ptr RTCORBA::ServerProtocolPolicy::_unchecked_narrow (
+    CORBA::Object_ptr obj,
+    CORBA::Environment &
+  )
+{
+  if (CORBA::is_nil (obj))
+    return ServerProtocolPolicy::_nil ();
+  return
+      ACE_reinterpret_cast
+        (
+          ServerProtocolPolicy_ptr,
+            obj->_tao_QueryInterface
+              (
+                ACE_reinterpret_cast
+                  (
+                    ptr_arith_t,
+                    &ServerProtocolPolicy::_narrow
+                  )
+              )
+        );
+}
 
+RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy::_duplicate (ServerProtocolPolicy_ptr obj)
+{
+  if (!CORBA::is_nil (obj))
+    obj->_add_ref ();
+  return obj;
+}
 
-    0U,
+void *RTCORBA::ServerProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &ACE_NESTED_CLASS (::RTCORBA, ServerProtocolPolicy)::_narrow))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &::CORBA::Policy::_narrow))
+    retv = ACE_reinterpret_cast
+      (
+        void *,
+        ACE_static_cast
+          (
+            CORBA::Policy_ptr,
+            this
+          )
+      );
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+
+  if (retv)
+    this->_add_ref ();
+  return retv;
+}
+
+const char* RTCORBA::ServerProtocolPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0";
+}
 
-};
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands (CORBA::tk_alias, sizeof (_oc_RTCORBA_PriorityBands), (char *) &_oc_RTCORBA_PriorityBands, 0, sizeof (RTCORBA::PriorityBands));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityBands, &_tc_TAO_tc_RTCORBA_PriorityBands)
-TAO_NAMESPACE_END
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (RTCORBA)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_BANDED_CONNECTION_POLICY_TYPE, 45U)
+TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 1413545989U)
 TAO_NAMESPACE_END
 
 // default constructor
-RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy ()
+RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy ()
 {
   }
 
 // destructor
-RTCORBA::PriorityBandedConnectionPolicy::~PriorityBandedConnectionPolicy (void)
+RTCORBA::ClientProtocolPolicy::~ClientProtocolPolicy (void)
 {}
 
-RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_narrow (
+RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  return PriorityBandedConnectionPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return ClientProtocolPolicy::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_ptr RTCORBA::PriorityBandedConnectionPolicy::_unchecked_narrow (
+RTCORBA::ClientProtocolPolicy_ptr RTCORBA::ClientProtocolPolicy::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return PriorityBandedConnectionPolicy::_nil ();
+    return ClientProtocolPolicy::_nil ();
   return
       ACE_reinterpret_cast
         (
-          PriorityBandedConnectionPolicy_ptr,
+          ClientProtocolPolicy_ptr,
             obj->_tao_QueryInterface
               (
                 ACE_reinterpret_cast
                   (
                     ptr_arith_t,
-                    &PriorityBandedConnectionPolicy::_narrow
+                    &ClientProtocolPolicy::_narrow
                   )
               )
         );
 }
 
-RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy::_duplicate (PriorityBandedConnectionPolicy_ptr obj)
+RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy::_duplicate (ClientProtocolPolicy_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t type)
+void *RTCORBA::ClientProtocolPolicy::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &ACE_NESTED_CLASS (::RTCORBA, PriorityBandedConnectionPolicy)::_narrow))
+      &ACE_NESTED_CLASS (::RTCORBA, ClientProtocolPolicy)::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
@@ -1442,9 +1447,9 @@ void *RTCORBA::PriorityBandedConnectionPolicy::_tao_QueryInterface (ptr_arith_t
   return retv;
 }
 
-const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (void) const
+const char* RTCORBA::ClientProtocolPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0";
+  return "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0";
 }
 
 
@@ -2026,60 +2031,11 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, RTCORBA::PriorityModel &
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
     template class TAO_Object_Manager<RTCORBA::PrivateConnectionPolicy,RTCORBA::PrivateConnectionPolicy_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
   #  pragma instantiate TAO_Object_Manager<RTCORBA::PrivateConnectionPolicy,RTCORBA::PrivateConnectionPolicy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>;
-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 void operator<<= (CORBA::Any &_tao_any, const RTCORBA::PriorityBand &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
@@ -2259,6 +2215,55 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const RTCORBA::PriorityB
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<RTCORBA::ProtocolProperties,RTCORBA::ProtocolProperties_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<RTCORBA::TCPProtocolProperties,RTCORBA::TCPProtocolProperties_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<RTCORBA::GIOPProtocolProperties,RTCORBA::GIOPProtocolProperties_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<RTCORBA::UnixDomainProtocolProperties,RTCORBA::UnixDomainProtocolProperties_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<RTCORBA::SharedMemoryProtocolProperties,RTCORBA::SharedMemoryProtocolProperties_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<RTCORBA::ServerProtocolPolicy,RTCORBA::ServerProtocolPolicy_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<RTCORBA::ClientProtocolPolicy,RTCORBA::ClientProtocolPolicy_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
     template class TAO_Object_Manager<RTCORBA::Current,RTCORBA::Current_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
   #  pragma instantiate TAO_Object_Manager<RTCORBA::Current,RTCORBA::Current_var>
diff --git a/TAO/tao/RTCORBAC.h b/TAO/tao/RTCORBAC.h
index 8dbf6c25a31..48d9c719973 100644
--- a/TAO/tao/RTCORBAC.h
+++ b/TAO/tao/RTCORBAC.h
@@ -549,222 +549,206 @@ class TAO_Export ThreadpoolPolicy: public virtual CORBA::Policy
 
 #endif /* end #if !defined */
 
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIVATE_CONNECTION_POLICY_TYPE;
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___PTR_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES___PTR_CH_
 
-  class ProtocolProperties;
-  typedef ProtocolProperties *ProtocolProperties_ptr;
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_
+
+  class PrivateConnectionPolicy;
+  typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES___VAR_CH_
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_
 
-  class TAO_Export ProtocolProperties_var : public TAO_Base_var
+  class TAO_Export PrivateConnectionPolicy_var : public TAO_Base_var
   {
   public:
-    ProtocolProperties_var (void); // default constructor
-    ProtocolProperties_var (ProtocolProperties_ptr p) : ptr_ (p) {}
-    ProtocolProperties_var (const ProtocolProperties_var &); // copy constructor
-    ~ProtocolProperties_var (void); // destructor
+    PrivateConnectionPolicy_var (void); // default constructor
+    PrivateConnectionPolicy_var (PrivateConnectionPolicy_ptr p) : ptr_ (p) {}
+    PrivateConnectionPolicy_var (const PrivateConnectionPolicy_var &); // copy constructor
+    ~PrivateConnectionPolicy_var (void); // destructor
 
-    ProtocolProperties_var &operator= (ProtocolProperties_ptr);
-    ProtocolProperties_var &operator= (const ProtocolProperties_var &);
-    ProtocolProperties_ptr operator-> (void) const;
+    PrivateConnectionPolicy_var &operator= (PrivateConnectionPolicy_ptr);
+    PrivateConnectionPolicy_var &operator= (const PrivateConnectionPolicy_var &);
+    PrivateConnectionPolicy_ptr operator-> (void) const;
 
-    operator const ProtocolProperties_ptr &() const;
-    operator ProtocolProperties_ptr &();
+    operator const PrivateConnectionPolicy_ptr &() const;
+    operator PrivateConnectionPolicy_ptr &();
     // in, inout, out, _retn
-    ProtocolProperties_ptr in (void) const;
-    ProtocolProperties_ptr &inout (void);
-    ProtocolProperties_ptr &out (void);
-    ProtocolProperties_ptr _retn (void);
-    ProtocolProperties_ptr ptr (void) const;
+    PrivateConnectionPolicy_ptr in (void) const;
+    PrivateConnectionPolicy_ptr &inout (void);
+    PrivateConnectionPolicy_ptr &out (void);
+    PrivateConnectionPolicy_ptr _retn (void);
+    PrivateConnectionPolicy_ptr ptr (void) const;
 
   private:
-    ProtocolProperties_ptr ptr_;
+    PrivateConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ProtocolProperties_var (const TAO_Base_var &rhs);
-    ProtocolProperties_var &operator= (const TAO_Base_var &rhs);
+    PrivateConnectionPolicy_var (const TAO_Base_var &rhs);
+    PrivateConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___OUT_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES___OUT_CH_
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_
 
-  class TAO_Export ProtocolProperties_out
+  class TAO_Export PrivateConnectionPolicy_out
   {
   public:
-    ProtocolProperties_out (ProtocolProperties_ptr &);
-    ProtocolProperties_out (ProtocolProperties_var &);
-    ProtocolProperties_out (const ProtocolProperties_out &);
-    ProtocolProperties_out &operator= (const ProtocolProperties_out &);
-    ProtocolProperties_out &operator= (const ProtocolProperties_var &);
-    ProtocolProperties_out &operator= (ProtocolProperties_ptr);
-    operator ProtocolProperties_ptr &();
-    ProtocolProperties_ptr &ptr (void);
-    ProtocolProperties_ptr operator-> (void);
+    PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &);
+    PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &);
+    PrivateConnectionPolicy_out (const PrivateConnectionPolicy_out &);
+    PrivateConnectionPolicy_out &operator= (const PrivateConnectionPolicy_out &);
+    PrivateConnectionPolicy_out &operator= (const PrivateConnectionPolicy_var &);
+    PrivateConnectionPolicy_out &operator= (PrivateConnectionPolicy_ptr);
+    operator PrivateConnectionPolicy_ptr &();
+    PrivateConnectionPolicy_ptr &ptr (void);
+    PrivateConnectionPolicy_ptr operator-> (void);
 
   private:
-    ProtocolProperties_ptr &ptr_;
+    PrivateConnectionPolicy_ptr &ptr_;
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
-#define _RTCORBA_PROTOCOLPROPERTIES_CH_
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
 
-class TAO_Export ProtocolProperties : public virtual CORBA_Object,
-                                      public TAO_Encodable
+class TAO_Export PrivateConnectionPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ProtocolProperties_ptr _ptr_type;
-    typedef ProtocolProperties_var _var_type;
+    typedef PrivateConnectionPolicy_ptr _ptr_type;
+    typedef PrivateConnectionPolicy_var _var_type;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     // the static operations
-    static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
-    static ProtocolProperties_ptr _narrow (
+    static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
+    static PrivateConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static ProtocolProperties_ptr _unchecked_narrow (
+    static PrivateConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static ProtocolProperties_ptr _nil (void)
+    static PrivateConnectionPolicy_ptr _nil (void)
       {
-        return (ProtocolProperties_ptr)0;
+        return (PrivateConnectionPolicy_ptr)0;
       }
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     virtual const char* _interface_repository_id (void) const;
 
-    // CDR Encoder/Decoder methods.
-
-    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
-    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
-
   protected:
-    ProtocolProperties ();
+    PrivateConnectionPolicy ();
 
-    virtual ~ProtocolProperties (void);
+    virtual ~PrivateConnectionPolicy (void);
   private:
-    ProtocolProperties (const ProtocolProperties &);
-    void operator= (const ProtocolProperties &);
+    PrivateConnectionPolicy (const PrivateConnectionPolicy &);
+    void operator= (const PrivateConnectionPolicy &);
   };
 
 
 #endif /* end #if !defined */
 
-  struct Protocol;
-  class Protocol_var;
+  struct PriorityBand;
+  class PriorityBand_var;
 
-  struct TAO_Export Protocol
+  struct TAO_Export PriorityBand
   {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef Protocol_var _var_type;
+    typedef PriorityBand_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-        IOP::ProfileId protocol_type;
-    ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) orb_protocol_properties;
-    ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) transport_protocol_properties;
+    static void _tao_any_destructor (void*);
+
+    ACE_NESTED_CLASS (RTCORBA, Priority) low;
+    ACE_NESTED_CLASS (RTCORBA, Priority) high;
   };
 
-  class TAO_Export Protocol_var
+  class TAO_Export PriorityBand_var
   {
   public:
-    Protocol_var (void); // default constructor
-    Protocol_var (Protocol *);
-    Protocol_var (const Protocol_var &); // copy constructor
-    ~Protocol_var (void); // destructor
+    PriorityBand_var (void); // default constructor
+    PriorityBand_var (PriorityBand *);
+    PriorityBand_var (const PriorityBand_var &); // copy constructor
+    PriorityBand_var (const PriorityBand &); // fixed-size types only
+    ~PriorityBand_var (void); // destructor
 
-    Protocol_var &operator= (Protocol *);
-    Protocol_var &operator= (const Protocol_var &);
-    Protocol *operator-> (void);
-    const Protocol *operator-> (void) const;
+    PriorityBand_var &operator= (PriorityBand *);
+    PriorityBand_var &operator= (const PriorityBand_var &);
+    PriorityBand_var &operator= (const PriorityBand &); // fixed-size types only
+    PriorityBand *operator-> (void);
+    const PriorityBand *operator-> (void) const;
 
-    operator const Protocol &() const;
-    operator Protocol &();
-    operator Protocol &() const;
-    operator Protocol *&(); // variable-size types only
+    operator const PriorityBand &() const;
+    operator PriorityBand &();
+    operator PriorityBand &() const;
 
     // in, inout, out, _retn
-    const Protocol &in (void) const;
-    Protocol &inout (void);
-    Protocol *&out (void);
-    Protocol *_retn (void);
-    Protocol *ptr (void) const;
+    const PriorityBand &in (void) const;
+    PriorityBand &inout (void);
+    PriorityBand &out (void);
+    PriorityBand _retn (void);
+    PriorityBand *ptr (void) const;
 
   private:
-    Protocol *ptr_;
+    PriorityBand *ptr_;
   };
 
-  class TAO_Export Protocol_out
-  {
-  public:
-    Protocol_out (Protocol *&);
-    Protocol_out (Protocol_var &);
-    Protocol_out (const Protocol_out &);
-    Protocol_out &operator= (const Protocol_out &);
-    Protocol_out &operator= (Protocol *);
-    operator Protocol *&();
-    Protocol *&ptr (void);
-    Protocol *operator-> (void);
+  typedef PriorityBand &PriorityBand_out;
 
-  private:
-    Protocol *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const Protocol_var &);
-  };
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityBand;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_
 
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ProtocolList : public TAO_Unbounded_Base_Sequence
+    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_PriorityBands : public TAO_Unbounded_Base_Sequence
     {
     public:
       // = Initialization and termination methods.
 
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); // Default constructor.
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum,
+      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); // Default constructor.
+      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum,
         CORBA::ULong length,
-        Protocol *data,
+        PriorityBand *data,
         CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs);
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs);
-      virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); // Dtor.
+      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs);
+      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs);
+      virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); // Dtor.
       // = Accessors.
-      Protocol &operator[] (CORBA::ULong i);
-      const Protocol &operator[] (CORBA::ULong i) const;
+      PriorityBand &operator[] (CORBA::ULong i);
+      const PriorityBand &operator[] (CORBA::ULong i) const;
       // = Static operations.
-      static Protocol *allocbuf (CORBA::ULong size);
-      static void freebuf (Protocol *buffer);
+      static PriorityBand *allocbuf (CORBA::ULong size);
+      static void freebuf (PriorityBand *buffer);
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-      Protocol *get_buffer (CORBA::Boolean orphan = 0);
-      const Protocol *get_buffer (void) const;
+      PriorityBand *get_buffer (CORBA::Boolean orphan = 0);
+      const PriorityBand *get_buffer (void) const;
       void replace (CORBA::ULong max,
         CORBA::ULong length,
-        Protocol *data,
+        PriorityBand *data,
         CORBA::Boolean release);
     };
 
@@ -773,38 +757,38 @@ class TAO_Export ProtocolProperties : public virtual CORBA_Object,
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
-#if !defined (_RTCORBA_PROTOCOLLIST_CH_)
-#define _RTCORBA_PROTOCOLLIST_CH_
+#if !defined (_RTCORBA_PRIORITYBANDS_CH_)
+#define _RTCORBA_PRIORITYBANDS_CH_
 
-  class ProtocolList;
-  class ProtocolList_var;
+  class PriorityBands;
+  class PriorityBands_var;
 
   // *************************************************************
-  // ProtocolList
+  // PriorityBands
   // *************************************************************
 
-  class TAO_Export ProtocolList : public
+  class TAO_Export PriorityBands : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
+    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<Protocol>
+    TAO_Unbounded_Sequence<PriorityBand>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
-    ProtocolList (void); // default ctor
-    ProtocolList (CORBA::ULong max); // uses max size
-    ProtocolList (
+    PriorityBands (void); // default ctor
+    PriorityBands (CORBA::ULong max); // uses max size
+    PriorityBands (
       CORBA::ULong max,
       CORBA::ULong length,
-      Protocol *buffer,
+      PriorityBand *buffer,
       CORBA::Boolean release = 0
     );
-    ProtocolList (const ProtocolList &); // copy ctor
-    ~ProtocolList (void);
+    PriorityBands (const PriorityBands &); // copy ctor
+    ~PriorityBands (void);
     static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ProtocolList_var _var_type;
+    typedef PriorityBands_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
@@ -812,174 +796,177 @@ class TAO_Export ProtocolProperties : public virtual CORBA_Object,
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLLIST___VAR_CH_)
-#define _RTCORBA_PROTOCOLLIST___VAR_CH_
+#if !defined (_RTCORBA_PRIORITYBANDS___VAR_CH_)
+#define _RTCORBA_PRIORITYBANDS___VAR_CH_
 
   // *************************************************************
-  // class RTCORBA::ProtocolList_var
+  // class RTCORBA::PriorityBands_var
   // *************************************************************
 
-  class TAO_Export ProtocolList_var
+  class TAO_Export PriorityBands_var
   {
   public:
-    ProtocolList_var (void); // default constructor
-    ProtocolList_var (ProtocolList *);
-    ProtocolList_var (const ProtocolList_var &); // copy constructor
-    ~ProtocolList_var (void); // destructor
+    PriorityBands_var (void); // default constructor
+    PriorityBands_var (PriorityBands *);
+    PriorityBands_var (const PriorityBands_var &); // copy constructor
+    PriorityBands_var (const PriorityBands &); // fixed-size base types only
+    ~PriorityBands_var (void); // destructor
 
-    ProtocolList_var &operator= (ProtocolList *);
-    ProtocolList_var &operator= (const ProtocolList_var &);
-    ProtocolList *operator-> (void);
-    const ProtocolList *operator-> (void) const;
+    PriorityBands_var &operator= (PriorityBands *);
+    PriorityBands_var &operator= (const PriorityBands_var &);
+    PriorityBands_var &operator= (const PriorityBands &); // fixed-size base types only
+    PriorityBands *operator-> (void);
+    const PriorityBands *operator-> (void) const;
 
-    operator const ProtocolList &() const;
-    operator ProtocolList &();
-    operator ProtocolList &() const;
-    operator ProtocolList *&(); // variable-size base types only
+    operator const PriorityBands &() const;
+    operator PriorityBands &();
+    operator PriorityBands &() const;
 
-    Protocol & operator[] (CORBA::ULong index);
-    const Protocol & operator[] (CORBA::ULong index) const;
+    PriorityBand & operator[] (CORBA::ULong index);
+    const PriorityBand & operator[] (CORBA::ULong index) const;
 
     // in, inout, out, _retn
-    const ProtocolList &in (void) const;
-    ProtocolList &inout (void);
-    ProtocolList *&out (void);
-    ProtocolList *_retn (void);
-    ProtocolList *ptr (void) const;
+    const PriorityBands &in (void) const;
+    PriorityBands &inout (void);
+    PriorityBands *&out (void);
+    PriorityBands *_retn (void);
+    PriorityBands *ptr (void) const;
 
   private:
-    ProtocolList *ptr_;
+    PriorityBands *ptr_;
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLLIST___OUT_CH_)
-#define _RTCORBA_PROTOCOLLIST___OUT_CH_
+#if !defined (_RTCORBA_PRIORITYBANDS___OUT_CH_)
+#define _RTCORBA_PRIORITYBANDS___OUT_CH_
 
-  class TAO_Export ProtocolList_out
+  class TAO_Export PriorityBands_out
   {
   public:
-    ProtocolList_out (ProtocolList *&);
-    ProtocolList_out (ProtocolList_var &);
-    ProtocolList_out (const ProtocolList_out &);
-    ProtocolList_out &operator= (const ProtocolList_out &);
-    ProtocolList_out &operator= (ProtocolList *);
-    operator ProtocolList *&();
-    ProtocolList *&ptr (void);
-    ProtocolList *operator-> (void);
-    Protocol & operator[] (CORBA::ULong index);
+    PriorityBands_out (PriorityBands *&);
+    PriorityBands_out (PriorityBands_var &);
+    PriorityBands_out (const PriorityBands_out &);
+    PriorityBands_out &operator= (const PriorityBands_out &);
+    PriorityBands_out &operator= (PriorityBands *);
+    operator PriorityBands *&();
+    PriorityBands *&ptr (void);
+    PriorityBands *operator-> (void);
+    PriorityBand & operator[] (CORBA::ULong index);
 
   private:
-    ProtocolList *&ptr_;
+    PriorityBands *&ptr_;
     // assignment from T_var not allowed
-    void operator= (const ProtocolList_var &);
+    void operator= (const PriorityBands_var &);
   };
 
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVER_PROTOCOL_POLICY_TYPE;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityBands;
 
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_
 
-  class ServerProtocolPolicy;
-  typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_
+
+  class PriorityBandedConnectionPolicy;
+  typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_
 
-  class TAO_Export ServerProtocolPolicy_var : public TAO_Base_var
+  class TAO_Export PriorityBandedConnectionPolicy_var : public TAO_Base_var
   {
   public:
-    ServerProtocolPolicy_var (void); // default constructor
-    ServerProtocolPolicy_var (ServerProtocolPolicy_ptr p) : ptr_ (p) {}
-    ServerProtocolPolicy_var (const ServerProtocolPolicy_var &); // copy constructor
-    ~ServerProtocolPolicy_var (void); // destructor
+    PriorityBandedConnectionPolicy_var (void); // default constructor
+    PriorityBandedConnectionPolicy_var (PriorityBandedConnectionPolicy_ptr p) : ptr_ (p) {}
+    PriorityBandedConnectionPolicy_var (const PriorityBandedConnectionPolicy_var &); // copy constructor
+    ~PriorityBandedConnectionPolicy_var (void); // destructor
 
-    ServerProtocolPolicy_var &operator= (ServerProtocolPolicy_ptr);
-    ServerProtocolPolicy_var &operator= (const ServerProtocolPolicy_var &);
-    ServerProtocolPolicy_ptr operator-> (void) const;
+    PriorityBandedConnectionPolicy_var &operator= (PriorityBandedConnectionPolicy_ptr);
+    PriorityBandedConnectionPolicy_var &operator= (const PriorityBandedConnectionPolicy_var &);
+    PriorityBandedConnectionPolicy_ptr operator-> (void) const;
 
-    operator const ServerProtocolPolicy_ptr &() const;
-    operator ServerProtocolPolicy_ptr &();
+    operator const PriorityBandedConnectionPolicy_ptr &() const;
+    operator PriorityBandedConnectionPolicy_ptr &();
     // in, inout, out, _retn
-    ServerProtocolPolicy_ptr in (void) const;
-    ServerProtocolPolicy_ptr &inout (void);
-    ServerProtocolPolicy_ptr &out (void);
-    ServerProtocolPolicy_ptr _retn (void);
-    ServerProtocolPolicy_ptr ptr (void) const;
+    PriorityBandedConnectionPolicy_ptr in (void) const;
+    PriorityBandedConnectionPolicy_ptr &inout (void);
+    PriorityBandedConnectionPolicy_ptr &out (void);
+    PriorityBandedConnectionPolicy_ptr _retn (void);
+    PriorityBandedConnectionPolicy_ptr ptr (void) const;
 
   private:
-    ServerProtocolPolicy_ptr ptr_;
+    PriorityBandedConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ServerProtocolPolicy_var (const TAO_Base_var &rhs);
-    ServerProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
+    PriorityBandedConnectionPolicy_var (const TAO_Base_var &rhs);
+    PriorityBandedConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_
 
-  class TAO_Export ServerProtocolPolicy_out
+  class TAO_Export PriorityBandedConnectionPolicy_out
   {
   public:
-    ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &);
-    ServerProtocolPolicy_out (ServerProtocolPolicy_var &);
-    ServerProtocolPolicy_out (const ServerProtocolPolicy_out &);
-    ServerProtocolPolicy_out &operator= (const ServerProtocolPolicy_out &);
-    ServerProtocolPolicy_out &operator= (const ServerProtocolPolicy_var &);
-    ServerProtocolPolicy_out &operator= (ServerProtocolPolicy_ptr);
-    operator ServerProtocolPolicy_ptr &();
-    ServerProtocolPolicy_ptr &ptr (void);
-    ServerProtocolPolicy_ptr operator-> (void);
+    PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &);
+    PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &);
+    PriorityBandedConnectionPolicy_out (const PriorityBandedConnectionPolicy_out &);
+    PriorityBandedConnectionPolicy_out &operator= (const PriorityBandedConnectionPolicy_out &);
+    PriorityBandedConnectionPolicy_out &operator= (const PriorityBandedConnectionPolicy_var &);
+    PriorityBandedConnectionPolicy_out &operator= (PriorityBandedConnectionPolicy_ptr);
+    operator PriorityBandedConnectionPolicy_ptr &();
+    PriorityBandedConnectionPolicy_ptr &ptr (void);
+    PriorityBandedConnectionPolicy_ptr operator-> (void);
 
   private:
-    ServerProtocolPolicy_ptr &ptr_;
+    PriorityBandedConnectionPolicy_ptr &ptr_;
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
 
-class TAO_Export ServerProtocolPolicy: public virtual CORBA::Policy
+class TAO_Export PriorityBandedConnectionPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ServerProtocolPolicy_ptr _ptr_type;
-    typedef ServerProtocolPolicy_var _var_type;
+    typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
+    typedef PriorityBandedConnectionPolicy_var _var_type;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     // the static operations
-    static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
-    static ServerProtocolPolicy_ptr _narrow (
+    static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
+    static PriorityBandedConnectionPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static ServerProtocolPolicy_ptr _unchecked_narrow (
+    static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static ServerProtocolPolicy_ptr _nil (void)
+    static PriorityBandedConnectionPolicy_ptr _nil (void)
       {
-        return (ServerProtocolPolicy_ptr)0;
+        return (PriorityBandedConnectionPolicy_ptr)0;
       }
 
-    virtual RTCORBA::ProtocolList * protocols (
+    virtual RTCORBA::PriorityBands * priority_bands (
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
@@ -992,250 +979,131 @@ class TAO_Export ServerProtocolPolicy: public virtual CORBA::Policy
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    ServerProtocolPolicy ();
+    PriorityBandedConnectionPolicy ();
 
-    virtual ~ServerProtocolPolicy (void);
+    virtual ~PriorityBandedConnectionPolicy (void);
   private:
-    ServerProtocolPolicy (const ServerProtocolPolicy &);
-    void operator= (const ServerProtocolPolicy &);
+    PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
+    void operator= (const PriorityBandedConnectionPolicy &);
   };
 
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CLIENT_PROTOCOL_POLICY_TYPE;
-
 
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES___PTR_CH_)
+#define _RTCORBA_PROTOCOLPROPERTIES___PTR_CH_
 
-  class ClientProtocolPolicy;
-  typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
+  class ProtocolProperties;
+  typedef ProtocolProperties *ProtocolProperties_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CH_)
+#define _RTCORBA_PROTOCOLPROPERTIES___VAR_CH_
 
-  class TAO_Export ClientProtocolPolicy_var : public TAO_Base_var
+  class TAO_Export ProtocolProperties_var : public TAO_Base_var
   {
   public:
-    ClientProtocolPolicy_var (void); // default constructor
-    ClientProtocolPolicy_var (ClientProtocolPolicy_ptr p) : ptr_ (p) {}
-    ClientProtocolPolicy_var (const ClientProtocolPolicy_var &); // copy constructor
-    ~ClientProtocolPolicy_var (void); // destructor
+    ProtocolProperties_var (void); // default constructor
+    ProtocolProperties_var (ProtocolProperties_ptr p) : ptr_ (p) {}
+    ProtocolProperties_var (const ProtocolProperties_var &); // copy constructor
+    ~ProtocolProperties_var (void); // destructor
 
-    ClientProtocolPolicy_var &operator= (ClientProtocolPolicy_ptr);
-    ClientProtocolPolicy_var &operator= (const ClientProtocolPolicy_var &);
-    ClientProtocolPolicy_ptr operator-> (void) const;
+    ProtocolProperties_var &operator= (ProtocolProperties_ptr);
+    ProtocolProperties_var &operator= (const ProtocolProperties_var &);
+    ProtocolProperties_ptr operator-> (void) const;
 
-    operator const ClientProtocolPolicy_ptr &() const;
-    operator ClientProtocolPolicy_ptr &();
+    operator const ProtocolProperties_ptr &() const;
+    operator ProtocolProperties_ptr &();
     // in, inout, out, _retn
-    ClientProtocolPolicy_ptr in (void) const;
-    ClientProtocolPolicy_ptr &inout (void);
-    ClientProtocolPolicy_ptr &out (void);
-    ClientProtocolPolicy_ptr _retn (void);
-    ClientProtocolPolicy_ptr ptr (void) const;
+    ProtocolProperties_ptr in (void) const;
+    ProtocolProperties_ptr &inout (void);
+    ProtocolProperties_ptr &out (void);
+    ProtocolProperties_ptr _retn (void);
+    ProtocolProperties_ptr ptr (void) const;
 
   private:
-    ClientProtocolPolicy_ptr ptr_;
+    ProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    ClientProtocolPolicy_var (const TAO_Base_var &rhs);
-    ClientProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
+    ProtocolProperties_var (const TAO_Base_var &rhs);
+    ProtocolProperties_var &operator= (const TAO_Base_var &rhs);
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES___OUT_CH_)
+#define _RTCORBA_PROTOCOLPROPERTIES___OUT_CH_
 
-  class TAO_Export ClientProtocolPolicy_out
+  class TAO_Export ProtocolProperties_out
   {
   public:
-    ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &);
-    ClientProtocolPolicy_out (ClientProtocolPolicy_var &);
-    ClientProtocolPolicy_out (const ClientProtocolPolicy_out &);
-    ClientProtocolPolicy_out &operator= (const ClientProtocolPolicy_out &);
-    ClientProtocolPolicy_out &operator= (const ClientProtocolPolicy_var &);
-    ClientProtocolPolicy_out &operator= (ClientProtocolPolicy_ptr);
-    operator ClientProtocolPolicy_ptr &();
-    ClientProtocolPolicy_ptr &ptr (void);
-    ClientProtocolPolicy_ptr operator-> (void);
+    ProtocolProperties_out (ProtocolProperties_ptr &);
+    ProtocolProperties_out (ProtocolProperties_var &);
+    ProtocolProperties_out (const ProtocolProperties_out &);
+    ProtocolProperties_out &operator= (const ProtocolProperties_out &);
+    ProtocolProperties_out &operator= (const ProtocolProperties_var &);
+    ProtocolProperties_out &operator= (ProtocolProperties_ptr);
+    operator ProtocolProperties_ptr &();
+    ProtocolProperties_ptr &ptr (void);
+    ProtocolProperties_ptr operator-> (void);
 
   private:
-    ClientProtocolPolicy_ptr &ptr_;
+    ProtocolProperties_ptr &ptr_;
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
+#define _RTCORBA_PROTOCOLPROPERTIES_CH_
 
-class TAO_Export ClientProtocolPolicy: public virtual CORBA::Policy
+class TAO_Export ProtocolProperties : public virtual CORBA_Object,
+                                      public TAO_Encodable
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef ClientProtocolPolicy_ptr _ptr_type;
-    typedef ClientProtocolPolicy_var _var_type;
+    typedef ProtocolProperties_ptr _ptr_type;
+    typedef ProtocolProperties_var _var_type;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     // the static operations
-    static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
-    static ClientProtocolPolicy_ptr _narrow (
+    static ProtocolProperties_ptr _duplicate (ProtocolProperties_ptr obj);
+    static ProtocolProperties_ptr _narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static ClientProtocolPolicy_ptr _unchecked_narrow (
+    static ProtocolProperties_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static ClientProtocolPolicy_ptr _nil (void)
+    static ProtocolProperties_ptr _nil (void)
       {
-        return (ClientProtocolPolicy_ptr)0;
+        return (ProtocolProperties_ptr)0;
       }
 
-    virtual RTCORBA::ProtocolList * protocols (
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
     virtual void *_tao_QueryInterface (ptr_arith_t type);
 
     virtual const char* _interface_repository_id (void) const;
 
-  protected:
-    ClientProtocolPolicy ();
-
-    virtual ~ClientProtocolPolicy (void);
-  private:
-    ClientProtocolPolicy (const ClientProtocolPolicy &);
-    void operator= (const ClientProtocolPolicy &);
-  };
-
-
-#endif /* end #if !defined */
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIVATE_CONNECTION_POLICY_TYPE;
-
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___PTR_CH_
-
-  class PrivateConnectionPolicy;
-  typedef PrivateConnectionPolicy *PrivateConnectionPolicy_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CH_
-
-  class TAO_Export PrivateConnectionPolicy_var : public TAO_Base_var
-  {
-  public:
-    PrivateConnectionPolicy_var (void); // default constructor
-    PrivateConnectionPolicy_var (PrivateConnectionPolicy_ptr p) : ptr_ (p) {}
-    PrivateConnectionPolicy_var (const PrivateConnectionPolicy_var &); // copy constructor
-    ~PrivateConnectionPolicy_var (void); // destructor
-
-    PrivateConnectionPolicy_var &operator= (PrivateConnectionPolicy_ptr);
-    PrivateConnectionPolicy_var &operator= (const PrivateConnectionPolicy_var &);
-    PrivateConnectionPolicy_ptr operator-> (void) const;
-
-    operator const PrivateConnectionPolicy_ptr &() const;
-    operator PrivateConnectionPolicy_ptr &();
-    // in, inout, out, _retn
-    PrivateConnectionPolicy_ptr in (void) const;
-    PrivateConnectionPolicy_ptr &inout (void);
-    PrivateConnectionPolicy_ptr &out (void);
-    PrivateConnectionPolicy_ptr _retn (void);
-    PrivateConnectionPolicy_ptr ptr (void) const;
-
-  private:
-    PrivateConnectionPolicy_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    PrivateConnectionPolicy_var (const TAO_Base_var &rhs);
-    PrivateConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CH_
-
-  class TAO_Export PrivateConnectionPolicy_out
-  {
-  public:
-    PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &);
-    PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &);
-    PrivateConnectionPolicy_out (const PrivateConnectionPolicy_out &);
-    PrivateConnectionPolicy_out &operator= (const PrivateConnectionPolicy_out &);
-    PrivateConnectionPolicy_out &operator= (const PrivateConnectionPolicy_var &);
-    PrivateConnectionPolicy_out &operator= (PrivateConnectionPolicy_ptr);
-    operator PrivateConnectionPolicy_ptr &();
-    PrivateConnectionPolicy_ptr &ptr (void);
-    PrivateConnectionPolicy_ptr operator-> (void);
-
-  private:
-    PrivateConnectionPolicy_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
-
-class TAO_Export PrivateConnectionPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef PrivateConnectionPolicy_ptr _ptr_type;
-    typedef PrivateConnectionPolicy_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    // the static operations
-    static PrivateConnectionPolicy_ptr _duplicate (PrivateConnectionPolicy_ptr obj);
-    static PrivateConnectionPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    static PrivateConnectionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-    static PrivateConnectionPolicy_ptr _nil (void)
-      {
-        return (PrivateConnectionPolicy_ptr)0;
-      }
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    // CDR Encoder/Decoder methods.
 
-    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &out_cdr);
+    virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
   protected:
-    PrivateConnectionPolicy ();
+    ProtocolProperties ();
 
-    virtual ~PrivateConnectionPolicy (void);
+    virtual ~ProtocolProperties (void);
   private:
-    PrivateConnectionPolicy (const PrivateConnectionPolicy &);
-    void operator= (const PrivateConnectionPolicy &);
+    ProtocolProperties (const ProtocolProperties &);
+    void operator= (const ProtocolProperties &);
   };
 
 
@@ -1863,91 +1731,103 @@ class TAO_Export SharedMemoryProtocolProperties: public virtual ProtocolProperti
 
 #endif /* end #if !defined */
 
-  struct PriorityBand;
-  class PriorityBand_var;
+  struct Protocol;
+  class Protocol_var;
 
-  struct TAO_Export PriorityBand
+  struct TAO_Export Protocol
   {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef PriorityBand_var _var_type;
+    typedef Protocol_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    static void _tao_any_destructor (void*);
-
-    ACE_NESTED_CLASS (RTCORBA, Priority) low;
-    ACE_NESTED_CLASS (RTCORBA, Priority) high;
+        IOP::ProfileId protocol_type;
+    ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) orb_protocol_properties;
+    ACE_NESTED_CLASS (RTCORBA, ProtocolProperties_var) transport_protocol_properties;
   };
 
-  class TAO_Export PriorityBand_var
+  class TAO_Export Protocol_var
   {
   public:
-    PriorityBand_var (void); // default constructor
-    PriorityBand_var (PriorityBand *);
-    PriorityBand_var (const PriorityBand_var &); // copy constructor
-    PriorityBand_var (const PriorityBand &); // fixed-size types only
-    ~PriorityBand_var (void); // destructor
+    Protocol_var (void); // default constructor
+    Protocol_var (Protocol *);
+    Protocol_var (const Protocol_var &); // copy constructor
+    ~Protocol_var (void); // destructor
 
-    PriorityBand_var &operator= (PriorityBand *);
-    PriorityBand_var &operator= (const PriorityBand_var &);
-    PriorityBand_var &operator= (const PriorityBand &); // fixed-size types only
-    PriorityBand *operator-> (void);
-    const PriorityBand *operator-> (void) const;
+    Protocol_var &operator= (Protocol *);
+    Protocol_var &operator= (const Protocol_var &);
+    Protocol *operator-> (void);
+    const Protocol *operator-> (void) const;
 
-    operator const PriorityBand &() const;
-    operator PriorityBand &();
-    operator PriorityBand &() const;
+    operator const Protocol &() const;
+    operator Protocol &();
+    operator Protocol &() const;
+    operator Protocol *&(); // variable-size types only
 
     // in, inout, out, _retn
-    const PriorityBand &in (void) const;
-    PriorityBand &inout (void);
-    PriorityBand &out (void);
-    PriorityBand _retn (void);
-    PriorityBand *ptr (void) const;
+    const Protocol &in (void) const;
+    Protocol &inout (void);
+    Protocol *&out (void);
+    Protocol *_retn (void);
+    Protocol *ptr (void) const;
 
   private:
-    PriorityBand *ptr_;
+    Protocol *ptr_;
   };
 
-  typedef PriorityBand &PriorityBand_out;
+  class TAO_Export Protocol_out
+  {
+  public:
+    Protocol_out (Protocol *&);
+    Protocol_out (Protocol_var &);
+    Protocol_out (const Protocol_out &);
+    Protocol_out &operator= (const Protocol_out &);
+    Protocol_out &operator= (Protocol *);
+    operator Protocol *&();
+    Protocol *&ptr (void);
+    Protocol *operator-> (void);
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityBand;
+  private:
+    Protocol *&ptr_;
+    // assignment from T_var not allowed
+    void operator= (const Protocol_var &);
+  };
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CH_
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CH_
 
-    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_PriorityBands : public TAO_Unbounded_Base_Sequence
+    class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_RTCORBA_ProtocolList : public TAO_Unbounded_Base_Sequence
     {
     public:
       // = Initialization and termination methods.
 
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); // Default constructor.
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum,
+      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); // Default constructor.
+      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum);
+      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum,
         CORBA::ULong length,
-        PriorityBand *data,
+        Protocol *data,
         CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs);
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs);
-      virtual ~_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void); // Dtor.
+      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs);
+      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs);
+      virtual ~_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void); // Dtor.
       // = Accessors.
-      PriorityBand &operator[] (CORBA::ULong i);
-      const PriorityBand &operator[] (CORBA::ULong i) const;
+      Protocol &operator[] (CORBA::ULong i);
+      const Protocol &operator[] (CORBA::ULong i) const;
       // = Static operations.
-      static PriorityBand *allocbuf (CORBA::ULong size);
-      static void freebuf (PriorityBand *buffer);
+      static Protocol *allocbuf (CORBA::ULong size);
+      static void freebuf (Protocol *buffer);
       virtual void _allocate_buffer (CORBA::ULong length);
       virtual void _deallocate_buffer (void);
       // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-      PriorityBand *get_buffer (CORBA::Boolean orphan = 0);
-      const PriorityBand *get_buffer (void) const;
+      Protocol *get_buffer (CORBA::Boolean orphan = 0);
+      const Protocol *get_buffer (void) const;
       void replace (CORBA::ULong max,
         CORBA::ULong length,
-        PriorityBand *data,
+        Protocol *data,
         CORBA::Boolean release);
     };
 
@@ -1956,38 +1836,38 @@ class TAO_Export SharedMemoryProtocolProperties: public virtual ProtocolProperti
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
-#if !defined (_RTCORBA_PRIORITYBANDS_CH_)
-#define _RTCORBA_PRIORITYBANDS_CH_
+#if !defined (_RTCORBA_PROTOCOLLIST_CH_)
+#define _RTCORBA_PROTOCOLLIST_CH_
 
-  class PriorityBands;
-  class PriorityBands_var;
+  class ProtocolList;
+  class ProtocolList_var;
 
   // *************************************************************
-  // PriorityBands
+  // ProtocolList
   // *************************************************************
 
-  class TAO_Export PriorityBands : public
+  class TAO_Export ProtocolList : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    _TAO_Unbounded_Sequence_RTCORBA_PriorityBands
+    _TAO_Unbounded_Sequence_RTCORBA_ProtocolList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_Sequence<PriorityBand>
+    TAO_Unbounded_Sequence<Protocol>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
   {
   public:
-    PriorityBands (void); // default ctor
-    PriorityBands (CORBA::ULong max); // uses max size
-    PriorityBands (
+    ProtocolList (void); // default ctor
+    ProtocolList (CORBA::ULong max); // uses max size
+    ProtocolList (
       CORBA::ULong max,
       CORBA::ULong length,
-      PriorityBand *buffer,
+      Protocol *buffer,
       CORBA::Boolean release = 0
     );
-    PriorityBands (const PriorityBands &); // copy ctor
-    ~PriorityBands (void);
+    ProtocolList (const ProtocolList &); // copy ctor
+    ~ProtocolList (void);
     static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef PriorityBands_var _var_type;
+    typedef ProtocolList_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
@@ -1995,177 +1875,297 @@ class TAO_Export SharedMemoryProtocolProperties: public virtual ProtocolProperti
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDS___VAR_CH_)
-#define _RTCORBA_PRIORITYBANDS___VAR_CH_
+#if !defined (_RTCORBA_PROTOCOLLIST___VAR_CH_)
+#define _RTCORBA_PROTOCOLLIST___VAR_CH_
 
   // *************************************************************
-  // class RTCORBA::PriorityBands_var
+  // class RTCORBA::ProtocolList_var
   // *************************************************************
 
-  class TAO_Export PriorityBands_var
+  class TAO_Export ProtocolList_var
   {
   public:
-    PriorityBands_var (void); // default constructor
-    PriorityBands_var (PriorityBands *);
-    PriorityBands_var (const PriorityBands_var &); // copy constructor
-    PriorityBands_var (const PriorityBands &); // fixed-size base types only
-    ~PriorityBands_var (void); // destructor
+    ProtocolList_var (void); // default constructor
+    ProtocolList_var (ProtocolList *);
+    ProtocolList_var (const ProtocolList_var &); // copy constructor
+    ~ProtocolList_var (void); // destructor
 
-    PriorityBands_var &operator= (PriorityBands *);
-    PriorityBands_var &operator= (const PriorityBands_var &);
-    PriorityBands_var &operator= (const PriorityBands &); // fixed-size base types only
-    PriorityBands *operator-> (void);
-    const PriorityBands *operator-> (void) const;
+    ProtocolList_var &operator= (ProtocolList *);
+    ProtocolList_var &operator= (const ProtocolList_var &);
+    ProtocolList *operator-> (void);
+    const ProtocolList *operator-> (void) const;
 
-    operator const PriorityBands &() const;
-    operator PriorityBands &();
-    operator PriorityBands &() const;
+    operator const ProtocolList &() const;
+    operator ProtocolList &();
+    operator ProtocolList &() const;
+    operator ProtocolList *&(); // variable-size base types only
 
-    PriorityBand & operator[] (CORBA::ULong index);
-    const PriorityBand & operator[] (CORBA::ULong index) const;
+    Protocol & operator[] (CORBA::ULong index);
+    const Protocol & operator[] (CORBA::ULong index) const;
 
     // in, inout, out, _retn
-    const PriorityBands &in (void) const;
-    PriorityBands &inout (void);
-    PriorityBands *&out (void);
-    PriorityBands *_retn (void);
-    PriorityBands *ptr (void) const;
+    const ProtocolList &in (void) const;
+    ProtocolList &inout (void);
+    ProtocolList *&out (void);
+    ProtocolList *_retn (void);
+    ProtocolList *ptr (void) const;
 
   private:
-    PriorityBands *ptr_;
+    ProtocolList *ptr_;
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDS___OUT_CH_)
-#define _RTCORBA_PRIORITYBANDS___OUT_CH_
+#if !defined (_RTCORBA_PROTOCOLLIST___OUT_CH_)
+#define _RTCORBA_PROTOCOLLIST___OUT_CH_
 
-  class TAO_Export PriorityBands_out
+  class TAO_Export ProtocolList_out
   {
   public:
-    PriorityBands_out (PriorityBands *&);
-    PriorityBands_out (PriorityBands_var &);
-    PriorityBands_out (const PriorityBands_out &);
-    PriorityBands_out &operator= (const PriorityBands_out &);
-    PriorityBands_out &operator= (PriorityBands *);
-    operator PriorityBands *&();
-    PriorityBands *&ptr (void);
-    PriorityBands *operator-> (void);
-    PriorityBand & operator[] (CORBA::ULong index);
+    ProtocolList_out (ProtocolList *&);
+    ProtocolList_out (ProtocolList_var &);
+    ProtocolList_out (const ProtocolList_out &);
+    ProtocolList_out &operator= (const ProtocolList_out &);
+    ProtocolList_out &operator= (ProtocolList *);
+    operator ProtocolList *&();
+    ProtocolList *&ptr (void);
+    ProtocolList *operator-> (void);
+    Protocol & operator[] (CORBA::ULong index);
 
   private:
-    PriorityBands *&ptr_;
+    ProtocolList *&ptr_;
     // assignment from T_var not allowed
-    void operator= (const PriorityBands_var &);
+    void operator= (const ProtocolList_var &);
   };
 
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityBands;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVER_PROTOCOL_POLICY_TYPE;
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
 
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY___PTR_CH_
+
+  class ServerProtocolPolicy;
+  typedef ServerProtocolPolicy *ServerProtocolPolicy_ptr;
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___PTR_CH_
+#endif /* end #if !defined */
+
+
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CH_
+
+  class TAO_Export ServerProtocolPolicy_var : public TAO_Base_var
+  {
+  public:
+    ServerProtocolPolicy_var (void); // default constructor
+    ServerProtocolPolicy_var (ServerProtocolPolicy_ptr p) : ptr_ (p) {}
+    ServerProtocolPolicy_var (const ServerProtocolPolicy_var &); // copy constructor
+    ~ServerProtocolPolicy_var (void); // destructor
+
+    ServerProtocolPolicy_var &operator= (ServerProtocolPolicy_ptr);
+    ServerProtocolPolicy_var &operator= (const ServerProtocolPolicy_var &);
+    ServerProtocolPolicy_ptr operator-> (void) const;
+
+    operator const ServerProtocolPolicy_ptr &() const;
+    operator ServerProtocolPolicy_ptr &();
+    // in, inout, out, _retn
+    ServerProtocolPolicy_ptr in (void) const;
+    ServerProtocolPolicy_ptr &inout (void);
+    ServerProtocolPolicy_ptr &out (void);
+    ServerProtocolPolicy_ptr _retn (void);
+    ServerProtocolPolicy_ptr ptr (void) const;
+
+  private:
+    ServerProtocolPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServerProtocolPolicy_var (const TAO_Base_var &rhs);
+    ServerProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
-  class PriorityBandedConnectionPolicy;
-  typedef PriorityBandedConnectionPolicy *PriorityBandedConnectionPolicy_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CH_
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY___OUT_CH_
 
-  class TAO_Export PriorityBandedConnectionPolicy_var : public TAO_Base_var
+  class TAO_Export ServerProtocolPolicy_out
   {
   public:
-    PriorityBandedConnectionPolicy_var (void); // default constructor
-    PriorityBandedConnectionPolicy_var (PriorityBandedConnectionPolicy_ptr p) : ptr_ (p) {}
-    PriorityBandedConnectionPolicy_var (const PriorityBandedConnectionPolicy_var &); // copy constructor
-    ~PriorityBandedConnectionPolicy_var (void); // destructor
+    ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &);
+    ServerProtocolPolicy_out (ServerProtocolPolicy_var &);
+    ServerProtocolPolicy_out (const ServerProtocolPolicy_out &);
+    ServerProtocolPolicy_out &operator= (const ServerProtocolPolicy_out &);
+    ServerProtocolPolicy_out &operator= (const ServerProtocolPolicy_var &);
+    ServerProtocolPolicy_out &operator= (ServerProtocolPolicy_ptr);
+    operator ServerProtocolPolicy_ptr &();
+    ServerProtocolPolicy_ptr &ptr (void);
+    ServerProtocolPolicy_ptr operator-> (void);
 
-    PriorityBandedConnectionPolicy_var &operator= (PriorityBandedConnectionPolicy_ptr);
-    PriorityBandedConnectionPolicy_var &operator= (const PriorityBandedConnectionPolicy_var &);
-    PriorityBandedConnectionPolicy_ptr operator-> (void) const;
+  private:
+    ServerProtocolPolicy_ptr &ptr_;
+  };
 
-    operator const PriorityBandedConnectionPolicy_ptr &() const;
-    operator PriorityBandedConnectionPolicy_ptr &();
+
+#endif /* end #if !defined */
+
+
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
+
+class TAO_Export ServerProtocolPolicy: public virtual CORBA::Policy
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ServerProtocolPolicy_ptr _ptr_type;
+    typedef ServerProtocolPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static ServerProtocolPolicy_ptr _duplicate (ServerProtocolPolicy_ptr obj);
+    static ServerProtocolPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static ServerProtocolPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      );
+    static ServerProtocolPolicy_ptr _nil (void)
+      {
+        return (ServerProtocolPolicy_ptr)0;
+      }
+
+    virtual RTCORBA::ProtocolList * protocols (
+        CORBA::Environment &ACE_TRY_ENV =
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ServerProtocolPolicy ();
+
+    virtual ~ServerProtocolPolicy (void);
+  private:
+    ServerProtocolPolicy (const ServerProtocolPolicy &);
+    void operator= (const ServerProtocolPolicy &);
+  };
+
+
+#endif /* end #if !defined */
+
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong CLIENT_PROTOCOL_POLICY_TYPE;
+
+
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY___PTR_CH_
+
+  class ClientProtocolPolicy;
+  typedef ClientProtocolPolicy *ClientProtocolPolicy_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CH_
+
+  class TAO_Export ClientProtocolPolicy_var : public TAO_Base_var
+  {
+  public:
+    ClientProtocolPolicy_var (void); // default constructor
+    ClientProtocolPolicy_var (ClientProtocolPolicy_ptr p) : ptr_ (p) {}
+    ClientProtocolPolicy_var (const ClientProtocolPolicy_var &); // copy constructor
+    ~ClientProtocolPolicy_var (void); // destructor
+
+    ClientProtocolPolicy_var &operator= (ClientProtocolPolicy_ptr);
+    ClientProtocolPolicy_var &operator= (const ClientProtocolPolicy_var &);
+    ClientProtocolPolicy_ptr operator-> (void) const;
+
+    operator const ClientProtocolPolicy_ptr &() const;
+    operator ClientProtocolPolicy_ptr &();
     // in, inout, out, _retn
-    PriorityBandedConnectionPolicy_ptr in (void) const;
-    PriorityBandedConnectionPolicy_ptr &inout (void);
-    PriorityBandedConnectionPolicy_ptr &out (void);
-    PriorityBandedConnectionPolicy_ptr _retn (void);
-    PriorityBandedConnectionPolicy_ptr ptr (void) const;
+    ClientProtocolPolicy_ptr in (void) const;
+    ClientProtocolPolicy_ptr &inout (void);
+    ClientProtocolPolicy_ptr &out (void);
+    ClientProtocolPolicy_ptr _retn (void);
+    ClientProtocolPolicy_ptr ptr (void) const;
 
   private:
-    PriorityBandedConnectionPolicy_ptr ptr_;
+    ClientProtocolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
-    PriorityBandedConnectionPolicy_var (const TAO_Base_var &rhs);
-    PriorityBandedConnectionPolicy_var &operator= (const TAO_Base_var &rhs);
+    ClientProtocolPolicy_var (const TAO_Base_var &rhs);
+    ClientProtocolPolicy_var &operator= (const TAO_Base_var &rhs);
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CH_
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CH_
 
-  class TAO_Export PriorityBandedConnectionPolicy_out
+  class TAO_Export ClientProtocolPolicy_out
   {
   public:
-    PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &);
-    PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &);
-    PriorityBandedConnectionPolicy_out (const PriorityBandedConnectionPolicy_out &);
-    PriorityBandedConnectionPolicy_out &operator= (const PriorityBandedConnectionPolicy_out &);
-    PriorityBandedConnectionPolicy_out &operator= (const PriorityBandedConnectionPolicy_var &);
-    PriorityBandedConnectionPolicy_out &operator= (PriorityBandedConnectionPolicy_ptr);
-    operator PriorityBandedConnectionPolicy_ptr &();
-    PriorityBandedConnectionPolicy_ptr &ptr (void);
-    PriorityBandedConnectionPolicy_ptr operator-> (void);
+    ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &);
+    ClientProtocolPolicy_out (ClientProtocolPolicy_var &);
+    ClientProtocolPolicy_out (const ClientProtocolPolicy_out &);
+    ClientProtocolPolicy_out &operator= (const ClientProtocolPolicy_out &);
+    ClientProtocolPolicy_out &operator= (const ClientProtocolPolicy_var &);
+    ClientProtocolPolicy_out &operator= (ClientProtocolPolicy_ptr);
+    operator ClientProtocolPolicy_ptr &();
+    ClientProtocolPolicy_ptr &ptr (void);
+    ClientProtocolPolicy_ptr operator-> (void);
 
   private:
-    PriorityBandedConnectionPolicy_ptr &ptr_;
+    ClientProtocolPolicy_ptr &ptr_;
   };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
 
-class TAO_Export PriorityBandedConnectionPolicy: public virtual CORBA::Policy
+class TAO_Export ClientProtocolPolicy: public virtual CORBA::Policy
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef PriorityBandedConnectionPolicy_ptr _ptr_type;
-    typedef PriorityBandedConnectionPolicy_var _var_type;
+    typedef ClientProtocolPolicy_ptr _ptr_type;
+    typedef ClientProtocolPolicy_var _var_type;
   #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     // the static operations
-    static PriorityBandedConnectionPolicy_ptr _duplicate (PriorityBandedConnectionPolicy_ptr obj);
-    static PriorityBandedConnectionPolicy_ptr _narrow (
+    static ClientProtocolPolicy_ptr _duplicate (ClientProtocolPolicy_ptr obj);
+    static ClientProtocolPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static PriorityBandedConnectionPolicy_ptr _unchecked_narrow (
+    static ClientProtocolPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-    static PriorityBandedConnectionPolicy_ptr _nil (void)
+    static ClientProtocolPolicy_ptr _nil (void)
       {
-        return (PriorityBandedConnectionPolicy_ptr)0;
+        return (ClientProtocolPolicy_ptr)0;
       }
 
-    virtual RTCORBA::PriorityBands * priority_bands (
+    virtual RTCORBA::ProtocolList * protocols (
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
@@ -2178,12 +2178,12 @@ class TAO_Export PriorityBandedConnectionPolicy: public virtual CORBA::Policy
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    PriorityBandedConnectionPolicy ();
+    ClientProtocolPolicy ();
 
-    virtual ~PriorityBandedConnectionPolicy (void);
+    virtual ~ClientProtocolPolicy (void);
   private:
-    PriorityBandedConnectionPolicy (const PriorityBandedConnectionPolicy &);
-    void operator= (const PriorityBandedConnectionPolicy &);
+    ClientProtocolPolicy (const ClientProtocolPolicy &);
+    void operator= (const ClientProtocolPolicy &);
   };
 
 
@@ -2632,19 +2632,6 @@ class TAO_Export RTORB : public virtual CORBA_Object
         RTCORBA::RTORB::MutexNotFound
       )) = 0;
 
-    virtual RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
-        CORBA::Long send_buffer_size,
-        CORBA::Long recv_buffer_size,
-        CORBA::Boolean keep_alive,
-        CORBA::Boolean dont_route,
-        CORBA::Boolean no_delay,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
 
 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_)
 #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_
@@ -2753,8 +2740,7 @@ class TAO_Export RTORB : public virtual CORBA_Object
         CORBA::SystemException
       )) = 0;
 
-    virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
-        const RTCORBA::ProtocolList & protocols,
+    virtual RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
@@ -2762,7 +2748,7 @@ class TAO_Export RTORB : public virtual CORBA_Object
         CORBA::SystemException
       )) = 0;
 
-    virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
+    virtual RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
         const RTCORBA::ProtocolList & protocols,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
@@ -2771,7 +2757,8 @@ class TAO_Export RTORB : public virtual CORBA_Object
         CORBA::SystemException
       )) = 0;
 
-    virtual RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
+    virtual RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
+        const RTCORBA::ProtocolList & protocols,
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
diff --git a/TAO/tao/RTCORBAC.i b/TAO/tao/RTCORBAC.i
index 75ab567264b..be9e88a789f 100644
--- a/TAO/tao/RTCORBAC.i
+++ b/TAO/tao/RTCORBAC.i
@@ -77,7 +77,7 @@ RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_var &p)
         {
           ThreadpoolLane *deep_copy =
             new ThreadpoolLane (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               ThreadpoolLane *tmp = deep_copy;
@@ -87,7 +87,7 @@ RTCORBA::ThreadpoolLane_var::operator= (const ::RTCORBA::ThreadpoolLane_var &p)
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -122,13 +122,13 @@ RTCORBA::ThreadpoolLane_var::operator const ::RTCORBA::ThreadpoolLane &() const
 }
 
 ACE_INLINE
-RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() // cast
+RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() const // cast
+RTCORBA::ThreadpoolLane_var::operator ::RTCORBA::ThreadpoolLane &() const // cast 
 {
   return *this->ptr_;
 }
@@ -145,7 +145,7 @@ RTCORBA::ThreadpoolLane_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for fixed size
+// mapping for fixed size 
 ACE_INLINE ::RTCORBA::ThreadpoolLane &
 RTCORBA::ThreadpoolLane_var::out (void)
 {
@@ -166,7 +166,7 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_THREADPOOLLANES_CI_
 
@@ -179,24 +179,24 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
     ACE_NEW_RETURN (retval, RTCORBA::ThreadpoolLane[size], 0);
     return retval;
   }
-
+  
   ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::freebuf (RTCORBA::ThreadpoolLane *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-
+  
   ACE_INLINE
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (void) // Default constructor.
   {
   }
-
+  
   ACE_INLINE
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (maximum))
   {
   }
-
+  
   ACE_INLINE
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -205,7 +205,7 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-
+  
   ACE_INLINE
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs)
   // Copy constructor.
@@ -215,10 +215,10 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
     {
       RTCORBA::ThreadpoolLane *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (this->maximum_);
       RTCORBA::ThreadpoolLane * const tmp2 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-
+      
       this->buffer_ = tmp1;
     }
     else
@@ -226,14 +226,14 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
       this->buffer_ = 0;
     }
   }
-
+  
   ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-
+    
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -246,18 +246,18 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::allocbuf (rhs.maximum_);
-
+    
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+    
     RTCORBA::ThreadpoolLane *tmp1 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane *, this->buffer_);
     RTCORBA::ThreadpoolLane * const tmp2 = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane * ACE_CAST_CONST, rhs.buffer_);
-
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-
+    
     return *this;
   }
-
+  
   // = Accessors.
   ACE_INLINE RTCORBA::ThreadpoolLane &
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i)
@@ -267,7 +267,7 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
     RTCORBA::ThreadpoolLane* tmp = ACE_reinterpret_cast(RTCORBA::ThreadpoolLane*,this->buffer_);
     return tmp[i];
   }
-
+  
   ACE_INLINE const RTCORBA::ThreadpoolLane &
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::operator[] (CORBA::ULong i) const
   // operator []
@@ -276,9 +276,9 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
     RTCORBA::ThreadpoolLane * const tmp = ACE_reinterpret_cast (RTCORBA::ThreadpoolLane* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-
+  
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+  
   ACE_INLINE RTCORBA::ThreadpoolLane *
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (CORBA::Boolean orphan)
   {
@@ -312,13 +312,13 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
     }
     return result;
   }
-
+  
   ACE_INLINE const RTCORBA::ThreadpoolLane *
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const RTCORBA::ThreadpoolLane * ACE_CAST_CONST, this->buffer_);
   }
-
+  
   ACE_INLINE void
   RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ThreadpoolLanes::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -335,11 +335,11 @@ RTCORBA::ThreadpoolLane_var::ptr (void) const
     this->buffer_ = data;
     this->release_ = release;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CI_)
 #define _RTCORBA_THREADPOOLLANES_CI_
@@ -402,7 +402,7 @@ RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p
         {
           ThreadpoolLanes *deep_copy =
             new ThreadpoolLanes (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               ThreadpoolLanes *tmp = deep_copy;
@@ -412,7 +412,7 @@ RTCORBA::ThreadpoolLanes_var::operator= (const ::RTCORBA::ThreadpoolLanes_var &p
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -440,20 +440,20 @@ RTCORBA::ThreadpoolLanes_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::ThreadpoolLanes_var::operator const ::RTCORBA::ThreadpoolLanes &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() // cast
+ACE_INLINE 
+RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() const // cast
+ACE_INLINE 
+RTCORBA::ThreadpoolLanes_var::operator ::RTCORBA::ThreadpoolLanes &() const // cast 
 {
   return *this->ptr_;
 }
@@ -482,7 +482,7 @@ RTCORBA::ThreadpoolLanes_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::RTCORBA::ThreadpoolLanes *&
 RTCORBA::ThreadpoolLanes_var::out (void)
 {
@@ -543,7 +543,7 @@ RTCORBA::ThreadpoolLanes_out::operator= (ThreadpoolLanes *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::ThreadpoolLanes_out::operator ::RTCORBA::ThreadpoolLanes *&() // cast
 {
   return this->ptr_;
@@ -620,14 +620,14 @@ RTCORBA::PriorityModelPolicy_var::operator= (const ::RTCORBA::PriorityModelPolic
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::PriorityModelPolicy_var::operator const ::RTCORBA::PriorityModelPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
+ACE_INLINE 
+RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -719,7 +719,7 @@ RTCORBA::PriorityModelPolicy_out::operator= (PriorityModelPolicy_ptr p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::PriorityModelPolicy_out::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -790,14 +790,14 @@ RTCORBA::ThreadpoolPolicy_var::operator= (const ::RTCORBA::ThreadpoolPolicy_var
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::ThreadpoolPolicy_var::operator const ::RTCORBA::ThreadpoolPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
+ACE_INLINE 
+RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -889,7 +889,7 @@ RTCORBA::ThreadpoolPolicy_out::operator= (ThreadpoolPolicy_ptr p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::ThreadpoolPolicy_out::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
 {
   return this->ptr_;
@@ -911,99 +911,99 @@ RTCORBA::ThreadpoolPolicy_out::operator-> (void)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CI_)
-#define _RTCORBA_PROTOCOLPROPERTIES___VAR_CI_
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::ProtocolProperties_var
+// Inline operations for class RTCORBA::PrivateConnectionPolicy_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void) // default constructor
-  : ptr_ (ProtocolProperties::_nil ())
+RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void) // default constructor
+  : ptr_ (PrivateConnectionPolicy::_nil ())
 {}
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::ptr (void) const
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (const ::RTCORBA::ProtocolProperties_var &p) // copy constructor
+RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (const ::RTCORBA::PrivateConnectionPolicy_var &p) // copy constructor
   : TAO_Base_var (),
-    ptr_ (ProtocolProperties::_duplicate (p.ptr ()))
+    ptr_ (PrivateConnectionPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
-RTCORBA::ProtocolProperties_var::~ProtocolProperties_var (void) // destructor
+RTCORBA::PrivateConnectionPolicy_var::~PrivateConnectionPolicy_var (void) // destructor
 {
   CORBA::release (this->ptr_);
 }
 
-ACE_INLINE RTCORBA::ProtocolProperties_var &
-RTCORBA::ProtocolProperties_var::operator= (ProtocolProperties_ptr p)
+ACE_INLINE RTCORBA::PrivateConnectionPolicy_var &
+RTCORBA::PrivateConnectionPolicy_var::operator= (PrivateConnectionPolicy_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE RTCORBA::ProtocolProperties_var &
-RTCORBA::ProtocolProperties_var::operator= (const ::RTCORBA::ProtocolProperties_var &p)
+ACE_INLINE RTCORBA::PrivateConnectionPolicy_var &
+RTCORBA::PrivateConnectionPolicy_var::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
+    this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::ProtocolProperties_var::operator const ::RTCORBA::ProtocolProperties_ptr &() const // cast
+ACE_INLINE 
+RTCORBA::PrivateConnectionPolicy_var::operator const ::RTCORBA::PrivateConnectionPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
+ACE_INLINE 
+RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::operator-> (void) const
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::in (void) const
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::in (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_var::inout (void)
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
+RTCORBA::PrivateConnectionPolicy_var::inout (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_var::out (void)
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
+RTCORBA::PrivateConnectionPolicy_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::_retn (void)
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::RTCORBA::ProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+  ::RTCORBA::PrivateConnectionPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
   return val;
 }
 
@@ -1011,68 +1011,68 @@ RTCORBA::ProtocolProperties_var::_retn (void)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___OUT_CI_)
-#define _RTCORBA_PROTOCOLPROPERTIES___OUT_CI_
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CI_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::ProtocolProperties_out
+// Inline operations for class RTCORBA::PrivateConnectionPolicy_out
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p)
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_var &p) // constructor from _var
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (const ::RTCORBA::ProtocolProperties_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ProtocolProperties_out &, p).ptr_)
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (const ::RTCORBA::PrivateConnectionPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PrivateConnectionPolicy_out &, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_out &p)
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_out &
+RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_out &p)
 {
-  this->ptr_ = ACE_const_cast (ProtocolProperties_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (PrivateConnectionPolicy_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_var &p)
+ACE_INLINE RTCORBA::PrivateConnectionPolicy_out &
+RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
 {
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
   return *this;
 }
 
-ACE_INLINE RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (ProtocolProperties_ptr p)
+ACE_INLINE RTCORBA::PrivateConnectionPolicy_out &
+RTCORBA::PrivateConnectionPolicy_out::operator= (PrivateConnectionPolicy_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::ProtocolProperties_out::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
+ACE_INLINE 
+RTCORBA::PrivateConnectionPolicy_out::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_out::ptr (void) // ptr
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
+RTCORBA::PrivateConnectionPolicy_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_out::operator-> (void)
+ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_out::operator-> (void)
 {
   return this->ptr_;
 }
@@ -1081,44 +1081,51 @@ RTCORBA::ProtocolProperties_out::operator-> (void)
 #endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class RTCORBA::Protocol_var
+// Inline operations for class RTCORBA::PriorityBand_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (void) // default constructor
+RTCORBA::PriorityBand_var::PriorityBand_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (Protocol *p)
+RTCORBA::PriorityBand_var::PriorityBand_var (PriorityBand *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-RTCORBA::Protocol_var::Protocol_var (const ::RTCORBA::Protocol_var &p) // copy constructor
+RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::Protocol (*p.ptr_));
+    ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
+// fixed-size types only
 ACE_INLINE
-RTCORBA::Protocol_var::~Protocol_var (void) // destructor
+RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand &p)
+{
+  ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (p));
+}
+
+ACE_INLINE
+RTCORBA::PriorityBand_var::~PriorityBand_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::Protocol_var &
-RTCORBA::Protocol_var::operator= (Protocol *p)
+ACE_INLINE RTCORBA::PriorityBand_var &
+RTCORBA::PriorityBand_var::operator= (PriorityBand *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::Protocol_var &
-RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &p)
+ACE_INLINE ::RTCORBA::PriorityBand_var &
+RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &p)
 {
   if (this != &p)
     {
@@ -1129,205 +1136,150 @@ RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &p)
         }
       else
         {
-          Protocol *deep_copy =
-            new Protocol (*p.ptr_);
-
+          PriorityBand *deep_copy =
+            new PriorityBand (*p.ptr_);
+          
           if (deep_copy != 0)
             {
-              Protocol *tmp = deep_copy;
+              PriorityBand *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::operator-> (void) const
+// fixed-size types only
+ACE_INLINE RTCORBA::PriorityBand_var &
+RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand &p)
 {
-  return this->ptr_;
+  if (this->ptr_ != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBand (p), *this);
+  }
+  return *this;
 }
 
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::operator-> (void)
+ACE_INLINE const ::RTCORBA::PriorityBand *
+RTCORBA::PriorityBand_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::Protocol_var::operator const ::RTCORBA::Protocol &() const // cast
+ACE_INLINE ::RTCORBA::PriorityBand *
+RTCORBA::PriorityBand_var::operator-> (void)
 {
-  return *this->ptr_;
+  return this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() // cast
+RTCORBA::PriorityBand_var::operator const ::RTCORBA::PriorityBand &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() const // cast
+RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
 ACE_INLINE
-RTCORBA::Protocol_var::operator ::RTCORBA::Protocol *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const ::RTCORBA::Protocol &
-RTCORBA::Protocol_var::in (void) const
+RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() const // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::Protocol &
-RTCORBA::Protocol_var::inout (void)
+ACE_INLINE const ::RTCORBA::PriorityBand &
+RTCORBA::PriorityBand_var::in (void) const
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::RTCORBA::Protocol *&
-RTCORBA::Protocol_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::_retn (void)
-{
-  ::RTCORBA::Protocol *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class RTCORBA::Protocol_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (::RTCORBA::Protocol *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (Protocol_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-RTCORBA::Protocol_out::Protocol_out (const ::RTCORBA::Protocol_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Protocol_out&, p).ptr_)
-{}
-
-ACE_INLINE RTCORBA::Protocol_out &
-RTCORBA::Protocol_out::operator= (const ::RTCORBA::Protocol_out &p)
-{
-  this->ptr_ = ACE_const_cast (Protocol_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::Protocol_out &
-RTCORBA::Protocol_out::operator= (Protocol *p)
+ACE_INLINE ::RTCORBA::PriorityBand &
+RTCORBA::PriorityBand_var::inout (void)
 {
-  this->ptr_ = p;
-  return *this;
+  return *this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::Protocol_out::operator ::RTCORBA::Protocol *&() // cast
+// mapping for fixed size 
+ACE_INLINE ::RTCORBA::PriorityBand &
+RTCORBA::PriorityBand_var::out (void)
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::Protocol *&
-RTCORBA::Protocol_out::ptr (void) // ptr
+ACE_INLINE ::RTCORBA::PriorityBand
+RTCORBA::PriorityBand_var::_retn (void)
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::Protocol *
-RTCORBA::Protocol_out::operator-> (void)
+ACE_INLINE ::RTCORBA::PriorityBand *
+RTCORBA::PriorityBand_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_
+  
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_
 
   // = Static operations.
-  ACE_INLINE RTCORBA::Protocol *
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (CORBA::ULong size)
+  ACE_INLINE RTCORBA::PriorityBand *
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    RTCORBA::Protocol *retval = 0;
-    ACE_NEW_RETURN (retval, RTCORBA::Protocol[size], 0);
+    RTCORBA::PriorityBand *retval = 0;
+    ACE_NEW_RETURN (retval, RTCORBA::PriorityBand[size], 0);
     return retval;
   }
-
-  ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (RTCORBA::Protocol *buffer)
+  
+  ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (RTCORBA::PriorityBand *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Default constructor.
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Default constructor.
   {
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (maximum))
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum) // Constructor using a maximum length value.
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (maximum))
   {
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum,
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum,
     CORBA::ULong length,
-    RTCORBA::Protocol *data,
+    RTCORBA::PriorityBand *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs)
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
     if (rhs.buffer_ != 0)
     {
-      RTCORBA::Protocol *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->maximum_);
-      RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
-
+      RTCORBA::PriorityBand *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->maximum_);
+      RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-
+      
       this->buffer_ = tmp1;
     }
     else
@@ -1335,75 +1287,75 @@ RTCORBA::Protocol_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-
-  ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList &
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs)
+  
+  ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands &
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-
+    
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
+        RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
+        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
       }
     }
     else
-      this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
-
+      this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
+    
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    RTCORBA::Protocol *tmp1 = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
-    RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
-
+    
+    RTCORBA::PriorityBand *tmp1 = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
+    RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-
+    
     return *this;
   }
-
+  
   // = Accessors.
-  ACE_INLINE RTCORBA::Protocol &
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i)
+  ACE_INLINE RTCORBA::PriorityBand &
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    RTCORBA::Protocol* tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
+    RTCORBA::PriorityBand* tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
     return tmp[i];
   }
-
-  ACE_INLINE const RTCORBA::Protocol &
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) const
+  
+  ACE_INLINE const RTCORBA::PriorityBand &
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    RTCORBA::Protocol * const tmp = ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_);
+    RTCORBA::PriorityBand * const tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-
+  
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  ACE_INLINE RTCORBA::Protocol *
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (CORBA::Boolean orphan)
+  
+  ACE_INLINE RTCORBA::PriorityBand *
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (CORBA::Boolean orphan)
   {
-    RTCORBA::Protocol *result = 0;
+    RTCORBA::PriorityBand *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
       if (this->buffer_ == 0)
       {
-        result = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_);
+        result = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_);
         this->buffer_ = result;
         this->release_ = 1;
       }
       else
       {
-        result = ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
+        result = ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -1412,7 +1364,7 @@ RTCORBA::Protocol_out::operator-> (void)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
+        result = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -1421,77 +1373,84 @@ RTCORBA::Protocol_out::operator-> (void)
     }
     return result;
   }
-
-  ACE_INLINE const RTCORBA::Protocol *
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (void) const
+  
+  ACE_INLINE const RTCORBA::PriorityBand *
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const RTCORBA::Protocol * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const RTCORBA::PriorityBand * ACE_CAST_CONST, this->buffer_);
   }
-
+  
   ACE_INLINE void
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (CORBA::ULong max,
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (CORBA::ULong max,
   CORBA::ULong length,
-  RTCORBA::Protocol *data,
+  RTCORBA::PriorityBand *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      RTCORBA::Protocol *tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
+      RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
+      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
     }
     this->buffer_ = data;
     this->release_ = release;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_RTCORBA_PROTOCOLLIST_CI_)
-#define _RTCORBA_PROTOCOLLIST_CI_
+#if !defined (_RTCORBA_PRIORITYBANDS_CI_)
+#define _RTCORBA_PRIORITYBANDS_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::ProtocolList_var
+// Inline operations for class RTCORBA::PriorityBands_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (void) // default constructor
+RTCORBA::PriorityBands_var::PriorityBands_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (ProtocolList *p)
+RTCORBA::PriorityBands_var::PriorityBands_var (PriorityBands *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-RTCORBA::ProtocolList_var::ProtocolList_var (const ::RTCORBA::ProtocolList_var &p) // copy constructor
+RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::ProtocolList (*p.ptr_));
+    ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
+// fixed-size base types only
 ACE_INLINE
-RTCORBA::ProtocolList_var::~ProtocolList_var (void) // destructor
+RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands &p)
+{
+  ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (p));
+}
+
+ACE_INLINE
+RTCORBA::PriorityBands_var::~PriorityBands_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::ProtocolList_var &
-RTCORBA::ProtocolList_var::operator= (ProtocolList *p)
+ACE_INLINE RTCORBA::PriorityBands_var &
+RTCORBA::PriorityBands_var::operator= (PriorityBands *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList_var &
-RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p)
+ACE_INLINE ::RTCORBA::PriorityBands_var &
+RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p)
 {
   if (this != &p)
     {
@@ -1502,119 +1461,124 @@ RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p)
         }
       else
         {
-          ProtocolList *deep_copy =
-            new ProtocolList (*p.ptr_);
-
+          PriorityBands *deep_copy =
+            new PriorityBands (*p.ptr_);
+          
           if (deep_copy != 0)
             {
-              ProtocolList *tmp = deep_copy;
+              PriorityBands *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-ACE_INLINE const ::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::operator-> (void) const
+// fixed-size types only
+ACE_INLINE ::RTCORBA::PriorityBands_var &
+RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands &p)
 {
-  return this->ptr_;
+  if (this->ptr_ != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBands (p), *this);
+  }
+  return *this;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::operator-> (void)
+ACE_INLINE const ::RTCORBA::PriorityBands *
+RTCORBA::PriorityBands_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator const ::RTCORBA::ProtocolList &() const // cast
+ACE_INLINE ::RTCORBA::PriorityBands *
+RTCORBA::PriorityBands_var::operator-> (void)
 {
-  return *this->ptr_;
+  return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() // cast
+ACE_INLINE 
+RTCORBA::PriorityBands_var::operator const ::RTCORBA::PriorityBands &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() const // cast
+ACE_INLINE 
+RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() // cast 
 {
   return *this->ptr_;
 }
 
-// variable-size types only
-ACE_INLINE
-RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList *&() // cast
+ACE_INLINE 
+RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() const // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE RTCORBA::Protocol &
-RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index)
+ACE_INLINE RTCORBA::PriorityBand &
+RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const RTCORBA::Protocol &
-RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index) const
+ACE_INLINE const RTCORBA::PriorityBand &
+RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const RTCORBA::Protocol &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const RTCORBA::PriorityBand &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::RTCORBA::ProtocolList &
-RTCORBA::ProtocolList_var::in (void) const
+ACE_INLINE const ::RTCORBA::PriorityBands &
+RTCORBA::PriorityBands_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList &
-RTCORBA::ProtocolList_var::inout (void)
+ACE_INLINE ::RTCORBA::PriorityBands &
+RTCORBA::PriorityBands_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::RTCORBA::ProtocolList *&
-RTCORBA::ProtocolList_var::out (void)
+// mapping for variable size 
+ACE_INLINE ::RTCORBA::PriorityBands *&
+RTCORBA::PriorityBands_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::_retn (void)
+ACE_INLINE ::RTCORBA::PriorityBands *
+RTCORBA::PriorityBands_var::_retn (void)
 {
-  ::RTCORBA::ProtocolList *tmp = this->ptr_;
+  ::RTCORBA::PriorityBands *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_var::ptr (void) const
+ACE_INLINE ::RTCORBA::PriorityBands *
+RTCORBA::PriorityBands_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class RTCORBA::ProtocolList_out
+// Inline operations for class RTCORBA::PriorityBands_out
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList *&p)
+RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList_var &p) // constructor from _var
+RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1622,44 +1586,44 @@ RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList_var &p) // constructor
 }
 
 ACE_INLINE
-RTCORBA::ProtocolList_out::ProtocolList_out (const ::RTCORBA::ProtocolList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ProtocolList_out&, p).ptr_)
+RTCORBA::PriorityBands_out::PriorityBands_out (const ::RTCORBA::PriorityBands_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PriorityBands_out&, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::ProtocolList_out &
-RTCORBA::ProtocolList_out::operator= (const ::RTCORBA::ProtocolList_out &p)
+ACE_INLINE ::RTCORBA::PriorityBands_out &
+RTCORBA::PriorityBands_out::operator= (const ::RTCORBA::PriorityBands_out &p)
 {
-  this->ptr_ = ACE_const_cast (ProtocolList_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (PriorityBands_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList_out &
-RTCORBA::ProtocolList_out::operator= (ProtocolList *p)
+ACE_INLINE ::RTCORBA::PriorityBands_out &
+RTCORBA::PriorityBands_out::operator= (PriorityBands *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::ProtocolList_out::operator ::RTCORBA::ProtocolList *&() // cast
+ACE_INLINE 
+RTCORBA::PriorityBands_out::operator ::RTCORBA::PriorityBands *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *&
-RTCORBA::ProtocolList_out::ptr (void) // ptr
+ACE_INLINE ::RTCORBA::PriorityBands *&
+RTCORBA::PriorityBands_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ProtocolList *
-RTCORBA::ProtocolList_out::operator-> (void)
+ACE_INLINE ::RTCORBA::PriorityBands *
+RTCORBA::PriorityBands_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE RTCORBA::Protocol &
-RTCORBA::ProtocolList_out::operator[] (CORBA::ULong index)
+ACE_INLINE RTCORBA::PriorityBand &
+RTCORBA::PriorityBands_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -1668,269 +1632,99 @@ RTCORBA::ProtocolList_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ServerProtocolPolicy_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void) // default constructor
-  : ptr_ (ServerProtocolPolicy::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (const ::RTCORBA::ServerProtocolPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServerProtocolPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::~ServerProtocolPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_var &
-RTCORBA::ServerProtocolPolicy_var::operator= (ServerProtocolPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_var &
-RTCORBA::ServerProtocolPolicy_var::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::operator const ::RTCORBA::ServerProtocolPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ServerProtocolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___OUT_CI_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ServerProtocolPolicy_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (const ::RTCORBA::ServerProtocolPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServerProtocolPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerProtocolPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (ServerProtocolPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::ClientProtocolPolicy_var
+// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void) // default constructor
-  : ptr_ (ClientProtocolPolicy::_nil ())
+RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void) // default constructor
+  : ptr_ (PriorityBandedConnectionPolicy::_nil ())
 {}
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::ptr (void) const
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (const ::RTCORBA::ClientProtocolPolicy_var &p) // copy constructor
+RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p) // copy constructor
   : TAO_Base_var (),
-    ptr_ (ClientProtocolPolicy::_duplicate (p.ptr ()))
+    ptr_ (PriorityBandedConnectionPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::~ClientProtocolPolicy_var (void) // destructor
+RTCORBA::PriorityBandedConnectionPolicy_var::~PriorityBandedConnectionPolicy_var (void) // destructor
 {
   CORBA::release (this->ptr_);
 }
 
-ACE_INLINE RTCORBA::ClientProtocolPolicy_var &
-RTCORBA::ClientProtocolPolicy_var::operator= (ClientProtocolPolicy_ptr p)
+ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_var &
+RTCORBA::PriorityBandedConnectionPolicy_var::operator= (PriorityBandedConnectionPolicy_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE RTCORBA::ClientProtocolPolicy_var &
-RTCORBA::ClientProtocolPolicy_var::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
+ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_var &
+RTCORBA::PriorityBandedConnectionPolicy_var::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
+    this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::operator const ::RTCORBA::ClientProtocolPolicy_ptr &() const // cast
+ACE_INLINE 
+RTCORBA::PriorityBandedConnectionPolicy_var::operator const ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
+ACE_INLINE 
+RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::operator-> (void) const
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::in (void) const
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::in (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_var::inout (void)
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
+RTCORBA::PriorityBandedConnectionPolicy_var::inout (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_var::out (void)
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
+RTCORBA::PriorityBandedConnectionPolicy_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::_retn (void)
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::RTCORBA::ClientProtocolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+  ::RTCORBA::PriorityBandedConnectionPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
   return val;
 }
 
@@ -1938,68 +1732,68 @@ RTCORBA::ClientProtocolPolicy_var::_retn (void)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CI_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CI_
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CI_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::ClientProtocolPolicy_out
+// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_out
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p)
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_var &p) // constructor from _var
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (const ::RTCORBA::ClientProtocolPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ClientProtocolPolicy_out &, p).ptr_)
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PriorityBandedConnectionPolicy_out &, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_out &p)
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_out &
+RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p)
 {
-  this->ptr_ = ACE_const_cast (ClientProtocolPolicy_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (PriorityBandedConnectionPolicy_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
+ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_out &
+RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
 {
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
   return *this;
 }
 
-ACE_INLINE RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (ClientProtocolPolicy_ptr p)
+ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_out &
+RTCORBA::PriorityBandedConnectionPolicy_out::operator= (PriorityBandedConnectionPolicy_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
+ACE_INLINE 
+RTCORBA::PriorityBandedConnectionPolicy_out::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_out::ptr (void) // ptr
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
+RTCORBA::PriorityBandedConnectionPolicy_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_out::operator-> (void)
+ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_out::operator-> (void)
 {
   return this->ptr_;
 }
@@ -2008,99 +1802,99 @@ RTCORBA::ClientProtocolPolicy_out::operator-> (void)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CI_)
+#define _RTCORBA_PROTOCOLPROPERTIES___VAR_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::PrivateConnectionPolicy_var
+// Inline operations for class RTCORBA::ProtocolProperties_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void) // default constructor
-  : ptr_ (PrivateConnectionPolicy::_nil ())
+RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void) // default constructor
+  : ptr_ (ProtocolProperties::_nil ())
 {}
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::ptr (void) const
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (const ::RTCORBA::PrivateConnectionPolicy_var &p) // copy constructor
+RTCORBA::ProtocolProperties_var::ProtocolProperties_var (const ::RTCORBA::ProtocolProperties_var &p) // copy constructor
   : TAO_Base_var (),
-    ptr_ (PrivateConnectionPolicy::_duplicate (p.ptr ()))
+    ptr_ (ProtocolProperties::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::~PrivateConnectionPolicy_var (void) // destructor
+RTCORBA::ProtocolProperties_var::~ProtocolProperties_var (void) // destructor
 {
   CORBA::release (this->ptr_);
 }
 
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_var &
-RTCORBA::PrivateConnectionPolicy_var::operator= (PrivateConnectionPolicy_ptr p)
+ACE_INLINE RTCORBA::ProtocolProperties_var &
+RTCORBA::ProtocolProperties_var::operator= (ProtocolProperties_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_var &
-RTCORBA::PrivateConnectionPolicy_var::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
+ACE_INLINE RTCORBA::ProtocolProperties_var &
+RTCORBA::ProtocolProperties_var::operator= (const ::RTCORBA::ProtocolProperties_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
+    this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
   }
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::operator const ::RTCORBA::PrivateConnectionPolicy_ptr &() const // cast
+ACE_INLINE 
+RTCORBA::ProtocolProperties_var::operator const ::RTCORBA::ProtocolProperties_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
+ACE_INLINE 
+RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::operator-> (void) const
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::in (void) const
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::in (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_var::inout (void)
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
+RTCORBA::ProtocolProperties_var::inout (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_var::out (void)
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
+RTCORBA::ProtocolProperties_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::_retn (void)
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::RTCORBA::PrivateConnectionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+  ::RTCORBA::ProtocolProperties_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
   return val;
 }
 
@@ -2108,68 +1902,68 @@ RTCORBA::PrivateConnectionPolicy_var::_retn (void)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CI_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CI_
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES___OUT_CI_)
+#define _RTCORBA_PROTOCOLPROPERTIES___OUT_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::PrivateConnectionPolicy_out
+// Inline operations for class RTCORBA::ProtocolProperties_out
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p)
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &p) // constructor from _var
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (const ::RTCORBA::PrivateConnectionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PrivateConnectionPolicy_out &, p).ptr_)
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (const ::RTCORBA::ProtocolProperties_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ProtocolProperties_out &, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_out &p)
+ACE_INLINE ::RTCORBA::ProtocolProperties_out &
+RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_out &p)
 {
-  this->ptr_ = ACE_const_cast (PrivateConnectionPolicy_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (ProtocolProperties_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
+ACE_INLINE RTCORBA::ProtocolProperties_out &
+RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_var &p)
 {
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
   return *this;
 }
 
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (PrivateConnectionPolicy_ptr p)
+ACE_INLINE RTCORBA::ProtocolProperties_out &
+RTCORBA::ProtocolProperties_out::operator= (ProtocolProperties_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
+ACE_INLINE 
+RTCORBA::ProtocolProperties_out::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_out::ptr (void) // ptr
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
+RTCORBA::ProtocolProperties_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_out::operator-> (void)
+ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_out::operator-> (void)
 {
   return this->ptr_;
 }
@@ -2227,14 +2021,14 @@ RTCORBA::TCPProtocolProperties_var::operator= (const ::RTCORBA::TCPProtocolPrope
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::TCPProtocolProperties_var::operator const ::RTCORBA::TCPProtocolProperties_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
+ACE_INLINE 
+RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2326,7 +2120,7 @@ RTCORBA::TCPProtocolProperties_out::operator= (TCPProtocolProperties_ptr p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::TCPProtocolProperties_out::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
@@ -2397,14 +2191,14 @@ RTCORBA::GIOPProtocolProperties_var::operator= (const ::RTCORBA::GIOPProtocolPro
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::GIOPProtocolProperties_var::operator const ::RTCORBA::GIOPProtocolProperties_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
+ACE_INLINE 
+RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2496,7 +2290,7 @@ RTCORBA::GIOPProtocolProperties_out::operator= (GIOPProtocolProperties_ptr p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::GIOPProtocolProperties_out::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
@@ -2567,14 +2361,14 @@ RTCORBA::UnixDomainProtocolProperties_var::operator= (const ::RTCORBA::UnixDomai
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::UnixDomainProtocolProperties_var::operator const ::RTCORBA::UnixDomainProtocolProperties_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
+ACE_INLINE 
+RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2666,7 +2460,7 @@ RTCORBA::UnixDomainProtocolProperties_out::operator= (UnixDomainProtocolProperti
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::UnixDomainProtocolProperties_out::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
@@ -2737,14 +2531,14 @@ RTCORBA::SharedMemoryProtocolProperties_var::operator= (const ::RTCORBA::SharedM
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::SharedMemoryProtocolProperties_var::operator const ::RTCORBA::SharedMemoryProtocolProperties_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
+ACE_INLINE 
+RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -2836,7 +2630,7 @@ RTCORBA::SharedMemoryProtocolProperties_out::operator= (SharedMemoryProtocolProp
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::SharedMemoryProtocolProperties_out::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
 {
   return this->ptr_;
@@ -2858,51 +2652,44 @@ RTCORBA::SharedMemoryProtocolProperties_out::operator-> (void)
 #endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class RTCORBA::PriorityBand_var
+// Inline operations for class RTCORBA::Protocol_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (void) // default constructor
+RTCORBA::Protocol_var::Protocol_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (PriorityBand *p)
+RTCORBA::Protocol_var::Protocol_var (Protocol *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand_var &p) // copy constructor
+RTCORBA::Protocol_var::Protocol_var (const ::RTCORBA::Protocol_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (*p.ptr_));
+    ACE_NEW (this->ptr_, ::RTCORBA::Protocol (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
-// fixed-size types only
 ACE_INLINE
-RTCORBA::PriorityBand_var::PriorityBand_var (const ::RTCORBA::PriorityBand &p)
-{
-  ACE_NEW (this->ptr_, ::RTCORBA::PriorityBand (p));
-}
-
-ACE_INLINE
-RTCORBA::PriorityBand_var::~PriorityBand_var (void) // destructor
+RTCORBA::Protocol_var::~Protocol_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (PriorityBand *p)
+ACE_INLINE RTCORBA::Protocol_var &
+RTCORBA::Protocol_var::operator= (Protocol *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &p)
+ACE_INLINE ::RTCORBA::Protocol_var &
+RTCORBA::Protocol_var::operator= (const ::RTCORBA::Protocol_var &p)
 {
   if (this != &p)
     {
@@ -2913,150 +2700,205 @@ RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand_var &p)
         }
       else
         {
-          PriorityBand *deep_copy =
-            new PriorityBand (*p.ptr_);
-
+          Protocol *deep_copy =
+            new Protocol (*p.ptr_);
+          
           if (deep_copy != 0)
             {
-              PriorityBand *tmp = deep_copy;
+              Protocol *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE RTCORBA::PriorityBand_var &
-RTCORBA::PriorityBand_var::operator= (const ::RTCORBA::PriorityBand &p)
+ACE_INLINE const ::RTCORBA::Protocol *
+RTCORBA::Protocol_var::operator-> (void) const
 {
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBand (p), *this);
-  }
-  return *this;
+  return this->ptr_;
 }
 
-ACE_INLINE const ::RTCORBA::PriorityBand *
-RTCORBA::PriorityBand_var::operator-> (void) const
+ACE_INLINE ::RTCORBA::Protocol *
+RTCORBA::Protocol_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBand *
-RTCORBA::PriorityBand_var::operator-> (void)
+ACE_INLINE
+RTCORBA::Protocol_var::operator const ::RTCORBA::Protocol &() const // cast
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::operator const ::RTCORBA::PriorityBand &() const // cast
+RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() // cast
+RTCORBA::Protocol_var::operator ::RTCORBA::Protocol &() const // cast 
 {
   return *this->ptr_;
 }
 
+// variable-size types only
 ACE_INLINE
-RTCORBA::PriorityBand_var::operator ::RTCORBA::PriorityBand &() const // cast
+RTCORBA::Protocol_var::operator ::RTCORBA::Protocol *&() // cast 
 {
-  return *this->ptr_;
+  return this->ptr_;
 }
 
-ACE_INLINE const ::RTCORBA::PriorityBand &
-RTCORBA::PriorityBand_var::in (void) const
+ACE_INLINE const ::RTCORBA::Protocol &
+RTCORBA::Protocol_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBand &
-RTCORBA::PriorityBand_var::inout (void)
+ACE_INLINE ::RTCORBA::Protocol &
+RTCORBA::Protocol_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for fixed size
-ACE_INLINE ::RTCORBA::PriorityBand &
-RTCORBA::PriorityBand_var::out (void)
+// mapping for variable size 
+ACE_INLINE ::RTCORBA::Protocol *&
+RTCORBA::Protocol_var::out (void)
 {
-  return *this->ptr_;
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBand
-RTCORBA::PriorityBand_var::_retn (void)
+ACE_INLINE ::RTCORBA::Protocol *
+RTCORBA::Protocol_var::_retn (void)
 {
-  return *this->ptr_;
+  ::RTCORBA::Protocol *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBand *
-RTCORBA::PriorityBand_var::ptr (void) const
+ACE_INLINE ::RTCORBA::Protocol *
+RTCORBA::Protocol_var::ptr (void) const
 {
   return this->ptr_;
 }
 
+// *************************************************************
+// Inline operations for class RTCORBA::Protocol_out
+// *************************************************************
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE
+RTCORBA::Protocol_out::Protocol_out (::RTCORBA::Protocol *&p)
+  : ptr_ (p)
+{
+  this->ptr_ = 0;
+}
 
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PRIORITYBANDS_CI_
+ACE_INLINE
+RTCORBA::Protocol_out::Protocol_out (Protocol_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+}
+
+ACE_INLINE
+RTCORBA::Protocol_out::Protocol_out (const ::RTCORBA::Protocol_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Protocol_out&, p).ptr_)
+{}
+
+ACE_INLINE RTCORBA::Protocol_out &
+RTCORBA::Protocol_out::operator= (const ::RTCORBA::Protocol_out &p)
+{
+  this->ptr_ = ACE_const_cast (Protocol_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE RTCORBA::Protocol_out &
+RTCORBA::Protocol_out::operator= (Protocol *p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE 
+RTCORBA::Protocol_out::operator ::RTCORBA::Protocol *&() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::Protocol *&
+RTCORBA::Protocol_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::Protocol *
+RTCORBA::Protocol_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_)
+#define __TAO_UNBOUNDED_SEQUENCE_RTCORBA_PROTOCOLLIST_CI_
 
   // = Static operations.
-  ACE_INLINE RTCORBA::PriorityBand *
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (CORBA::ULong size)
+  ACE_INLINE RTCORBA::Protocol *
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    RTCORBA::PriorityBand *retval = 0;
-    ACE_NEW_RETURN (retval, RTCORBA::PriorityBand[size], 0);
+    RTCORBA::Protocol *retval = 0;
+    ACE_NEW_RETURN (retval, RTCORBA::Protocol[size], 0);
     return retval;
   }
-
-  ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (RTCORBA::PriorityBand *buffer)
+  
+  ACE_INLINE void RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (RTCORBA::Protocol *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (void) // Default constructor.
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (void) // Default constructor.
   {
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (maximum))
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum) // Constructor using a maximum length value.
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (maximum))
   {
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (CORBA::ULong maximum,
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (CORBA::ULong maximum,
     CORBA::ULong length,
-    RTCORBA::PriorityBand *data,
+    RTCORBA::Protocol *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-
+  
   ACE_INLINE
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs)
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
     if (rhs.buffer_ != 0)
     {
-      RTCORBA::PriorityBand *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->maximum_);
-      RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
-
+      RTCORBA::Protocol *tmp1 = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->maximum_);
+      RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-
+      
       this->buffer_ = tmp1;
     }
     else
@@ -3064,75 +2906,75 @@ RTCORBA::PriorityBand_var::ptr (void) const
       this->buffer_ = 0;
     }
   }
-
-  ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands &
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator= (const _TAO_Unbounded_Sequence_RTCORBA_PriorityBands &rhs)
+  
+  ACE_INLINE RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList &
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator= (const _TAO_Unbounded_Sequence_RTCORBA_ProtocolList &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-
+    
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-        _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
+        RTCORBA::Protocol *tmp = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
+        _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
       }
     }
     else
-      this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (rhs.maximum_);
-
+      this->buffer_ = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (rhs.maximum_);
+    
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-    RTCORBA::PriorityBand *tmp1 = ACE_reinterpret_cast (RTCORBA::PriorityBand *, this->buffer_);
-    RTCORBA::PriorityBand * const tmp2 = ACE_reinterpret_cast (RTCORBA::PriorityBand * ACE_CAST_CONST, rhs.buffer_);
-
+    
+    RTCORBA::Protocol *tmp1 = ACE_reinterpret_cast (RTCORBA::Protocol *, this->buffer_);
+    RTCORBA::Protocol * const tmp2 = ACE_reinterpret_cast (RTCORBA::Protocol * ACE_CAST_CONST, rhs.buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-
+    
     return *this;
   }
-
+  
   // = Accessors.
-  ACE_INLINE RTCORBA::PriorityBand &
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i)
+  ACE_INLINE RTCORBA::Protocol &
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    RTCORBA::PriorityBand* tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
+    RTCORBA::Protocol* tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
     return tmp[i];
   }
-
-  ACE_INLINE const RTCORBA::PriorityBand &
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::operator[] (CORBA::ULong i) const
+  
+  ACE_INLINE const RTCORBA::Protocol &
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    RTCORBA::PriorityBand * const tmp = ACE_reinterpret_cast (RTCORBA::PriorityBand* ACE_CAST_CONST, this->buffer_);
+    RTCORBA::Protocol * const tmp = ACE_reinterpret_cast (RTCORBA::Protocol* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-
+  
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  ACE_INLINE RTCORBA::PriorityBand *
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (CORBA::Boolean orphan)
+  
+  ACE_INLINE RTCORBA::Protocol *
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (CORBA::Boolean orphan)
   {
-    RTCORBA::PriorityBand *result = 0;
+    RTCORBA::Protocol *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
       if (this->buffer_ == 0)
       {
-        result = _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::allocbuf (this->length_);
+        result = _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::allocbuf (this->length_);
         this->buffer_ = result;
         this->release_ = 1;
       }
       else
       {
-        result = ACE_reinterpret_cast (RTCORBA::PriorityBand*, this->buffer_);
+        result = ACE_reinterpret_cast (RTCORBA::Protocol*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -3141,7 +2983,7 @@ RTCORBA::PriorityBand_var::ptr (void) const
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
+        result = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -3150,84 +2992,77 @@ RTCORBA::PriorityBand_var::ptr (void) const
     }
     return result;
   }
-
-  ACE_INLINE const RTCORBA::PriorityBand *
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::get_buffer (void) const
+  
+  ACE_INLINE const RTCORBA::Protocol *
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const RTCORBA::PriorityBand * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const RTCORBA::Protocol * ACE_CAST_CONST, this->buffer_);
   }
-
+  
   ACE_INLINE void
-  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_PriorityBands::replace (CORBA::ULong max,
+  RTCORBA::_TAO_Unbounded_Sequence_RTCORBA_ProtocolList::replace (CORBA::ULong max,
   CORBA::ULong length,
-  RTCORBA::PriorityBand *data,
+  RTCORBA::Protocol *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      RTCORBA::PriorityBand *tmp = ACE_reinterpret_cast(RTCORBA::PriorityBand*,this->buffer_);
-      _TAO_Unbounded_Sequence_RTCORBA_PriorityBands::freebuf (tmp);
+      RTCORBA::Protocol *tmp = ACE_reinterpret_cast(RTCORBA::Protocol*,this->buffer_);
+      _TAO_Unbounded_Sequence_RTCORBA_ProtocolList::freebuf (tmp);
     }
     this->buffer_ = data;
     this->release_ = release;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_RTCORBA_PRIORITYBANDS_CI_)
-#define _RTCORBA_PRIORITYBANDS_CI_
+#if !defined (_RTCORBA_PROTOCOLLIST_CI_)
+#define _RTCORBA_PROTOCOLLIST_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::PriorityBands_var
+// Inline operations for class RTCORBA::ProtocolList_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (void) // default constructor
+RTCORBA::ProtocolList_var::ProtocolList_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (PriorityBands *p)
+RTCORBA::ProtocolList_var::ProtocolList_var (ProtocolList *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands_var &p) // copy constructor
+RTCORBA::ProtocolList_var::ProtocolList_var (const ::RTCORBA::ProtocolList_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (*p.ptr_));
+    ACE_NEW (this->ptr_, ::RTCORBA::ProtocolList (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
-// fixed-size base types only
-ACE_INLINE
-RTCORBA::PriorityBands_var::PriorityBands_var (const ::RTCORBA::PriorityBands &p)
-{
-  ACE_NEW (this->ptr_, ::RTCORBA::PriorityBands (p));
-}
-
 ACE_INLINE
-RTCORBA::PriorityBands_var::~PriorityBands_var (void) // destructor
+RTCORBA::ProtocolList_var::~ProtocolList_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBands_var &
-RTCORBA::PriorityBands_var::operator= (PriorityBands *p)
+ACE_INLINE RTCORBA::ProtocolList_var &
+RTCORBA::ProtocolList_var::operator= (ProtocolList *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands_var &
-RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p)
+ACE_INLINE ::RTCORBA::ProtocolList_var &
+RTCORBA::ProtocolList_var::operator= (const ::RTCORBA::ProtocolList_var &p)
 {
   if (this != &p)
     {
@@ -3238,124 +3073,119 @@ RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands_var &p)
         }
       else
         {
-          PriorityBands *deep_copy =
-            new PriorityBands (*p.ptr_);
-
+          ProtocolList *deep_copy =
+            new ProtocolList (*p.ptr_);
+          
           if (deep_copy != 0)
             {
-              PriorityBands *tmp = deep_copy;
+              ProtocolList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
             }
         }
     }
-
+  
   return *this;
 }
 
-// fixed-size types only
-ACE_INLINE ::RTCORBA::PriorityBands_var &
-RTCORBA::PriorityBands_var::operator= (const ::RTCORBA::PriorityBands &p)
+ACE_INLINE const ::RTCORBA::ProtocolList *
+RTCORBA::ProtocolList_var::operator-> (void) const
 {
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::RTCORBA::PriorityBands (p), *this);
-  }
-  return *this;
+  return this->ptr_;
 }
 
-ACE_INLINE const ::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::operator-> (void) const
+ACE_INLINE ::RTCORBA::ProtocolList *
+RTCORBA::ProtocolList_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::operator-> (void)
+ACE_INLINE 
+RTCORBA::ProtocolList_var::operator const ::RTCORBA::ProtocolList &() const // cast
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::PriorityBands_var::operator const ::RTCORBA::PriorityBands &() const // cast
+ACE_INLINE 
+RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() // cast
+ACE_INLINE 
+RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList &() const // cast 
 {
   return *this->ptr_;
 }
 
+// variable-size types only
 ACE_INLINE
-RTCORBA::PriorityBands_var::operator ::RTCORBA::PriorityBands &() const // cast
+RTCORBA::ProtocolList_var::operator ::RTCORBA::ProtocolList *&() // cast 
 {
-  return *this->ptr_;
+  return this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBand &
-RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index)
+ACE_INLINE RTCORBA::Protocol &
+RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const RTCORBA::PriorityBand &
-RTCORBA::PriorityBands_var::operator[] (CORBA::ULong index) const
+ACE_INLINE const RTCORBA::Protocol &
+RTCORBA::ProtocolList_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const RTCORBA::PriorityBand &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const RTCORBA::Protocol &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::RTCORBA::PriorityBands &
-RTCORBA::PriorityBands_var::in (void) const
+ACE_INLINE const ::RTCORBA::ProtocolList &
+RTCORBA::ProtocolList_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands &
-RTCORBA::PriorityBands_var::inout (void)
+ACE_INLINE ::RTCORBA::ProtocolList &
+RTCORBA::ProtocolList_var::inout (void)
 {
   return *this->ptr_;
 }
 
-// mapping for variable size
-ACE_INLINE ::RTCORBA::PriorityBands *&
-RTCORBA::PriorityBands_var::out (void)
+// mapping for variable size 
+ACE_INLINE ::RTCORBA::ProtocolList *&
+RTCORBA::ProtocolList_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::_retn (void)
+ACE_INLINE ::RTCORBA::ProtocolList *
+RTCORBA::ProtocolList_var::_retn (void)
 {
-  ::RTCORBA::PriorityBands *tmp = this->ptr_;
+  ::RTCORBA::ProtocolList *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_var::ptr (void) const
+ACE_INLINE ::RTCORBA::ProtocolList *
+RTCORBA::ProtocolList_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class RTCORBA::PriorityBands_out
+// Inline operations for class RTCORBA::ProtocolList_out
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands *&p)
+RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands_var &p) // constructor from _var
+RTCORBA::ProtocolList_out::ProtocolList_out (ProtocolList_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -3363,44 +3193,44 @@ RTCORBA::PriorityBands_out::PriorityBands_out (PriorityBands_var &p) // construc
 }
 
 ACE_INLINE
-RTCORBA::PriorityBands_out::PriorityBands_out (const ::RTCORBA::PriorityBands_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PriorityBands_out&, p).ptr_)
+RTCORBA::ProtocolList_out::ProtocolList_out (const ::RTCORBA::ProtocolList_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ProtocolList_out&, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::PriorityBands_out &
-RTCORBA::PriorityBands_out::operator= (const ::RTCORBA::PriorityBands_out &p)
+ACE_INLINE ::RTCORBA::ProtocolList_out &
+RTCORBA::ProtocolList_out::operator= (const ::RTCORBA::ProtocolList_out &p)
 {
-  this->ptr_ = ACE_const_cast (PriorityBands_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (ProtocolList_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands_out &
-RTCORBA::PriorityBands_out::operator= (PriorityBands *p)
+ACE_INLINE ::RTCORBA::ProtocolList_out &
+RTCORBA::ProtocolList_out::operator= (ProtocolList *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::PriorityBands_out::operator ::RTCORBA::PriorityBands *&() // cast
+ACE_INLINE 
+RTCORBA::ProtocolList_out::operator ::RTCORBA::ProtocolList *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *&
-RTCORBA::PriorityBands_out::ptr (void) // ptr
+ACE_INLINE ::RTCORBA::ProtocolList *&
+RTCORBA::ProtocolList_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBands *
-RTCORBA::PriorityBands_out::operator-> (void)
+ACE_INLINE ::RTCORBA::ProtocolList *
+RTCORBA::ProtocolList_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE RTCORBA::PriorityBand &
-RTCORBA::PriorityBands_out::operator[] (CORBA::ULong index)
+ACE_INLINE RTCORBA::Protocol &
+RTCORBA::ProtocolList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -3409,99 +3239,269 @@ RTCORBA::PriorityBands_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_var
+// Inline operations for class RTCORBA::ServerProtocolPolicy_var
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void) // default constructor
-  : ptr_ (PriorityBandedConnectionPolicy::_nil ())
+RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void) // default constructor
+  : ptr_ (ServerProtocolPolicy::_nil ())
 {}
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::ptr (void) const
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p) // copy constructor
+RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (const ::RTCORBA::ServerProtocolPolicy_var &p) // copy constructor
   : TAO_Base_var (),
-    ptr_ (PriorityBandedConnectionPolicy::_duplicate (p.ptr ()))
+    ptr_ (ServerProtocolPolicy::_duplicate (p.ptr ()))
 {}
 
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::~PriorityBandedConnectionPolicy_var (void) // destructor
+RTCORBA::ServerProtocolPolicy_var::~ServerProtocolPolicy_var (void) // destructor
 {
   CORBA::release (this->ptr_);
 }
 
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_var &
-RTCORBA::PriorityBandedConnectionPolicy_var::operator= (PriorityBandedConnectionPolicy_ptr p)
+ACE_INLINE RTCORBA::ServerProtocolPolicy_var &
+RTCORBA::ServerProtocolPolicy_var::operator= (ServerProtocolPolicy_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_var &
-RTCORBA::PriorityBandedConnectionPolicy_var::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
+ACE_INLINE RTCORBA::ServerProtocolPolicy_var &
+RTCORBA::ServerProtocolPolicy_var::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
 {
   if (this != &p)
   {
     CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
+    this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
   }
   return *this;
 }
 
+ACE_INLINE 
+RTCORBA::ServerProtocolPolicy_var::operator const ::RTCORBA::ServerProtocolPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE 
+RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
+RTCORBA::ServerProtocolPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
+RTCORBA::ServerProtocolPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::ServerProtocolPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+  return val;
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___OUT_CI_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY___OUT_CI_
+
+// *************************************************************
+// Inline operations for class RTCORBA::ServerProtocolPolicy_out
+// *************************************************************
+
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::operator const ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() const // cast
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+}
+
+ACE_INLINE
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+}
+
+ACE_INLINE
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (const ::RTCORBA::ServerProtocolPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServerProtocolPolicy_out &, p).ptr_)
+{}
+
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_out &
+RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServerProtocolPolicy_out&, p).ptr_;
+  return *this;
+}
+
+ACE_INLINE RTCORBA::ServerProtocolPolicy_out &
+RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
+{
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+ACE_INLINE RTCORBA::ServerProtocolPolicy_out &
+RTCORBA::ServerProtocolPolicy_out::operator= (ServerProtocolPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE 
+RTCORBA::ServerProtocolPolicy_out::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
+RTCORBA::ServerProtocolPolicy_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
+ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_
+
+// *************************************************************
+// Inline operations for class RTCORBA::ClientProtocolPolicy_var
+// *************************************************************
+
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
+RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void) // default constructor
+  : ptr_ (ClientProtocolPolicy::_nil ())
+{}
+
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::ptr (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::operator-> (void) const
+ACE_INLINE
+RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (const ::RTCORBA::ClientProtocolPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ClientProtocolPolicy::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+RTCORBA::ClientProtocolPolicy_var::~ClientProtocolPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+ACE_INLINE RTCORBA::ClientProtocolPolicy_var &
+RTCORBA::ClientProtocolPolicy_var::operator= (ClientProtocolPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE RTCORBA::ClientProtocolPolicy_var &
+RTCORBA::ClientProtocolPolicy_var::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+ACE_INLINE 
+RTCORBA::ClientProtocolPolicy_var::operator const ::RTCORBA::ClientProtocolPolicy_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::in (void) const
+ACE_INLINE 
+RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_var::inout (void)
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_var::out (void)
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
+RTCORBA::ClientProtocolPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
+RTCORBA::ClientProtocolPolicy_var::out (void)
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::_retn (void)
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::RTCORBA::PriorityBandedConnectionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+  ::RTCORBA::ClientProtocolPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
   return val;
 }
 
@@ -3509,68 +3509,68 @@ RTCORBA::PriorityBandedConnectionPolicy_var::_retn (void)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CI_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CI_
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CI_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CI_
 
 // *************************************************************
-// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_out
+// Inline operations for class RTCORBA::ClientProtocolPolicy_out
 // *************************************************************
 
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p)
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p)
   : ptr_ (p)
 {
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &p) // constructor from _var
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
 ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PriorityBandedConnectionPolicy_out &, p).ptr_)
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (const ::RTCORBA::ClientProtocolPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ClientProtocolPolicy_out &, p).ptr_)
 {}
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p)
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_out &
+RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_out &p)
 {
-  this->ptr_ = ACE_const_cast (PriorityBandedConnectionPolicy_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (ClientProtocolPolicy_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
+ACE_INLINE RTCORBA::ClientProtocolPolicy_out &
+RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
 {
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
   return *this;
 }
 
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (PriorityBandedConnectionPolicy_ptr p)
+ACE_INLINE RTCORBA::ClientProtocolPolicy_out &
+RTCORBA::ClientProtocolPolicy_out::operator= (ClientProtocolPolicy_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
+ACE_INLINE 
+RTCORBA::ClientProtocolPolicy_out::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_out::ptr (void) // ptr
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
+RTCORBA::ClientProtocolPolicy_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_out::operator-> (void)
+ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_out::operator-> (void)
 {
   return this->ptr_;
 }
@@ -3628,14 +3628,14 @@ RTCORBA::Current_var::operator= (const ::RTCORBA::Current_var &p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::Current_var::operator const ::RTCORBA::Current_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast
+ACE_INLINE 
+RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3727,7 +3727,7 @@ RTCORBA::Current_out::operator= (Current_ptr p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::Current_out::operator ::RTCORBA::Current_ptr &() // cast
 {
   return this->ptr_;
@@ -3798,14 +3798,14 @@ RTCORBA::Mutex_var::operator= (const ::RTCORBA::Mutex_var &p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::Mutex_var::operator const ::RTCORBA::Mutex_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast
+ACE_INLINE 
+RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -3897,7 +3897,7 @@ RTCORBA::Mutex_out::operator= (Mutex_ptr p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::Mutex_out::operator ::RTCORBA::Mutex_ptr &() // cast
 {
   return this->ptr_;
@@ -3976,14 +3976,14 @@ RTCORBA::RTORB_var::operator= (const ::RTCORBA::RTORB_var &p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::RTORB_var::operator const ::RTCORBA::RTORB_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast
+ACE_INLINE 
+RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast 
 {
   return this->ptr_;
 }
@@ -4075,7 +4075,7 @@ RTCORBA::RTORB_out::operator= (RTORB_ptr p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 RTCORBA::RTORB_out::operator ::RTCORBA::RTORB_ptr &() // cast
 {
   return this->ptr_;
@@ -4106,7 +4106,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::Thread
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::ThreadpoolLane &_tao_aggregate)
@@ -4119,7 +4119,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::ThreadpoolLan
     return 1;
   else
     return 0;
-
+  
 }
 
 
@@ -4147,12 +4147,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (RTCORBA::PriorityModel, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -4165,7 +4165,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::Priori
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityBand &_tao_aggregate)
@@ -4177,7 +4177,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityBand
     return 1;
   else
     return 0;
-
+  
 }
 
 
@@ -4194,3 +4194,4 @@ CORBA::Boolean TAO_Export operator>> (
   );
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_I_ */
+
diff --git a/TAO/tao/RTCORBAS.cpp b/TAO/tao/RTCORBAS.cpp
index e0b24ab3e59..04c33727596 100644
--- a/TAO/tao/RTCORBAS.cpp
+++ b/TAO/tao/RTCORBAS.cpp
@@ -19,9 +19,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_ORIG_RTCORBAS_CPP_
-#define _TAO_IDL_ORIG_RTCORBAS_CPP_
-
 #include "tao/orbconf.h"
 
 #if (TAO_HAS_RT_CORBA == 1)
@@ -42,7 +39,4 @@
 #include "RTCORBAS.i"
 #endif /* !defined INLINE */
 
-
-#endif /* ifndef */
-
-#endif /* (TAO_HAS_RT_CORBA == 1) */
+#endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/RTCORBAS.i b/TAO/tao/RTCORBAS.i
index 95f0b8ea192..f455a06b8f0 100644
--- a/TAO/tao/RTCORBAS.i
+++ b/TAO/tao/RTCORBAS.i
@@ -18,3 +18,4 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/RTCORBAS_T.i b/TAO/tao/RTCORBAS_T.i
index 95f0b8ea192..f455a06b8f0 100644
--- a/TAO/tao/RTCORBAS_T.i
+++ b/TAO/tao/RTCORBAS_T.i
@@ -18,3 +18,4 @@
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/RTPOA.pidl b/TAO/tao/RTPOA.pidl
index 9b9fd7ca969..359ec11bd26 100644
--- a/TAO/tao/RTPOA.pidl
+++ b/TAO/tao/RTPOA.pidl
@@ -11,9 +11,9 @@
 //
 // = DESCRIPTION
 //
-//   The RTPortableServer module specified in CORBA v2.4.2 Chapter
-//   24 (February, 2001).  This file is equivalent to OMG's
-//   RTPortableServer.idl.
+//   The RTPortableServer module specified in ptc/99-05-03 (Real-Time
+//   CORBA Joint Revised Submission May 28, 1999).  This file is
+//   equivalent to OMG's RTPortableServer.idl.
 //
 //   This file was used to generate the code in
 //   RTPOA{C,S,S_T}.{h,i,cpp} The command used to generate code
diff --git a/TAO/tao/RT_Current.cpp b/TAO/tao/RT_Current.cpp
index 2a5ddf67a28..e9b22f7a0b7 100644
--- a/TAO/tao/RT_Current.cpp
+++ b/TAO/tao/RT_Current.cpp
@@ -16,9 +16,7 @@
 #include "tao/RT_Current.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO,
-           RT_Current,
-           "$Id$")
+ACE_RCSID(tao, RT_Current, "$Id$")
 
 TAO_RT_Current::TAO_RT_Current (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core)
@@ -34,14 +32,11 @@ TAO_RT_Current::the_priority (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RTCORBA::Priority priority;
-  int result =
-    this->orb_core_->get_protocols_hooks ()->get_thread_priority (
-      this->orb_core_,
-      priority,
-      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  if (result == -1)
+  if (this->orb_core_->get_protocols_hooks ()->
+      get_thread_priority (this->orb_core_,
+                           priority,
+                           ACE_TRY_ENV) 
+      == -1)
     ACE_THROW_RETURN (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO), -1);
 
   return priority;
@@ -52,14 +47,11 @@ TAO_RT_Current::the_priority (RTCORBA::Priority the_priority,
                               CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  int result =
-    this->orb_core_->get_protocols_hooks ()->set_thread_priority (
-      this->orb_core_,
-      the_priority,
-      ACE_TRY_ENV);
-    ACE_CHECK;
-
-  if (result == -1)
+  if (this->orb_core_->get_protocols_hooks ()
+      ->set_thread_priority (this->orb_core_,
+                             the_priority,
+                             ACE_TRY_ENV) 
+      == -1)
     ACE_THROW (CORBA::DATA_CONVERSION (1, CORBA::COMPLETED_NO));
 }
 
diff --git a/TAO/tao/RT_Current.h b/TAO/tao/RT_Current.h
index 755f6f800ab..e8f149ac82d 100644
--- a/TAO/tao/RT_Current.h
+++ b/TAO/tao/RT_Current.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +18,7 @@
 
 #if (TAO_HAS_RT_CORBA == 1)
 
-#include "tao/RTCORBAC.h"
+#include "tao/RTCORBAS.h"
 #include "tao/LocalObject.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -33,22 +32,23 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-/**
- * @class TAO_RT_Current
- *
- * @brief RTCORBA::Current interface iplementation.
- *
- * Allows setting/getting the priority of the current thread.
- */
-class TAO_Export TAO_RT_Current
-  : public RTCORBA::Current,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_RT_Current :
+  public RTCORBA::Current,
+  public CORBA::LocalObject
 {
+  // = TITLE
+  //   RTCORBA::Current interface iplementation.
+  //
+  // = DESCRIPTION
+  //   Allows setting/getting the priority of the current thread.
+  //
 public:
-
   /// Default constructor.
   TAO_RT_Current (TAO_ORB_Core *orb_core);
 
+  /// The destructor.
+  virtual ~TAO_RT_Current (void);
+
   virtual RTCORBA::Priority the_priority (CORBA::Environment
                                           &ACE_TRY_ENV =
                                           TAO_default_environment ())
@@ -59,17 +59,10 @@ public:
                              TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_RT_Current (void);
-
 private:
 
   /// ORB Core that owns us.
   TAO_ORB_Core *orb_core_;
-
 };
 
 
diff --git a/TAO/tao/RT_Mutex.cpp b/TAO/tao/RT_Mutex.cpp
index 29433487e8c..2c21b5ad475 100644
--- a/TAO/tao/RT_Mutex.cpp
+++ b/TAO/tao/RT_Mutex.cpp
@@ -32,66 +32,44 @@ TAO_RT_Mutex::unlock (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Boolean
 TAO_RT_Mutex::try_lock (TimeBase::TimeT wait_time,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &/*ACE_TRY_ENV*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  int result;
-
   if (wait_time == 0)
-    {
-      // No wait.
-      result = this->mu_.tryacquire ();
-    }
+    // no wait
+    return this->mu_.tryacquire () != -1;
   else
     {
       // Wait for the specified amount of time before giving up.
       // (wait_time units are 100ns.  See TimeBase.pidl)
+
       TimeBase::TimeT seconds = wait_time / 10000000u;
       TimeBase::TimeT microseconds = (wait_time % 10000000u) / 10;
 
       ACE_Time_Value relative_time (ACE_U64_TO_U32 (seconds),
                                     ACE_U64_TO_U32 (microseconds));
 
-      ACE_Time_Value absolute_time =
-        relative_time +
-        ACE_OS::gettimeofday ();
-
-      result = this->mu_.acquire (absolute_time);
-    }
+      ACE_Time_Value absolute_time = relative_time + ACE_OS::gettimeofday ();
 
-  // Check result.
-  if (result == 0 )
-    return 1;
-  else
-  if (result == -1
-      && (errno == EBUSY || errno == ETIMEDOUT))
-    return 0;
-  else
-    {
-      // Some really bad error.
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+      return this->mu_.acquire (absolute_time) != -1;
     }
 }
 
-const char *
-TAO_RT_Mutex::name (void) const
+TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name,
+                                        TAO_Named_RT_Mutex_Manager &mutex_mgr)
+  : name_ (CORBA::string_dup (name)),
+    mutex_mgr_ (mutex_mgr)
 {
-  return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-TAO_Named_RT_Mutex::TAO_Named_RT_Mutex (const char *name)
-  : name_ (name)
+TAO_Named_RT_Mutex::~TAO_Named_RT_Mutex (void)
 {
-}
+  // Since the last reference to this mutex is being destroyed,
+  // unregister ourself from the mutex manager
+  this->mutex_mgr_.unregister_mutex (name_);
 
-const char *
-TAO_Named_RT_Mutex::name (void) const
-{
-  return this->name_.c_str ();
+  CORBA::string_free (name_);
 }
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
 
diff --git a/TAO/tao/RT_Mutex.h b/TAO/tao/RT_Mutex.h
index 5c462b6c9c9..ecdc95aa905 100644
--- a/TAO/tao/RT_Mutex.h
+++ b/TAO/tao/RT_Mutex.h
@@ -22,7 +22,7 @@
 
 #if (TAO_HAS_RT_CORBA == 1)
 
-#include "tao/RTCORBAC.h"
+#include "tao/RTCORBAS.h"
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
@@ -43,9 +43,7 @@
  *
  */
 
-class TAO_Export TAO_RT_Mutex
-  : public RTCORBA::Mutex,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_RT_Mutex : public RTCORBA::Mutex, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
@@ -64,26 +62,23 @@ public:
                        TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /**
-   * Acquire the lock, but only wait up to <max_wait> time.  Note
-   * that this operation may not be available on all OS platforms, so
-   * if you're interested in writing maximally portable programs avoid
-   * using this operation in your program designs.
-   */
+  /// Acquire the lock, but only wait up to <max_wait> time.  Note
+  //that this operation may not be available on all OS platforms, so
+  //if you're interested in writing maximally portable programs avoid
+  //using this operation in your program designs.
   virtual CORBA::Boolean try_lock (TimeBase::TimeT max_wait,
                                    CORBA::Environment &ACE_TRY_ENV =
                                    TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /// Returns the name of the mutex.
-  virtual const char *name (void) const;
-
 protected:
   /// Synchronization lock.
   TAO_SYNCH_MUTEX mu_;
 };
 
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
+// Forward reference for the TAO_Named_RT_Mutex class
+class TAO_Named_RT_Mutex_Manager;
+
 /**
  * @class TAO_Named_RT_Mutex
  *
@@ -95,17 +90,20 @@ class TAO_Export TAO_Named_RT_Mutex : public TAO_RT_Mutex
 {
 public:
   /// Constructor.
-  TAO_Named_RT_Mutex (const char *name);
+  TAO_Named_RT_Mutex (const char *name,
+                      TAO_Named_RT_Mutex_Manager &mutex_mgr);
 
-  /// Returns the name of the mutex.
-  virtual const char *name (void) const;
+  /// Destructor.
+  virtual ~TAO_Named_RT_Mutex (void);
 
 protected:
+  // Don't allow unnamed named mutexes
+  TAO_Named_RT_Mutex (void);
+
+  char *name_;
 
-  /// My name.
-  ACE_CString name_;
+  TAO_Named_RT_Mutex_Manager &mutex_mgr_;
 };
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 #pragma warning(pop)
diff --git a/TAO/tao/RT_ORB.cpp b/TAO/tao/RT_ORB.cpp
index 563cb9ede97..e580d632773 100644
--- a/TAO/tao/RT_ORB.cpp
+++ b/TAO/tao/RT_ORB.cpp
@@ -24,16 +24,23 @@ RTCORBA::Mutex_ptr
 TAO_RT_ORB::create_mutex (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->mutex_mgr_.create_mutex (ACE_TRY_ENV);
+  TAO_RT_Mutex *mutex;
+
+  ACE_NEW_THROW_EX (mutex,
+                    TAO_RT_Mutex (),
+                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                      CORBA::COMPLETED_NO));
+
+  return mutex;
 }
 
 void
-TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr mutex,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::destroy_mutex (RTCORBA::Mutex_ptr,
+                           CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->mutex_mgr_.destroy_mutex (mutex,
-                                  ACE_TRY_ENV);
+  // Don't need to do anything.  The destructor on the mutex
+  // will automatically reclaim resources.
 }
 
 
@@ -43,197 +50,52 @@ TAO_RT_ORB::create_named_mutex (const char *name,
                                 CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->mutex_mgr_.create_named_mutex (name,
-                                              created_flag,
-                                              ACE_TRY_ENV);
-}
-
-RTCORBA::Mutex_ptr
-TAO_RT_ORB::open_named_mutex (const char *name,
-                              CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   RTCORBA::RTORB::MutexNotFound))
-{
-  return this->mutex_mgr_.open_named_mutex (name,
-                                            ACE_TRY_ENV);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Named_RT_Mutex_Manager::TAO_Named_RT_Mutex_Manager (void)
-{
-}
-
-TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
-{
-}
-
-RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_mutex (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_RT_Mutex *mutex = 0;
-  ACE_NEW_THROW_EX (mutex,
-                    TAO_RT_Mutex (),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
+  TAO_RT_Mutex *mutex;
 
-  return mutex;
-}
-
-void
-TAO_Named_RT_Mutex_Manager::destroy_mutex (RTCORBA::Mutex_ptr mutex,
-                                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // If Named RT_Mutexes aren't enabled, this function is a nop
-  // as indicated by the comment below.
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-
-  TAO_RT_Mutex *tao_mutex =
-    ACE_dynamic_cast (TAO_RT_Mutex *,
-                      mutex);
-
-  // If this mutex is named, then we need to remove it from our table.
-  // Otherwise, we don't have to do anything.
-  const char *name = tao_mutex->name ();
-  if (name != 0)
+  mutex = mutex_mgr_.find_mutex (name);
+  if (mutex != 0)
     {
-      // The following should be atomic.
-      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                          monitor,
-                          this->lock_,
-                          CORBA::INTERNAL ());
-      ACE_CHECK;
-
-      int result =
-        this->map_.unbind (name);
-
-      if (result != 0)
-        ACE_THROW (CORBA::INTERNAL ());
-    }
-#else /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-  ACE_UNUSED_ARG (mutex);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
-}
+      created_flag = 0;
 
-RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
-                                                CORBA::Boolean_out created_flag,
-                                                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-  // The following should be atomic.
-  ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                      monitor,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
-
-  // Optimistic that we'll find it.
-  created_flag = 0;
-
-  // If we find the mutex, simply return it.
-  RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
+      // Increment the reference count to pass ownership to the
+      // caller.
+      mutex->_add_ref ();
+    }
+  else
     {
-      // Oops, we didn't find it.
+      ACE_NEW_THROW_EX (mutex,
+                        TAO_Named_RT_Mutex (name, mutex_mgr_),
+                        CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                          CORBA::COMPLETED_NO));
+
+      // registration should always succeed
+      if (mutex_mgr_.register_mutex (name, mutex) != 0)
+        {
+          delete mutex;
+          ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+        }
       created_flag = 1;
-
-      RTCORBA::Mutex_ptr tmp_mutex;
-
-      // Create a new one.
-      ACE_NEW_THROW_EX (tmp_mutex,
-                        TAO_Named_RT_Mutex (name),
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
-
-      mutex = tmp_mutex;
-
-      // Add it to the map.
-      int result =
-        this->map_.bind (name,
-                         mutex);
-
-      if (result != 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
-                          RTCORBA::Mutex::_nil ());
     }
 
-  // Return the one we found or created.
-  return mutex._retn ();
-#else /* TAO_HAS_NAMED_RT_MUTEXES */
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (created_flag);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    RTCORBA::Mutex::_nil ());
-#endif /* TAO_HAS_NAMED_RT_MUTEXES */
+  return mutex;
 }
 
 RTCORBA::Mutex_ptr
-TAO_Named_RT_Mutex_Manager::open_named_mutex (const char *name,
-                                              CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB::open_named_mutex (const char *name,
+                              CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    RTCORBA::RTORB::MutexNotFound))
 {
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-  // The following should be atomic.
-  ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                      monitor,
-                      this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
-
-  // If we find the mutex, simply return it.
-  RTCORBA::Mutex_var mutex;
-  if (this->map_.find (name,
-                       mutex) != 0)
-    ACE_THROW_RETURN (RTCORBA::RTORB::MutexNotFound (),
-                      RTCORBA::Mutex::_nil ());
-
-  // Return the one we found.
-  return mutex._retn ();
-#else /* TAO_HAS_NAMED_RT_MUTEXES */
-  ACE_UNUSED_ARG (name);
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                    RTCORBA::Mutex::_nil ());
-#endif /* TAO_HAS_NAMED_RT_MUTEXES */
-}
-
-///////////////////////////////////////////////////////////////////////////////
+  TAO_RT_Mutex *mutex;
 
-RTCORBA::TCPProtocolProperties_ptr
-TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
-                                            CORBA::Long recv_buffer_size,
-                                            CORBA::Boolean keep_alive,
-                                            CORBA::Boolean dont_route,
-                                            CORBA::Boolean no_delay,
-                                            CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException ))
-{
-  TAO_TCP_Properties *tmp;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_TCP_Properties (send_buffer_size,
-                                        recv_buffer_size,
-                                        keep_alive,
-                                        dont_route,
-                                        no_delay),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (RTCORBA::TCPProtocolProperties::_nil ());
+  mutex = mutex_mgr_.find_mutex (name);
+  if (mutex == 0)
+    ACE_THROW_RETURN (RTCORBA::RTORB::MutexNotFound (), 0);
+  else
+    // Increment the reference count to pass ownership to the caller.
+    mutex->_add_ref ();
 
-  return tmp;
+  return mutex;
 }
 
 RTCORBA::ThreadpoolId
@@ -365,27 +227,64 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco
   return tmp;
 }
 
+
+TAO_Named_RT_Mutex_Manager::TAO_Named_RT_Mutex_Manager (void)
+{
+}
+
+
+TAO_Named_RT_Mutex_Manager::~TAO_Named_RT_Mutex_Manager (void)
+{
+}
+
+
+TAO_RT_Mutex *
+TAO_Named_RT_Mutex_Manager::find_mutex (const char *name)
+{
+  TAO_RT_Mutex *mutex;
+
+  if (mutex_map_.find (name, mutex) == 0)
+    return mutex;
+  else
+    return 0;
+}
+
+int
+TAO_Named_RT_Mutex_Manager::register_mutex (const char *name,
+                                            TAO_RT_Mutex *mutex)
+{
+  // Only return success if the bind is successful
+  // and there is not already something else bound to
+  // the specified name.
+  if (mutex_map_.bind (name, mutex) == 0)
+    return 0;
+  else
+    return -1;
+}
+
+void
+TAO_Named_RT_Mutex_Manager::unregister_mutex (const char *name)
+{
+  mutex_map_.unbind (name);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_CString, RTCORBA::Mutex_var>;
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
+template class ACE_Hash_Map_Manager_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Base_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Iterator_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+template class ACE_Hash_Map_Entry<char const *, TAO_RT_Mutex *>;
 
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, RTCORBA::Mutex_var, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, RTCORBA::Mutex_var>
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
+#pragma instantiate ACE_Hash_Map_Manager_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<char const *, TAO_RT_Mutex *, ACE_Hash<char const *>, ACE_Equal_To<char const *>, TAO_SYNCH_MUTEX>;
+#pragma instantiate ACE_Hash_Map_Entry<char const *, TAO_RT_Mutex *>;
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/RT_ORB.h b/TAO/tao/RT_ORB.h
index 69e30f3b126..ad9af35b67c 100644
--- a/TAO/tao/RT_ORB.h
+++ b/TAO/tao/RT_ORB.h
@@ -21,7 +21,7 @@
 
 #if (TAO_HAS_RT_CORBA == 1)
 
-#include "tao/RTCORBAC.h"
+#include "tao/RTCORBAS.h"
 #include "tao/LocalObject.h"
 #include "ace/Hash_Map_Manager_T.h"
 
@@ -38,7 +38,7 @@ class TAO_RT_Mutex;
 /**
  * @class TAO_Named_RT_Mutex_Manager
  *
- * @brief Manages the names of named and unnamed RT Mutexes
+ * @brief Manages the names of RT Mutexes
  *
  */
 
@@ -52,46 +52,26 @@ public:
   /// Destructor.
   ~TAO_Named_RT_Mutex_Manager (void);
 
-  RTCORBA::Mutex_ptr create_mutex (CORBA::Environment
-                                   &ACE_TRY_ENV =
-                                   TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  /// Look up a mutex based on its name.
+  TAO_RT_Mutex *find_mutex (const char *name);
 
-  void destroy_mutex (RTCORBA::Mutex_ptr the_mutex,
-                      CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  /// Register a mutex based on its name.
+  int register_mutex (const char *name,
+                      TAO_RT_Mutex *mutex);
 
-  RTCORBA::Mutex_ptr create_named_mutex (const char *name,
-                                         CORBA::Boolean_out created_flag,
-                                         CORBA::Environment
-                                         &ACE_TRY_ENV =
-                                         TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  /// Unregister a mutex based on its name
+  void unregister_mutex (const char *name);
 
-  RTCORBA::Mutex_ptr open_named_mutex (const char * name,
-                                       CORBA::Environment &ACE_TRY_ENV =
-                                       TAO_default_environment () )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     RTCORBA::RTORB::MutexNotFound
-                     ));
-
-private:
+protected:
 
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
   /// Hash map for named RT Mutexes
-  ACE_Hash_Map_Manager_Ex<
-    ACE_CString,
-    RTCORBA::Mutex_var,
-    ACE_Hash<ACE_CString>,
-    ACE_Equal_To<ACE_CString>,
-    ACE_Null_Mutex> map_;
-
-  TAO_SYNCH_MUTEX lock_;
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
+  ACE_Hash_Map_Manager_Ex<const char *,
+                          TAO_RT_Mutex *,
+                          ACE_Hash<const char *>,
+                          ACE_Equal_To<const char *>,
+                          TAO_SYNCH_MUTEX> mutex_map_;
 };
 
-
 /**
  * @class TAO_RT_ORB
  *
@@ -100,14 +80,16 @@ private:
  * Creates and destroys RT CORBA objects, i.e., policies,
  * threadpools, mutexes.
  */
-class TAO_Export TAO_RT_ORB
-  : public RTCORBA::RTORB,
-    public TAO_Local_RefCounted_Object
+
+class TAO_Export TAO_RT_ORB : public RTCORBA::RTORB, public CORBA::LocalObject
 {
 public:
   /// Constructor.
   TAO_RT_ORB (void);
 
+  /// Destructor.
+  virtual ~TAO_RT_ORB (void);
+
   /**
    * Create a new mutex.  Mutexes returned by this method
    * are the same as those used internally by the ORB, so that
@@ -142,28 +124,13 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Retrieve a previously created mutex.
-  virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name,
+   virtual RTCORBA::Mutex_ptr open_named_mutex (const char * name,
                                                 CORBA::Environment &ACE_TRY_ENV =
                                                 TAO_default_environment () )
      ACE_THROW_SPEC ((CORBA::SystemException,
                       RTCORBA::RTORB::MutexNotFound
                       ));
 
-  /**
-   * Create and return a TCPProtocolProperties instance with the specified
-   * parameters.
-   */
-  virtual RTCORBA::TCPProtocolProperties_ptr
-  create_tcp_protocol_properties (
-                                  CORBA::Long send_buffer_size,
-                                  CORBA::Long recv_buffer_size,
-                                  CORBA::Boolean keep_alive,
-                                  CORBA::Boolean dont_route,
-                                  CORBA::Boolean no_delay,
-                                  CORBA::Environment
-                                  &ACE_TRY_ENV = TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException ));
-
   /// Create a RTCORBA threadpool to manage a set of threads without lanes.
   virtual RTCORBA::ThreadpoolId
   create_threadpool (CORBA::ULong stacksize,
@@ -257,13 +224,9 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_RT_ORB (void);
 
   /// mutex_mgr_ manages the names associated with named mutexes.
   TAO_Named_RT_Mutex_Manager mutex_mgr_;
-
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/RT_ORBInitializer.cpp b/TAO/tao/RT_ORBInitializer.cpp
index e27cedbbe9b..3643c9ca571 100644
--- a/TAO/tao/RT_ORBInitializer.cpp
+++ b/TAO/tao/RT_ORBInitializer.cpp
@@ -4,67 +4,26 @@
 
 #include "tao/RT_ORBInitializer.h"
 
-ACE_RCSID (TAO,
-           RT_ORBInitializer,
-           "$Id$")
+ACE_RCSID (tao, RT_ORBInitializer, "$Id$")
 
 #if TAO_HAS_RT_CORBA == 1
 
-
+#include "tao/RT_PolicyFactory.h"
 #include "tao/RTCORBAC.h"
 #include "tao/RT_Policy_i.h"
 #include "tao/RT_Protocols_Hooks.h"
 #include "tao/Priority_Mapping_Manager.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
-#include "tao/RT_ORB_Loader.h"
-
-#include "ace/Service_Repository.h"
-#include "ace/Svc_Conf.h"
-
-static void
-add_static_service (const ACE_Static_Svc_Descriptor &desc)
-{
-  const ACE_Service_Type *service_type;
-  if (ACE_Service_Repository::instance ()->find (desc.name_,
-                                                 &service_type,
-                                                 0) >= 0)
-    {
-      // The service is already there, just return
-      return;
-    }
-                                    
-  ACE_Service_Object_Exterminator gobbler;
-  void *sym = (*desc.alloc_)(&gobbler);
-
-  ACE_Service_Type_Impl *service_type_impl =
-    ace_create_service_type (desc.name_,
-                             desc.type_,
-                             sym,
-                             desc.flags_,
-                             gobbler);
-
-  // @@ Raise exception
-  ACE_NEW (service_type,
-           ACE_Service_Type (desc.name_,
-                             service_type_impl,
-                             0,
-                             desc.active_));
-  // @@ Error checking
-  (void) ACE_Service_Repository::instance ()->insert (service_type);
-}
 
 void
 TAO_RT_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr info
+    PortableInterceptor::ORBInitInfo_ptr
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ENV_ARG_DEFN;
 
-  add_static_service (ace_svc_desc_TAO_RT_Protocols_Hooks);
-  add_static_service (ace_svc_desc_TAO_RT_ORB_Loader);
-
   // Sets the name of the Protocol_Hooks to be the RT_Protocols_Hooks.
   TAO_ORB_Core::set_protocols_hooks ("RT_Protocols_Hooks");
 
@@ -82,10 +41,7 @@ TAO_RT_ORBInitializer::pre_init (
 
   TAO_Priority_Mapping_Manager_var safe_manager = manager;
 
-  info->register_initial_reference ("PriorityMappingManager",
-                                    manager,
-                                    ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_ORB_Core::priority_mapping_manager (manager);
 
   // Sets the client_protocol policy.
   TAO_RT_Protocols_Hooks::set_client_protocols_hook
@@ -102,45 +58,56 @@ TAO_RT_ORBInitializer::post_init (
     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_ENV_ARG_DEFN;
-
-  this->register_policy_factories (info,
-                                   ACE_TRY_ENV);
+  this->register_policy_factories (info
+                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
 TAO_RT_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info,
-  CORBA::Environment &ACE_TRY_ENV)
+  PortableInterceptor::ORBInitInfo_ptr info
+  TAO_ENV_ARG_DECL)
 {
-  // Register the RTCORBA policy factories.
+  /// Register the RTCORBA policy factories.
+
+  PortableInterceptor::PolicyFactory_ptr temp_factory =
+    PortableInterceptor::PolicyFactory::_nil ();
+  PortableInterceptor::PolicyFactory_var policy_factory;
+
+  TAO_ENV_ARG_DEFN;
+
+  /// This policy factory is used for all RTCORBA related policies.
+  ACE_NEW_THROW_EX (temp_factory,
+                    TAO_RT_PolicyFactory,
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                         TAO_DEFAULT_MINOR_CODE,
+                         ENOMEM),
+                      CORBA::COMPLETED_NO));
+  ACE_CHECK;
 
-  // The RTCORBA policy factory is stateless and reentrant, so share a
-  // single instance between all ORBs.
-  PortableInterceptor::PolicyFactory_ptr policy_factory =
-    &(this->policy_factory_);
+  policy_factory = temp_factory;
 
-  // Bind the same policy factory to all RTCORBA related policy
-  // types since a single policy factory is used to create each of
-  // the different types of RTCORBA policies.
+  /// Bind the same policy factory to all RTCORBA related policy
+  /// types since a single policy factory is used to create each of
+  /// the different types of RTCORBA policies.
 
   CORBA::PolicyType type = RTCORBA::PRIORITY_MODEL_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   type = RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE;
   info->register_policy_factory (type,
-                                 policy_factory,
-                                 ACE_TRY_ENV);
+                                 policy_factory.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/RT_ORBInitializer.h b/TAO/tao/RT_ORBInitializer.h
index 2b5f696f3cf..4fed55d1ef5 100644
--- a/TAO/tao/RT_ORBInitializer.h
+++ b/TAO/tao/RT_ORBInitializer.h
@@ -2,11 +2,11 @@
 
 //=============================================================================
 /**
- *  @file RT_ORBInitializer.h
+ *  @file     RT_ORBInitializer.h
  *
  *  $Id$
  *
- *  @author Ossama Othman <ossama@uci.edu>
+ *  @author  Ossama Othman <ossama@uci.edu>
  */
 //=============================================================================
 
@@ -24,7 +24,6 @@
 
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
-#include "tao/RT_PolicyFactory.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -54,17 +53,11 @@ public:
 
 private:
 
-  /// Register RTCORBA policy factories.
+  ////< Register RTCORBA policy factories.
   void register_policy_factories (
-    PortableInterceptor::ORBInitInfo_ptr info,
-    CORBA::Environment &ACE_TRY_ENV);
-
-private:
-
-  /// Instance of the RTCORBA policy factory.
-  /// The RTCORBA policy factory is stateless and reentrant, so share
-  /// a single instance between all ORBs.
-  TAO_RT_PolicyFactory policy_factory_;
+           PortableInterceptor::ORBInitInfo_ptr info
+           TAO_ENV_ARG_DECL
+         );
 
 };
 
diff --git a/TAO/tao/RT_ORB_Loader.cpp b/TAO/tao/RT_ORB_Loader.cpp
index d13e028240f..b8e5f6df19d 100644
--- a/TAO/tao/RT_ORB_Loader.cpp
+++ b/TAO/tao/RT_ORB_Loader.cpp
@@ -5,8 +5,9 @@
 #include "RT_Current.h"
 
 #include "tao/ORB_Core.h"
+#include "tao/Priority_Mapping_Manager.h"
 
-ACE_RCSID (TAO, RT_ORB_Loader, "$Id$")
+ACE_RCSID(TAO, RT_ORB_Loader, "$Id: ")
 
 TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
 {
@@ -16,47 +17,28 @@ CORBA::Object_ptr
 TAO_RT_ORB_Loader::create_object (CORBA::ORB_ptr orb,
                                   int,
                                   char *[],
-                                  CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                                  CORBA::Environment &)
+  ACE_THROW_SPEC (())
 {
   /// Return RT_ORB
-  CORBA::Object_ptr rt_orb;
-  ACE_NEW_THROW_EX (rt_orb,
-                    TAO_RT_ORB,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  CORBA::Object_ptr obj;
+  ACE_NEW_RETURN (obj,
+                  TAO_RT_ORB,
+                  CORBA::Object::_nil ());
 
-  CORBA::Object_var safe_rt_orb = rt_orb;
+  /// Sets the RT_Current object and Priority_Mapping_Manager
+  /// in the ORB.
+  this->set_objects (orb->orb_core ());
 
-  /// Sets the RT_Current object in the ORB.
-  this->set_objects (orb->orb_core (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return safe_rt_orb._retn ();
+  return obj;
 }
 
 void
-TAO_RT_ORB_Loader::set_objects (TAO_ORB_Core *orb_core,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_ORB_Loader::set_objects (TAO_ORB_Core *orb_core)
 {
-  // Setup the RT_Current object in the ORB
-
-  CORBA::Object_ptr current;
-  ACE_NEW_THROW_EX (current,
-                    TAO_RT_Current (orb_core),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  CORBA::Object_var safe_current = current;
-  orb_core->rt_current (safe_current.in ());
+  /// Setup the RT_Current object in the ORB
+  CORBA::Object_var current = new TAO_RT_Current (orb_core);
+  orb_core->rt_current (current.in ());
 }
 
 ACE_FACTORY_DEFINE (TAO, TAO_RT_ORB_Loader)
@@ -64,6 +46,5 @@ ACE_STATIC_SVC_DEFINE (TAO_RT_ORB_Loader,
                        ACE_TEXT ("RT_ORB_Loader"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_RT_ORB_Loader),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
diff --git a/TAO/tao/RT_ORB_Loader.h b/TAO/tao/RT_ORB_Loader.h
index 11ddec36466..e3b9d2e3c74 100644
--- a/TAO/tao/RT_ORB_Loader.h
+++ b/TAO/tao/RT_ORB_Loader.h
@@ -37,14 +37,10 @@ public:
                                            int argc,
                                            char *argv [],
                                            CORBA::Environment &)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-protected:
-
-  /// Setup additional RTCORBA related objects.
-  void set_objects (TAO_ORB_Core *orb_core,
-                    CORBA::Environment &);
+    ACE_THROW_SPEC (());
 
+  /// Sets RT_Current and Priority_Mapping_Manager
+  void set_objects (TAO_ORB_Core *orb_core);
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_RT_ORB_Loader)
diff --git a/TAO/tao/RT_PolicyFactory.h b/TAO/tao/RT_PolicyFactory.h
index 8b8af81e7c3..18e0759618a 100644
--- a/TAO/tao/RT_PolicyFactory.h
+++ b/TAO/tao/RT_PolicyFactory.h
@@ -38,9 +38,9 @@
 #endif /* _MSC_VER */
 
 /// Policy factory for all RTCORBA related policies.
-class TAO_Export TAO_RT_PolicyFactory
-  : public PortableInterceptor::PolicyFactory,
-    public CORBA::LocalObject
+class TAO_Export TAO_RT_PolicyFactory :
+  public PortableInterceptor::PolicyFactory,
+  public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -49,7 +49,6 @@ public:
                                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
-
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tao/RT_Policy_i.h b/TAO/tao/RT_Policy_i.h
index 3743075b532..0b5131e9f6b 100644
--- a/TAO/tao/RT_Policy_i.h
+++ b/TAO/tao/RT_Policy_i.h
@@ -22,6 +22,7 @@
 
 #if (TAO_HAS_RT_CORBA == 1)
 
+#include "tao/RTCORBAS.h"
 #include "tao/RTCORBAC.h"
 #include "tao/LocalObject.h"
 
@@ -43,9 +44,7 @@
  * This policy controls how the priority at which a server handles
  * requests from clients is determined.
  */
-class TAO_Export TAO_PriorityModelPolicy
-  : public RTCORBA::PriorityModelPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_PriorityModelPolicy :  public RTCORBA::PriorityModelPolicy, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
@@ -55,6 +54,9 @@ public:
   /// Copy constructor.
   TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy &rhs);
 
+  /// Destructor.
+  virtual ~TAO_PriorityModelPolicy (void);
+
   /**
    * Accessor for the <priority_model_> attribute.  This method is
    * used internally by the orb.  This is a more efficient
@@ -94,10 +96,6 @@ public:
 
 protected:
 
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_PriorityModelPolicy (void);
-
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
@@ -119,9 +117,7 @@ private:
  *
  * This policy controls which threadpool is associated with a POA.
  */
-class TAO_Export TAO_ThreadpoolPolicy
-  : public RTCORBA::ThreadpoolPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_ThreadpoolPolicy : public RTCORBA::ThreadpoolPolicy, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
@@ -130,6 +126,9 @@ public:
   /// Copy constructor.
   TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs);
 
+  /// Destructor.
+  virtual ~TAO_ThreadpoolPolicy (void);
+
   virtual RTCORBA::ThreadpoolId threadpool (CORBA::Environment
                                             &ACE_TRY_ENV =
                                             TAO_default_environment ())
@@ -148,12 +147,6 @@ public:
                         TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_ThreadpoolPolicy (void);
-
 private:
 
   /// Attribute.
@@ -171,9 +164,7 @@ private:
  * Object is private, i.e., not available for carrying out invocations on
  * other objects.
  */
-class TAO_Export TAO_PrivateConnectionPolicy
-  : public RTCORBA::PrivateConnectionPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_PrivateConnectionPolicy : public RTCORBA::PrivateConnectionPolicy, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
@@ -182,6 +173,9 @@ public:
   /// Copy constructor.
   TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &rhs);
 
+  /// Destructor.
+  virtual ~TAO_PrivateConnectionPolicy (void);
+
   virtual CORBA::PolicyType policy_type (CORBA::Environment
                                          &ACE_TRY_ENV =
                                          TAO_default_environment ())
@@ -194,13 +188,6 @@ public:
   virtual void destroy (CORBA::Environment &ACE_TRY_ENV =
                         TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_PrivateConnectionPolicy (void);
-
 };
 
 //*************************************************************************
@@ -216,9 +203,7 @@ protected:
  * This policy allows the specification of the number of such
  * bands and their priorities.
  */
-class TAO_Export TAO_PriorityBandedConnectionPolicy
-  : public RTCORBA::PriorityBandedConnectionPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_PriorityBandedConnectionPolicy : public RTCORBA::PriorityBandedConnectionPolicy, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
@@ -228,6 +213,9 @@ public:
   TAO_PriorityBandedConnectionPolicy (const
                                       TAO_PriorityBandedConnectionPolicy &rhs);
 
+  /// Destructor.
+  virtual ~TAO_PriorityBandedConnectionPolicy (void);
+
   /**
    * Accessor to the underlying priority bands of the policy (does not
    * make a copy like the idl accessor <priority_bands> implementation
@@ -261,10 +249,6 @@ public:
 
 protected:
 
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_PriorityBandedConnectionPolicy (void);
-
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
@@ -286,9 +270,7 @@ private:
  * This policy controls selection and configuration of
  * communication protocols on the server-side of the RT ORB.
  */
-class TAO_Export TAO_ServerProtocolPolicy
-  : public RTCORBA::ServerProtocolPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_ServerProtocolPolicy : public RTCORBA::ServerProtocolPolicy, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
@@ -297,6 +279,9 @@ public:
   /// Copy constructor.
   TAO_ServerProtocolPolicy (const TAO_ServerProtocolPolicy &rhs);
 
+  /// Destructor.
+  virtual ~TAO_ServerProtocolPolicy (void);
+
   /**
    * Accessor to the underlying protocols list of the policy (does not
    * make a copy like the idl accessor <protocols> implementation
@@ -327,13 +312,6 @@ public:
                    int &recv_buffer_size,
                    int &no_delay,
                    const char *protocol_type);
-
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_ServerProtocolPolicy (void);
-
 private:
 
   /// Attribute.
@@ -350,9 +328,7 @@ private:
  * This policy controls selection and configuration of
  * communication protocols on the client-side of the RT ORB.
  */
-class TAO_Export TAO_ClientProtocolPolicy
-  : public RTCORBA::ClientProtocolPolicy,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_ClientProtocolPolicy : public RTCORBA::ClientProtocolPolicy, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
@@ -361,6 +337,9 @@ public:
   /// Copy constructor.
   TAO_ClientProtocolPolicy (const TAO_ClientProtocolPolicy &rhs);
 
+  /// Destructor.
+  virtual ~TAO_ClientProtocolPolicy (void);
+
   /**
    * Accessor to the underlying protocols list of the policy (does not
    * make a copy like the idl accessor <protocols> implementation
@@ -402,10 +381,6 @@ public:
 
 protected:
 
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_ClientProtocolPolicy (void);
-
   /// This constructor is used by TAO_RT_PolicyFactory when decoding
   /// policies from tagged components in an IOR.
   friend class TAO_RT_PolicyFactory;
@@ -419,9 +394,8 @@ private:
 
 //*************************************************************************
 
-class TAO_Export TAO_TCP_Properties
-  : public RTCORBA::TCPProtocolProperties,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_TCP_Properties : public RTCORBA::TCPProtocolProperties, public TAO_Local_RefCounted_Object
+
 {
   // = TITLE
   //   RTCORBA::TCPProtocolProperties implementation
@@ -439,6 +413,9 @@ public:
                       CORBA::Boolean dont_route = 0,
                       CORBA::Boolean no_delay = 1);
 
+  /// Destructor.
+  virtual ~TAO_TCP_Properties (void);
+
   virtual CORBA::Long send_buffer_size (CORBA::Environment
                                         &ACE_TRY_ENV =
                                         TAO_default_environment ())
@@ -493,12 +470,6 @@ public:
   /// This method reads the object state from a CDR representation.
   virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_TCP_Properties (void);
-
 private:
   // = Attributes.
 
@@ -519,18 +490,19 @@ private:
  * Stores Unix Domain Sockets (Local IPC) Protocol configuration
  * properties.
  */
-class TAO_Export TAO_Unix_Domain_Properties
-  : public RTCORBA::UnixDomainProtocolProperties,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_Unix_Domain_Properties : public RTCORBA::UnixDomainProtocolProperties, public TAO_Local_RefCounted_Object
 {
 public:
-
-  /// Constructor
   TAO_Unix_Domain_Properties (CORBA::Long send_buffer_size =
                               ACE_DEFAULT_MAX_SOCKET_BUFSIZ,
                               CORBA::Long recv_buffer_size =
                               ACE_DEFAULT_MAX_SOCKET_BUFSIZ);
 
+  // Constructor.
+
+  /// Destructor.
+  virtual ~TAO_Unix_Domain_Properties (void);
+
   virtual CORBA::Long send_buffer_size (CORBA::Environment
                                         &ACE_TRY_ENV =
                                         TAO_default_environment ())
@@ -570,12 +542,6 @@ public:
    */
   virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_Unix_Domain_Properties (void);
-
 private:
 
   // = Attributes.
@@ -593,14 +559,15 @@ private:
  * Stores Shared Memory Protocol configuration
  * properties.
  */
-class TAO_Export TAO_SMEM_Properties
-  : public RTCORBA::SharedMemoryProtocolProperties,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_SMEM_Properties : public RTCORBA::SharedMemoryProtocolProperties, public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor.
   TAO_SMEM_Properties (void);
 
+  /// Destructor.
+  virtual ~TAO_SMEM_Properties (void);
+
   // = IDL interface methods.
 
   virtual CORBA::Long preallocate_buffer_size (CORBA::Environment
@@ -651,12 +618,6 @@ public:
    */
   virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
-protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_SMEM_Properties (void);
-
 private:
 
   // = Attributes.
@@ -667,11 +628,10 @@ private:
 
 //*************************************************************************
 
-class TAO_Export TAO_GIOP_Properties
-  : public RTCORBA::GIOPProtocolProperties,
-    public TAO_Local_RefCounted_Object
+class TAO_Export TAO_GIOP_Properties : public RTCORBA::GIOPProtocolProperties, public TAO_Local_RefCounted_Object
 {
 public:
+  virtual ~TAO_GIOP_Properties ();
 
   // = CDR encoding methods
 
@@ -680,11 +640,6 @@ public:
   virtual CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
 
 protected:
-
-  /// Protected destructor to enforce proper memory management of this
-  /// reference counted object.
-  virtual ~TAO_GIOP_Properties ();
-
   friend class TAO_Protocol_Properties_Factory;
   TAO_GIOP_Properties (void);
 };
diff --git a/TAO/tao/RT_Protocols_Hooks.cpp b/TAO/tao/RT_Protocols_Hooks.cpp
index 6786b527142..19821f50214 100644
--- a/TAO/tao/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RT_Protocols_Hooks.cpp
@@ -10,7 +10,7 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (TAO,
+ACE_RCSID (tao,
            RT_Protocols_Hooks,
            "$Id$")
 
@@ -254,10 +254,9 @@ TAO_RT_Protocols_Hooks::get_selector_bands_policy_hook (
 }
 
 CORBA::Policy *
-TAO_RT_Protocols_Hooks::effective_priority_banded_connection_hook (
-  CORBA::Policy *override,
-  CORBA::Policy *exposed,
-  CORBA::Environment &ACE_TRY_ENV)
+TAO_RT_Protocols_Hooks::effective_priority_banded_connection_hook (CORBA::Policy *override,
+                                                         CORBA::Policy *exposed,
+                                                         CORBA::Environment &ACE_TRY_ENV)
 {
   RTCORBA::PriorityBandedConnectionPolicy_var override_policy_ptr =
     RTCORBA::PriorityBandedConnectionPolicy::_narrow (override,
@@ -360,11 +359,11 @@ TAO_RT_Protocols_Hooks::get_thread_priority (TAO_ORB_Core *orb_core,
                   ACE_TEXT ("TAO (%P|%t) - ")
                   ACE_TEXT ("RT_Protocols_Hooks::get_thread_priority: ")
                   ACE_TEXT (" ACE_Thread::get_prio\n")));
-
       return -1;
     }
 
-  CORBA::Object_var obj = orb_core->priority_mapping_manager ();
+  CORBA::Object_var obj =
+    orb_core->priority_mapping_manager ();
 
   TAO_Priority_Mapping_Manager_var mapping_manager =
     TAO_Priority_Mapping_Manager::_narrow (obj.in (),
@@ -391,7 +390,8 @@ TAO_RT_Protocols_Hooks::set_thread_priority (TAO_ORB_Core *orb_core,
                                              CORBA::Short priority,
                                              CORBA::Environment &ACE_TRY_ENV)
 {
-  CORBA::Object_var obj = orb_core->priority_mapping_manager ();
+  CORBA::Object_var obj =
+    orb_core->priority_mapping_manager ();
 
   TAO_Priority_Mapping_Manager_var mapping_manager =
     TAO_Priority_Mapping_Manager::_narrow (obj.in (),
@@ -419,9 +419,11 @@ TAO_RT_Protocols_Hooks::set_priority_mapping (TAO_ORB_Core *orb_core,
                                               TAO_Resource_Factory *trf,
                                               CORBA::Environment &ACE_TRY_ENV)
 {
-  // Obtain a reference to the Priority Mapping Manager.
-  CORBA::Object_var obj = orb_core->priority_mapping_manager ();
-  
+  ///
+  CORBA::Object_var obj =
+    orb_core->priority_mapping_manager ();
+
+  /// Narrow it down correctly
   TAO_Priority_Mapping_Manager_var priority_mapping_manager =
     TAO_Priority_Mapping_Manager::_narrow (obj.in (),
                                            ACE_TRY_ENV);
@@ -429,8 +431,6 @@ TAO_RT_Protocols_Hooks::set_priority_mapping (TAO_ORB_Core *orb_core,
 
   if (!CORBA::is_nil (priority_mapping_manager.in ()))
     priority_mapping_manager->mapping (trf->get_priority_mapping ());
-  else
-    ACE_THROW (CORBA::INV_OBJREF ());
 }
 
 int
@@ -470,12 +470,8 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ORB_Core *orb_core)
   // Set ServerProtocolPolicy.
   TAO_ServerProtocolPolicy *server_protocol_policy = 0;
   ACE_NEW_RETURN (server_protocol_policy,
-                    TAO_ServerProtocolPolicy (protocols),
+                  TAO_ServerProtocolPolicy (protocols),
                   -1);
-
-  RTCORBA::ServerProtocolPolicy_var safe_server_protocol_policy =
-    server_protocol_policy;
-
   orb_core->get_default_policies ()->server_protocol (server_protocol_policy);
 
   // Set ClientProtocolPolicy.
@@ -487,10 +483,6 @@ TAO_RT_Protocols_Hooks::set_default_policies (TAO_ORB_Core *orb_core)
   ACE_NEW_RETURN (client_protocol_policy,
                   TAO_ClientProtocolPolicy (protocols),
                   -1);
-
-  RTCORBA::ClientProtocolPolicy_var safe_client_protocol_policy =
-    client_protocol_policy;
-
   orb_core->get_default_policies ()->client_protocol (client_protocol_policy);
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/Reactive_Flushing_Strategy.cpp b/TAO/tao/Reactive_Flushing_Strategy.cpp
new file mode 100644
index 00000000000..58df0474633
--- /dev/null
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Reactive_Flushing_Strategy.h"
+#include "Transport.h"
+#include "ORB_Core.h"
+#include "Queued_Message.h"
+
+ACE_RCSID(tao, Reactive_Flushing_Strategy, "$Id$")
+
+int
+TAO_Reactive_Flushing_Strategy::schedule_output (TAO_Transport *transport)
+{
+  ACE_Reactor *reactor =
+    transport->orb_core ()->reactor ();
+
+  return reactor->register_handler (transport->event_handler (),
+                                    ACE_Event_Handler::READ_MASK
+                                    | ACE_Event_Handler::WRITE_MASK);
+}
+
+int
+TAO_Reactive_Flushing_Strategy::cancel_output (TAO_Transport *transport)
+{
+  ACE_Reactor *reactor =
+    transport->orb_core ()->reactor ();
+
+  return reactor->register_handler (transport->event_handler (),
+                                    ACE_Event_Handler::READ_MASK);
+}
+
+int
+TAO_Reactive_Flushing_Strategy::flush_message (TAO_Transport *transport,
+                                               TAO_Queued_Message *msg)
+{
+  TAO_ORB_Core *orb_core = transport->orb_core ();
+
+  int result = 0;
+  // @@ Should we pass this down?  Can we?
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      while (!msg->done () && result > 0)
+        {
+          result = orb_core->run (0, 1, ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return result;
+}
diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h
new file mode 100644
index 00000000000..c1a33aaef5b
--- /dev/null
+++ b/TAO/tao/Reactive_Flushing_Strategy.h
@@ -0,0 +1,38 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Reactive_Flushing_Strategy.h
+ *
+ *  $Id$
+ *
+ *  @author Carlos O'Ryan <coryan@uci.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_REACTIVE_FLUSHING_STRATEGY_H
+#define TAO_REACTIVE_FLUSHING_STRATEGY_H
+#include "ace/pre.h"
+
+#include "Flushing_Strategy.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_Reactive_Flushing_Strategy
+ *
+ * @brief Implement a flushing strategy that uses the reactor.
+ */
+class TAO_Export TAO_Reactive_Flushing_Strategy : public TAO_Flushing_Strategy
+{
+public:
+  virtual int schedule_output (TAO_Transport *transport);
+  virtual int cancel_output (TAO_Transport *transport);
+  virtual int flush_message (TAO_Transport *transport,
+                             TAO_Queued_Message *msg);
+};
+
+#include "ace/post.h"
+#endif  /* TAO_REACTIVE_FLUSHING_STRATEGY_H */
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 523aaaea637..a3e66b87d53 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -32,6 +32,8 @@ class TAO_Connector_Registry;
 class TAO_Reactor_Registry;
 class TAO_Priority_Mapping;
 
+class TAO_Flushing_Strategy;
+
 // ****************************************************************
 
 class TAO_Export TAO_Protocol_Item
@@ -181,6 +183,10 @@ public:
   /// Creates the lock for the lock needed in the Cache Map
   virtual ACE_Lock *create_cached_connection_lock (void);
 
+  /// Creates the flushing strategy.  The new instance is owned by the
+  /// caller.
+  virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0;
+
 protected:
   /**
    * Loads the default protocols. This method is used so that the
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 7f6ba1d9432..5b1eea46615 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -118,17 +118,8 @@ operator= (const TAO_Unbounded_String_Sequence &rhs)
         }
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Unbounded_String_Sequence::allocbuf (rhs.maximum_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
@@ -352,17 +343,8 @@ operator= (const TAO_Unbounded_WString_Sequence &rhs)
         }
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_WString_Sequence::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Unbounded_WString_Sequence::allocbuf (rhs.maximum_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
@@ -606,17 +588,8 @@ TAO_Unbounded_Sequence<CORBA::Octet>::operator= (const TAO_Unbounded_Sequence<CO
         }
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Unbounded_Sequence<CORBA::Octet>::allocbuf (rhs.length_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 1c9e4dc6d0f..2667ed56d1d 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -55,17 +55,8 @@ TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> &rhs)
         }
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
@@ -179,17 +170,8 @@ operator= (const TAO_Bounded_Sequence<T, MAX> &rhs)
       // always of size MAX.
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Sequence<T, MAX>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
@@ -430,17 +412,8 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
         }
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (rhs.maximum_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
@@ -618,17 +591,8 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
       // MAX
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (rhs.maximum_);
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
@@ -791,17 +755,8 @@ operator= (const TAO_Unbounded_Pseudo_Sequence<T,T_var> &rhs)
         }
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Unbounded_Pseudo_Sequence<T,T_var>::allocbuf (rhs.maximum_);
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
@@ -959,17 +914,8 @@ TAO_Bounded_Pseudo_Sequence<T, T_var,MAX>::operator=
       // MAX
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Pseudo_Sequence<T,T_var,MAX>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Bounded_Pseudo_Sequence<T, T_var, MAX>::allocbuf (rhs.maximum_);
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
@@ -1121,15 +1067,8 @@ operator= (const TAO_Unbounded_Array_Sequence<T, T_var> &rhs)
     }
   else
     {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Unbounded_Array_Sequence<T,T_var>::allocbuf (rhs.maximum_);
-        }
+      this->buffer_ =
+        TAO_Unbounded_Array_Sequence<T, T_var>::allocbuf (rhs.maximum_);
     }
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
@@ -1264,15 +1203,8 @@ TAO_Bounded_Array_Sequence<T, T_var, MAX>::operator=
     }
   else
     {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_Array_Sequence<T,T_var,MAX>::allocbuf (rhs.maximum_);
-        }
+      this->buffer_ =
+        TAO_Bounded_Array_Sequence<T, T_var, MAX>::allocbuf (rhs.maximum_);
     }
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
@@ -1381,17 +1313,8 @@ TAO_Bounded_String_Sequence<MAX>::operator=
       // <MAX> size.
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_String_Sequence<MAX>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Bounded_String_Sequence<MAX>::allocbuf (rhs.maximum_);
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
@@ -1539,17 +1462,8 @@ TAO_Bounded_WString_Sequence<MAX>::operator=
       // <MAX> size.
     }
   else
-    {
-      if (rhs.maximum_ == 0)
-        {
-          this->buffer_ = 0;
-        }
-      else
-        {
-          this->buffer_ =
-            TAO_Bounded_WString_Sequence<MAX>::allocbuf (rhs.maximum_);
-        }
-    }
+    this->buffer_ =
+      TAO_Bounded_WString_Sequence<MAX>::allocbuf (rhs.maximum_);
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index 30835739421..f66cf45be02 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -235,15 +235,15 @@ TAO_Object_Manager<T,T_var>::operator-> (void) const
 }
 
 template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T_var () const
+TAO_Object_Manager<T,T_var>::operator const T* () const // cast
 {
-  return T::_duplicate (*this->ptr_);
+  return *this->ptr_;
 }
 
 template <class T, class T_var> ACE_INLINE
-TAO_Object_Manager<T,T_var>::operator const T* () const // cast
+TAO_Object_Manager<T,T_var>::operator const T_var () const
 {
-  return *this->ptr_;
+  return T::_duplicate (*this->ptr_);
 }
 
 template <class T, class T_var> ACE_INLINE
diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile
index 7325ff8a69f..fc7bb0764b0 100644
--- a/TAO/tao/Strategies/Makefile
+++ b/TAO/tao/Strategies/Makefile
@@ -217,17 +217,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -336,6 +329,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -357,6 +355,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -385,8 +385,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -545,17 +560,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -664,6 +672,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -685,6 +698,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -713,8 +728,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -841,25 +871,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -867,14 +882,27 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
  $(TAO_ROOT)/tao/GIOP_Message_State.i \
@@ -884,6 +912,50 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Object_KeyC.i \
  UIOP_Connection_Handler.h UIOP_Transport.h \
  $(TAO_ROOT)/tao/Transport.h \
+ $(TAO_ROOT)/tao/Transport.inl \
+ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
+ $(ACE_ROOT)/ace/UNIX_Addr.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.i \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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 \
@@ -892,10 +964,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -910,18 +978,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -943,34 +999,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(TAO_ROOT)/tao/Transport.inl \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.h \
@@ -1024,6 +1052,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -1052,8 +1082,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -1162,6 +1207,51 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Transport.inl \
+ strategies_export.h \
+ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
+ $(ACE_ROOT)/ace/UNIX_Addr.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.i \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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 \
@@ -1170,10 +1260,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1188,18 +1274,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1221,35 +1295,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(TAO_ROOT)/tao/Transport.inl \
- strategies_export.h \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.h \
@@ -1278,21 +1323,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1300,14 +1334,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
  $(TAO_ROOT)/tao/GIOP_Message_State.i \
@@ -1321,6 +1364,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sync_Strategies.h \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -1386,6 +1431,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -1528,17 +1588,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(ACE_ROOT)/ace/Connector.h \
@@ -1678,6 +1731,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -1711,6 +1769,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -1736,8 +1796,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -1861,17 +1936,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(ACE_ROOT)/ace/Acceptor.h \
@@ -1999,6 +2067,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -2021,6 +2094,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -2049,8 +2124,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -2179,6 +2269,51 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Transport.inl \
+ strategies_export.h \
+ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
+ $(ACE_ROOT)/ace/UNIX_Addr.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.i \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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 \
@@ -2187,10 +2322,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -2205,18 +2336,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -2238,35 +2357,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(TAO_ROOT)/tao/Transport.inl \
- strategies_export.h \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.h \
@@ -2332,8 +2422,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -2349,6 +2437,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -2377,8 +2467,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -2511,6 +2616,46 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Transport.inl \
+ $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.i \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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 \
@@ -2519,10 +2664,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -2537,18 +2678,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -2570,30 +2699,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(TAO_ROOT)/tao/Transport.inl \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.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_Acceptor.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
  $(ACE_ROOT)/ace/Task_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.h \
@@ -2755,17 +2860,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  SHMIOP_Connection_Handler.h \
@@ -2872,6 +2970,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -2893,6 +2996,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -2921,8 +3026,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -3058,25 +3178,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3084,14 +3189,27 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
  $(TAO_ROOT)/tao/GIOP_Message_State.i \
@@ -3144,6 +3262,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -3201,8 +3321,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -3432,21 +3567,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -3454,14 +3578,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
  $(TAO_ROOT)/tao/GIOP_Message_State.i \
@@ -3484,6 +3617,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sync_Strategies.h \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -3543,6 +3678,21 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -3795,17 +3945,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  SHMIOP_Connection_Handler.h \
@@ -3839,6 +3982,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -3875,6 +4023,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -3900,8 +4050,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -4024,17 +4189,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  SHMIOP_Connection_Handler.h \
@@ -4160,6 +4318,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -4182,6 +4345,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -4210,8 +4375,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -4502,8 +4682,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -4519,6 +4697,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -4547,8 +4727,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(TAO_ROOT)/tao/ORB_Core.i \
@@ -4982,17 +5177,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -5005,6 +5193,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -5025,6 +5218,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -5069,8 +5264,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -5331,17 +5541,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -5369,6 +5572,11 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -5394,6 +5602,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -5438,8 +5648,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -5676,8 +5901,6 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -5698,6 +5921,8 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -5739,8 +5964,23 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
@@ -5855,25 +6095,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -5881,13 +6106,28 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
@@ -5997,25 +6237,10 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -6023,13 +6248,28 @@ CPPFLAGS += -I$(TAO_ROOT)
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 650b9b8c149..974920accd6 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -33,7 +33,7 @@ template class TAO_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPT
 
 #pragma instantiate ACE_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>
 #pragma instantiate ACE_Strategy_Acceptor<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_ACCEPTOR>
+#pragma instantiate ACE_Accept_Strategy<TAO_SHMIOP_Server_Connection_Handler, ACE_MEM_ACCEPTOR>
 #pragma instantiate ACE_Creation_Strategy<TAO_SHMIOP_Connection_Handler>
 #pragma instantiate ACE_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>
 #pragma instantiate ACE_Scheduling_Strategy<TAO_SHMIOP_Connection_Handler>
@@ -217,9 +217,6 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
   if (this->parse_options (options) == -1)
     return -1;
 
-  if (isdigit (*port) == 0)
-    return -1;                  // Port number must consist of digits
-
   if (port)
     this->address_.set (port);
 
diff --git a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
index 072f7eb987a..4abbb20eea1 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -52,21 +52,8 @@ TAO_SHMIOP_Connection_Handler::TAO_SHMIOP_Connection_Handler (TAO_ORB_Core *orb_
 
 TAO_SHMIOP_Connection_Handler::~TAO_SHMIOP_Connection_Handler (void)
 {
-
-  // If the socket has not already been closed.
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      // Cannot deal with errors, and therefore they are ignored.
-      this->transport_.send_buffered_messages ();
-    }
-  else
-    {
-      // Dequeue messages and delete message blocks.
-      this->transport_.dequeue_all ();
-    }
 }
 
-
 int
 TAO_SHMIOP_Connection_Handler::open (void*)
 {
@@ -196,21 +183,10 @@ TAO_SHMIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
       // passed to the reactor on ORB destruction.
       this->is_registered (0);
 
-      // Close the handle..
-      if (this->get_handle () != ACE_INVALID_HANDLE)
-        {
-          // Send the buffered messages first
-          this->transport_.send_buffered_messages ();
-
-          this->peer ().close ();
-
-          // Purge the entry too
-          this->mark_invalid ();
-        }
+      this->peer ().remove ();
 
       // Decrement the reference count
       this->decr_ref_count ();
-
     }
 
   return 0;
@@ -222,28 +198,17 @@ TAO_SHMIOP_Connection_Handler::fetch_handle (void)
   return this->get_handle ();
 }
 
-
 int
 TAO_SHMIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
                                              const void *)
 {
-  // This method is called when buffering timer expires.
-  //
-  ACE_Time_Value *max_wait_time = 0;
-
-  TAO_Stub *stub = 0;
-  int has_timeout;
-  this->orb_core ()->call_timeout_hook (stub,
-                                        has_timeout,
-                                        *max_wait_time);
-
   // Cannot deal with errors, and therefore they are ignored.
-  this->transport ()->send_buffered_messages (max_wait_time);
+  if (this->transport ()->handle_output () == -1)
+    return -1;
 
   return 0;
 }
 
-
 int
 TAO_SHMIOP_Connection_Handler::close (u_long)
 {
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 9ecc8806d40..cc2711be54a 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -17,42 +17,6 @@
 ACE_RCSID(Strategies, SHMIOP_Connector, "$Id$")
 
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
-template class ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
-template class ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>;
-
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*>;
-template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Connection_Handler*>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>
-#pragma instantiate ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>
-
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*>
-#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Connection_Handler*>
-
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
 TAO_SHMIOP_Connector::TAO_SHMIOP_Connector (CORBA::Octet flag)
   : TAO_Connector (TAO_TAG_SHMEM_PROFILE),
     connect_strategy_ (),
@@ -462,5 +426,39 @@ TAO_SHMIOP_Connector::object_key_delimiter (void) const
   return TAO_SHMIOP_Profile::object_key_delimiter_;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
+template class TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>;
+template class ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
+template class ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
+template class ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
+template class ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>;
+
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*>;
+template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Connection_Handler*>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_SHMIOP_Connection_Handler>;
+#pragma instantiate TAO_Connect_Creation_Strategy<TAO_SHMIOP_Connection_Handler>;
+#pragma instantiate ACE_Strategy_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
+#pragma instantiate ACE_Connect_Strategy<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
+#pragma instantiate ACE_Connector<TAO_SHMIOP_Connection_Handler, ACE_MEM_CONNECTOR>;
+#pragma instantiate ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>;
+
+#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*>
+#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_SHMIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_SHMIOP_Connection_Handler*>
+
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.h b/TAO/tao/Strategies/SHMIOP_Endpoint.h
index 19200df4c1a..f06b60d0d08 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h
@@ -114,6 +114,9 @@ public:
   CORBA::UShort port (CORBA::UShort p);
   // Set the port number.
 
+  // TAO_SHMIOP_Client_Connection_Handler *&hint (void);
+  // Access to our <hint_>.
+
 private:
   int set (const ACE_INET_Addr &addr,
            int use_dotted_decimal_addresses);
@@ -129,6 +132,10 @@ private:
   // Cached instance of <ACE_INET_Addr> for use in making
   // invocations, etc.
 
+  // TAO_SHMIOP_Client_Connection_Handler *hint_;
+  // Hint indicating the last successfully used connection handler for
+  // a connection established through this endpoint's acceptor.
+
   TAO_SHMIOP_Endpoint *next_;
   // SHMIOP Endpoints can be stringed into a list.  Return the next
   // endpoint in the list, if any.
diff --git a/TAO/tao/Strategies/SHMIOP_Endpoint.i b/TAO/tao/Strategies/SHMIOP_Endpoint.i
index b09a0ea3fb5..499cc64ebe0 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.i
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.i
@@ -50,3 +50,9 @@ TAO_SHMIOP_Endpoint::port (CORBA::UShort p)
 {
   return this->port_ = p;
 }
+
+/*ACE_INLINE TAO_SHMIOP_Client_Connection_Handler *&
+TAO_SHMIOP_Endpoint::hint (void)
+{
+  return this->hint_;
+}*/
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.h b/TAO/tao/Strategies/SHMIOP_Profile.h
index 6f196c8efd2..8831149c64a 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -36,6 +36,7 @@
 
 #include "ace/Synch.h"
 
+class TAO_SHMIOP_Client_Connection_Handler;
 
 // TAO SHMIOP_Profile concrete Profile definitions
 class TAO_Strategies_Export TAO_SHMIOP_Profile : public TAO_Profile
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.cpp b/TAO/tao/Strategies/SHMIOP_Transport.cpp
index aab0f6adc27..a3bb82d6616 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -79,7 +79,7 @@ TAO_SHMIOP_Transport::close_connection (void)
   // First  close the handler
   this->connection_handler_->handle_close ();
 
-  // Purge the entry too
+  // Then purge ourselves
   this->connection_handler_->purge_entry ();
 }
 
@@ -90,12 +90,23 @@ TAO_SHMIOP_Transport::idle (void)
 }
 
 ssize_t
-TAO_SHMIOP_Transport::send (const ACE_Message_Block *message_block,
-                            const ACE_Time_Value *max_wait_time,
-                            size_t *)
+TAO_SHMIOP_Transport::send (iovec *iov, int iovcnt,
+                          size_t &bytes_transferred,
+                          const ACE_Time_Value *max_wait_time)
 {
-  return this->service_handler ()->peer ().send (message_block,
-                                                 max_wait_time);
+  bytes_transferred = 0;
+  for (int i = 0; i < iovcnt; ++i)
+    {
+      ssize_t retval =
+        this->service_handler ()->peer ().send (iov[i].iov_base,
+                                                iov[i].iov_len,
+                                                max_wait_time);
+      if (retval > 0)
+        bytes_transferred += retval;
+      if (retval <= 0)
+        return retval;
+    }
+  return bytes_transferred;
 }
 
 ssize_t
@@ -204,7 +215,7 @@ TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream,
   // versions seem to need it though.  Leaving it costs little.
 
   // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_or_buffer (stub,
+  ssize_t n = this->send_message_i (stub,
                                     twoway,
                                     stream.begin (),
                                     max_wait_time);
@@ -220,17 +231,6 @@ TAO_SHMIOP_Transport::send_message (TAO_OutputCDR &stream,
       return -1;
     }
 
-  // EOF.
-  if (n == 0)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n")
-                    ACE_TEXT ("EOF, closing conn %d\n"),
-                    this->handle()));
-      return -1;
-    }
-
   return 1;
 }
 
@@ -293,12 +293,6 @@ TAO_SHMIOP_Transport::messaging_init (CORBA::Octet major,
 }
 
 int
-TAO_SHMIOP_Transport::reactor_signalling (void)
-{
-  return 1;
-}
-
-int
 TAO_SHMIOP_Transport::process_message (void)
 {
   // Get the <message_type> that we have received
@@ -386,16 +380,7 @@ TAO_SHMIOP_Transport::process_message (void)
       if (result == 0)
         {
           this->messaging_object_->reset ();
-
-          // The reply dispatcher was no longer registered.
-          // This can happened when the request/reply
-          // times out.
-          // To throw away all registered reply handlers is
-          // not the right thing, as there might be just one
-          // old reply coming in and several valid new ones
-          // pending. If we would invoke <connection_closed>
-          // we would throw away also the valid ones.
-          //return 0;
+          return 0;
         }
 
 
diff --git a/TAO/tao/Strategies/SHMIOP_Transport.h b/TAO/tao/Strategies/SHMIOP_Transport.h
index 9bcc4b9ec2f..465575ac5c4 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -1,4 +1,4 @@
-// This	may look like C, but it's really -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 // ===================================================================
 /**
@@ -7,20 +7,20 @@
  *  $Id$
  *
  *  @author Originally by Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author Modified by	Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author Modified by Balachandran Natarajan <bala@cs.wustl.edu>
  */
 // ===================================================================
-#ifndef	TAO_SHMIOP_TRANSPORT_H
-#define	TAO_SHMIOP_TRANSPORT_H
+#ifndef TAO_SHMIOP_TRANSPORT_H
+#define TAO_SHMIOP_TRANSPORT_H
 #include "ace/pre.h"
 
 #include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE	*/
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (TAO_HAS_SHMIOP) &&	(TAO_HAS_SHMIOP	!= 0)
+#if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
 #include "strategies_export.h"
 #include "ace/Svc_Handler.h"
@@ -32,13 +32,13 @@ class TAO_Pluggable_Messaging;
 class TAO_Target_Specification;
 class Tao_Operation_Details;
 
-typedef	ACE_Svc_Handler<ACE_MEM_STREAM,	ACE_NULL_SYNCH>
-	 TAO_SHMIOP_SVC_HANDLER;
+typedef ACE_Svc_Handler<ACE_MEM_STREAM, ACE_NULL_SYNCH>
+         TAO_SHMIOP_SVC_HANDLER;
 
 /**
  * @class TAO_SHMIOP_Transport
  *
- * @brief Specialization of the	base TAO_Transport class to handle the
+ * @brief Specialization of the base TAO_Transport class to handle the
  *  SHMIOP protocol.
  *
  */
@@ -49,11 +49,11 @@ public:
 
   /// Constructor.
   TAO_SHMIOP_Transport (TAO_SHMIOP_Connection_Handler *handler,
-			TAO_ORB_Core *orb_core,
-			CORBA::Boolean flag);
+                        TAO_ORB_Core *orb_core,
+                        CORBA::Boolean flag);
 
   /// Default destructor.
-  ~TAO_SHMIOP_Transport	(void);
+  ~TAO_SHMIOP_Transport (void);
 
   /// Return the connection service handler
   TAO_SHMIOP_SVC_HANDLER *service_handler (void);
@@ -64,67 +64,63 @@ public:
 
   virtual ACE_Event_Handler *event_handler (void);
 
-  virtual void close_connection	(void);
+  virtual void close_connection (void);
 
   virtual int idle (void);
 
-  /// Write the	complete Message_Block chain to	the connection.
-  virtual ssize_t send (const ACE_Message_Block	*mblk,
-			const ACE_Time_Value *s	= 0,
-			size_t *bytes_transferred = 0);
+  /// Write the complete Message_Block chain to the connection.
+  virtual ssize_t send (iovec *iov, int iovcnt,
+                        size_t &bytes_transferred,
+                        const ACE_Time_Value *timeout = 0);
 
   /// Read len bytes from into buf.
   virtual ssize_t recv (char *buf,
-			size_t len,
-			const ACE_Time_Value *s	= 0);
+                        size_t len,
+                        const ACE_Time_Value *s = 0);
 
-  /// Read and process the message from	the connection.	The processing
-  /// of the message is	done by	delegating the work to the underlying
-  /// messaging	object
+  /// Read and process the message from the connection. The processing
+  /// of the message is done by delegating the work to the underlying
+  /// messaging object
   virtual int read_process_message (ACE_Time_Value *max_time_value = 0,
-				    int	block =0);
+                                    int block =0);
 
   virtual int register_handler (void);
 
-  /// @@TODO: These methods IMHO should	have more meaningful
-  /// names. The names seem to indicate	nothing.
+  /// @@TODO: These methods IMHO should have more meaningful
+  /// names. The names seem to indicate nothing.
   virtual int send_request (TAO_Stub *stub,
-			    TAO_ORB_Core *orb_core,
-			    TAO_OutputCDR &stream,
-			    int	twoway,
-			    ACE_Time_Value *max_wait_time);
+                            TAO_ORB_Core *orb_core,
+                            TAO_OutputCDR &stream,
+                            int twoway,
+                            ACE_Time_Value *max_wait_time);
 
   virtual int send_message (TAO_OutputCDR &stream,
-			    TAO_Stub *stub = 0,
-			    int	twoway = 1,
-			    ACE_Time_Value *max_time_wait = 0);
+                            TAO_Stub *stub = 0,
+                            int twoway = 1,
+                            ACE_Time_Value *max_time_wait = 0);
 
   virtual void start_request (TAO_ORB_Core *orb_core,
-			      TAO_Target_Specification &spec,
-			      TAO_OutputCDR &output,
-			      CORBA::Environment &ACE_TRY_ENV =	TAO_default_environment	())
+                              TAO_Target_Specification &spec,
+                              TAO_OutputCDR &output,
+                              CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void start_locate (TAO_ORB_Core *orb_core,
-			     TAO_Target_Specification &spec,
-			     TAO_Operation_Details &opdetails,
-			     TAO_OutputCDR &output,
-			     CORBA::Environment	&ACE_TRY_ENV = TAO_default_environment ())
+                             TAO_Target_Specification &spec,
+                             TAO_Operation_Details &opdetails,
+                             TAO_OutputCDR &output,
+                             CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
   virtual CORBA::Boolean
   send_request_header (TAO_Operation_Details &opdetails,
-		       TAO_Target_Specification	&spec,
-		       TAO_OutputCDR &msg);
+                       TAO_Target_Specification &spec,
+                       TAO_OutputCDR &msg);
 
   /// Initialising the messaging object
   virtual int messaging_init (CORBA::Octet major,
-			      CORBA::Octet minor);
-
-  /// Indicates	whether	the reactor is used by the protocol for
-  /// signalling.
-  virtual int reactor_signalling (void);
+                              CORBA::Octet minor);
 
 private:
 
@@ -133,9 +129,9 @@ private:
 
 private:
 
-  /// The connection service handler used for accessing	lower layer
+  /// The connection service handler used for accessing lower layer
   /// communication protocols.
-  TAO_SHMIOP_Connection_Handler	*connection_handler_;
+  TAO_SHMIOP_Connection_Handler *connection_handler_;
 
   /// Our messaging object.
   TAO_Pluggable_Messaging *messaging_object_;
@@ -147,7 +143,7 @@ private:
 #include "SHMIOP_Transport.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0	*/
+#endif /* TAO_HAS_SHMIOP && TAO_HAS_SHMIOP != 0 */
 
 #include "ace/post.h"
-#endif	/* TAO_SHMIOP_TRANSPORT_H */
+#endif  /* TAO_SHMIOP_TRANSPORT_H */
diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp
index cb8c874f975..689d739675e 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -46,15 +46,15 @@ template class TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPT
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Strategy_Acceptor<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate ACE_Scheduling_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Creation_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Accept_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate ACE_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate ACE_Strategy_Acceptor<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate ACE_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
+#pragma instantiate ACE_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate ACE_Scheduling_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate TAO_Creation_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate TAO_Concurrency_Strategy<TAO_UIOP_Server_Connection_Handler>
+#pragma instantiate TAO_Accept_Strategy<TAO_UIOP_Server_Connection_Handler, ACE_LSOCK_ACCEPTOR>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
@@ -562,11 +562,11 @@ TAO_UIOP_Acceptor::init_uiop_properties (void)
                                          recv_buffer_size,
                                          no_delay,
                                          protocol_type);
-
+      
       if(hook_result == -1)
         return -1;
     }
-
+  
   // Extract and locally store properties of interest.
   this->uiop_properties_.send_buffer_size =
     send_buffer_size;
diff --git a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
index aac5ebdd275..58c61ec1947 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -56,22 +56,8 @@ TAO_UIOP_Connection_Handler::TAO_UIOP_Connection_Handler (TAO_ORB_Core *orb_core
 
 TAO_UIOP_Connection_Handler::~TAO_UIOP_Connection_Handler (void)
 {
-
-  // If the socket has not already been closed.
-  if (this->get_handle () != ACE_INVALID_HANDLE)
-    {
-      // Cannot deal with errors, and therefore they are ignored.
-      this->transport_.send_buffered_messages ();
-    }
-  else
-    {
-      // Dequeue messages and delete message blocks.
-      this->transport_.dequeue_all ();
-    }
 }
 
-
-
 int
 TAO_UIOP_Connection_Handler::open (void*)
 {
@@ -180,21 +166,8 @@ TAO_UIOP_Connection_Handler::handle_close (ACE_HANDLE handle,
       // passed to the reactor on ORB destruction.
       this->is_registered (0);
 
-      // Close the handle..
-      if (this->get_handle () != ACE_INVALID_HANDLE)
-        {
-          // Send the buffered messages first
-          this->transport_.send_buffered_messages ();
-
-          this->peer ().close ();
-
-          // Mark the entry as invalid
-          this->mark_invalid ();
-        }
-
       // Decrement the reference count
       this->decr_ref_count ();
-
     }
 
   return 0;
@@ -211,23 +184,13 @@ int
 TAO_UIOP_Connection_Handler::handle_timeout (const ACE_Time_Value &,
                                              const void *)
 {
-  // This method is called when buffering timer expires.
-  //
-  ACE_Time_Value *max_wait_time = 0;
-
-  TAO_Stub *stub = 0;
-  int has_timeout;
-  this->orb_core ()->call_timeout_hook (stub,
-                                        has_timeout,
-                                        *max_wait_time);
-
   // Cannot deal with errors, and therefore they are ignored.
-  this->transport ()->send_buffered_messages (max_wait_time);
+  if (this->transport ()->handle_output () == -1)
+    return -1;
 
   return 0;
 }
 
-
 int
 TAO_UIOP_Connection_Handler::close (u_long)
 {
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 7a798fd64a3..ed83deb16ea 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -16,55 +16,6 @@
 
 ACE_RCSID(Strategies, UIOP_Connector, "$Id$")
 
-
-#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_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>;
-template class ACE_Auto_Basic_Array_Ptr<ACE_UNIX_Addr>;
-template class ACE_Hash<ARHR<ACE_UNIX_Addr> >;
-template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >;
-
-template class TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>;
-template class TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>;
-template class ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
-template class ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>;
-
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*>;
-template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
-template class ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler*>;
-
-#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_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
-#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_UNIX_Addr>
-#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >
-
-#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>
-#pragma instantiate ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
-#pragma instantiate ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>
-
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*>
-#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 TAO_UIOP_Connector::TAO_UIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_UIOP_PROFILE),
     connect_strategy_ (),
@@ -513,5 +464,52 @@ TAO_UIOP_Connector::init_uiop_properties (void)
 
 
 
+#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_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>;
+template class ACE_Auto_Basic_Array_Ptr<ACE_UNIX_Addr>;
+template class ACE_Hash<ARHR<ACE_UNIX_Addr> >;
+template class ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >;
+
+template class TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>;
+template class TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>;
+template class ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
+template class ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
+template class ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>;
+template class ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>;
+
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*>;
+template class ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>;
+template class ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler*>;
+
+#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_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
+#pragma instantiate ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_UNIX_Addr>
+#pragma instantiate ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr> >
+
+#pragma instantiate TAO_Connect_Concurrency_Strategy<TAO_UIOP_Connection_Handler>
+#pragma instantiate TAO_Connect_Creation_Strategy<TAO_UIOP_Connection_Handler>
+#pragma instantiate ACE_Strategy_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
+#pragma instantiate ACE_Connect_Strategy<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
+#pragma instantiate ACE_Connector<TAO_UIOP_Connection_Handler, ACE_LSOCK_CONNECTOR>
+#pragma instantiate ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>
+
+#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Iterator_Base<int, ACE_Svc_Tuple<TAO_UIOP_Connection_Handler> *, TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Entry<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*>
+#pragma instantiate ACE_Map_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Map_Reverse_Iterator<int,ACE_Svc_Tuple<TAO_UIOP_Connection_Handler>*,TAO_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Auto_Basic_Array_Ptr<TAO_UIOP_Connection_Handler*>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_UIOP == 1 */
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.h b/TAO/tao/Strategies/UIOP_Endpoint.h
index 2b7a778b167..8df34f76ec2 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.h
+++ b/TAO/tao/Strategies/UIOP_Endpoint.h
@@ -33,6 +33,7 @@
 #include "strategies_export.h"
 #include "ace/UNIX_Addr.h"
 
+class TAO_UIOP_Client_Connection_Handler;
 
 class TAO_Strategies_Export TAO_UIOP_Endpoint : public TAO_Endpoint
 {
@@ -83,12 +84,19 @@ public:
   // Return a pointer to the rendezvous point string.
   // This object maintains ownership of the returned string.
 
+  // TAO_UIOP_Client_Connection_Handler *&hint (void);
+  // Access to our <hint_>.
+
 private:
 
   ACE_UNIX_Addr object_addr_;
   // Cached instance of <ACE_UNIX_Addr> for use in making
   // invocations, etc.
 
+  // TAO_UIOP_Client_Connection_Handler *hint_;
+  // Hint indicating the last successfully used connection handler for
+  // a connection established through this endpoint's acceptor.
+
   TAO_UIOP_Endpoint *next_;
   // UIOP Endpoints can be stringed into a list.  Return the next
   // endpoint in the list, if any.
diff --git a/TAO/tao/Strategies/UIOP_Endpoint.i b/TAO/tao/Strategies/UIOP_Endpoint.i
index b89b850aacf..fa86101d27f 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.i
+++ b/TAO/tao/Strategies/UIOP_Endpoint.i
@@ -9,6 +9,12 @@ TAO_UIOP_Endpoint::object_addr (void) const
   return this->object_addr_;
 }
 
+/*ACE_INLINE TAO_UIOP_Client_Connection_Handler *&
+TAO_UIOP_Endpoint::hint (void)
+{
+  return this->hint_;
+}
+*/
 
 ACE_INLINE const char *
 TAO_UIOP_Endpoint::rendezvous_point (void) const
diff --git a/TAO/tao/Strategies/UIOP_Profile.h b/TAO/tao/Strategies/UIOP_Profile.h
index b32e89a2975..222bfc8c6b1 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -39,6 +39,7 @@
 #include "ace/UNIX_Addr.h"
 #include "ace/Synch.h"
 
+//class TAO_UIOP_Client_Connection_Handler;
 
 // TAO UIOP_Profile concrete Profile definitions
 class TAO_Strategies_Export TAO_UIOP_Profile : public TAO_Profile
diff --git a/TAO/tao/Strategies/UIOP_Transport.cpp b/TAO/tao/Strategies/UIOP_Transport.cpp
index 001d76c2afa..b7d9fe95734 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -79,7 +79,8 @@ TAO_UIOP_Transport::close_connection (void)
   // Now close the handler
   this->connection_handler_->handle_close ();
 
-  // Purge the entry
+  // Purge the entry from the Cache map first and then close the
+  // handler
   this->connection_handler_->purge_entry ();
 }
 
@@ -90,14 +91,16 @@ TAO_UIOP_Transport::idle (void)
 }
 
 ssize_t
-TAO_UIOP_Transport::send (const ACE_Message_Block *message_block,
-                          const ACE_Time_Value *max_wait_time,
-                          size_t *bytes_transferred)
+TAO_UIOP_Transport::send (iovec *iov, int iovcnt,
+                          size_t &bytes_transferred,
+                          const ACE_Time_Value *max_wait_time)
 {
-  return ACE::send_n (this->handle (),
-                      message_block,
-                      max_wait_time,
-                      bytes_transferred);
+  ssize_t retval = this->service_handler ()->peer ().sendv (iov, iovcnt,
+                                                            max_wait_time);
+  if (retval > 0)
+    bytes_transferred = retval;
+
+  return retval;
 }
 
 ssize_t
@@ -205,7 +208,7 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream,
   // versions seem to need it though.  Leaving it costs little.
 
   // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = this->send_or_buffer (stub,
+  ssize_t n = this->send_message_i (stub,
                                     twoway,
                                     stream.begin (),
                                     max_wait_time);
@@ -221,17 +224,6 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream,
       return -1;
     }
 
-  // EOF.
-  if (n == 0)
-    {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO: (%P|%t|%N|%l) send_message () \n")
-                    ACE_TEXT ("EOF, closing conn %d\n"),
-                    this->handle()));
-      return -1;
-    }
-
   return 1;
 }
 
@@ -381,16 +373,7 @@ TAO_UIOP_Transport::process_message (void)
       if (result == 0)
         {
           this->messaging_object_->reset ();
-
-          // The reply dispatcher was no longer registered.
-          // This can happened when the request/reply
-          // times out.
-          // To throw away all registered reply handlers is
-          // not the right thing, as there might be just one
-          // old reply coming in and several valid new ones
-          // pending. If we would invoke <connection_closed>
-          // we would throw away also the valid ones.
-          //return 0;
+          return 0;
         }
 
 
diff --git a/TAO/tao/Strategies/UIOP_Transport.h b/TAO/tao/Strategies/UIOP_Transport.h
index 913ae5d527f..c816bfe681d 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -74,9 +74,9 @@ public:
   virtual int idle (void);
 
   /// Write the complete Message_Block chain to the connection.
-  virtual ssize_t send (const ACE_Message_Block *mblk,
-                        const ACE_Time_Value *s = 0,
-                        size_t *bytes_transferred = 0);
+  virtual ssize_t send (iovec *iov, int iovcnt,
+                        size_t &bytes_transferred,
+                        const ACE_Time_Value *timeout = 0);
 
   /// Read len bytes from into buf.
   virtual ssize_t recv (char *buf,
diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp
index cda77541196..86fc384ab72 100644
--- a/TAO/tao/Strategies/advanced_resource.cpp
+++ b/TAO/tao/Strategies/advanced_resource.cpp
@@ -61,7 +61,7 @@ TAO_Advanced_Resource_Factory::~TAO_Advanced_Resource_Factory (void)
 int
 TAO_Advanced_Resource_Factory::init (int argc, char **argv)
 {
-  ACE_TRACE ("TAO_Advanced_Resource_Factory::init");
+  ACE_TRACE ("TAO_Advanced_Resource_Factory::parse_args");
 
   int curarg = 0;
 
diff --git a/TAO/tao/StringSeq.pidl b/TAO/tao/StringSeq.pidl
index 951e67e7ac2..307361ea0c6 100644
--- a/TAO/tao/StringSeq.pidl
+++ b/TAO/tao/StringSeq.pidl
@@ -8,11 +8,11 @@
 //   The command used to generate code is:
 //
 //     tao_idl
-//          -Ge 1
-//          -Wb,export_macro=TAO_Export
-//          -Wb,export_include="corbafwd.h"
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
+//          -Ge 1 \
+//          -Wb,export_macro=TAO_Export \
+//          -Wb,export_include="tao/corbafwd.h" \
+//          -Wb,pre_include="ace/pre.h" \
+//          -Wb,post_include="ace/post.h" \
 //          StringSeq.pidl
 //
 //   Patches for changes to the generated code are available in the
@@ -20,17 +20,14 @@
 // ================================================================
 
 
-#ifndef TAO_CORBA_STRING_SEQ_IDL
-#define TAO_CORBA_STRING_SEQ_IDL
+#ifndef TAO_STRING_SEQ_IDL
+#define TAO_STRING_SEQ_IDL
 
 #pragma prefix "omg.org"
 
-module CORBA
-{
-  typedef sequence<string> StringSeq;
-  typedef sequence<wstring> WStringSeq;
-};
+typedef sequence<string> StringSeq;
+typedef sequence<wstring> WStringSeq;
 
 #pragma prefix ""
 
-#endif  /* TAO_CORBA_STRING_SEQ_IDL */
+#endif  /* TAO_STRING_SEQ_IDL */
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 6411e8067cf..9f9574831ab 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -29,44 +29,42 @@
 #include "StringSeqC.i"
 #endif /* !defined INLINE */
 
-#include "Any.h"
-#include "CDR.h"
-#include "Typecode.h"
+#include "tao/Any.h"
 
-#if !defined (_CORBA_STRINGSEQ_CS_)
-#define _CORBA_STRINGSEQ_CS_
+#if !defined (TAO_STRINGSEQ_CS)
+#define TAO_STRINGSEQ_CS
 
 // *************************************************************
-// CORBA::StringSeq
+// CORBA_StringSeq
 // *************************************************************
 
 CORBA_StringSeq::CORBA_StringSeq (void)
 {}
 CORBA_StringSeq::CORBA_StringSeq (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 */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_StringSeq::CORBA_StringSeq (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 */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_StringSeq::CORBA_StringSeq (const CORBA_StringSeq &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 */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_StringSeq::~CORBA_StringSeq (void) // dtor
@@ -83,56 +81,54 @@ void CORBA_StringSeq::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_CORBA_StringSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5374), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/StringSeq:1.0
-  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = StringSeq
+  18, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:CORBA_StringSeq:1.0
+  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = CORBA_StringSeq
   CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA_StringSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
-TAO_NAMESPACE_END
+CORBA::TypeCode_ptr _tc_CORBA_StringSeq = &_tc_TAO_tc_CORBA_StringSeq;
 
-#if !defined (_CORBA_WSTRINGSEQ_CS_)
-#define _CORBA_WSTRINGSEQ_CS_
+
+#if !defined (TAO_WSTRINGSEQ_CS)
+#define TAO_WSTRINGSEQ_CS
 
 // *************************************************************
-// CORBA::WStringSeq
+// CORBA_WStringSeq
 // *************************************************************
 
 CORBA_WStringSeq::CORBA_WStringSeq (void)
 {}
 CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 CORBA_WStringSeq::CORBA_WStringSeq (const CORBA_WStringSeq &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 CORBA_WStringSeq::~CORBA_WStringSeq (void) // dtor
@@ -149,21 +145,18 @@ void CORBA_WStringSeq::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_CORBA_WStringSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5753), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/WStringSeq:1.0
-  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = WStringSeq
+  19, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:CORBA_WStringSeq:1.0
+  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = CORBA_WStringSeq
   CORBA::tk_sequence, // typecode kind
   16, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_wstring,
+    CORBA::tk_wstring, 
     0U, // string length
     0U,
 
 };
 static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA_WStringSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (CORBA)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
-TAO_NAMESPACE_END
+CORBA::TypeCode_ptr _tc_CORBA_WStringSeq = &_tc_TAO_tc_CORBA_WStringSeq;
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -174,7 +167,7 @@ void operator<<= (
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_StringSeq,
+        _tc_CORBA_StringSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
@@ -186,7 +179,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_StringSeq *_tao_elem) // non copyi
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::_tc_StringSeq,
+      _tc_CORBA_StringSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
@@ -209,7 +202,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (CORBA::_tc_StringSeq, ACE_TRY_ENV)) // not equal
+    if (!type->equivalent (_tc_CORBA_StringSeq, ACE_TRY_ENV)) // not equal
       {
         return 0;
       }
@@ -233,7 +226,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_StringSeq,
+            _tc_CORBA_StringSeq,
             1,
             ACE_static_cast (void *, tmp),
             CORBA_StringSeq::_tao_any_destructor
@@ -263,7 +256,7 @@ void operator<<= (
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::_tc_WStringSeq,
+        _tc_CORBA_WStringSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
@@ -275,7 +268,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA_WStringSeq *_tao_elem) // non copy
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::_tc_WStringSeq,
+      _tc_CORBA_WStringSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
@@ -298,7 +291,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equivalent (CORBA::_tc_WStringSeq, ACE_TRY_ENV)) // not equal
+    if (!type->equivalent (_tc_CORBA_WStringSeq, ACE_TRY_ENV)) // not equal
       {
         return 0;
       }
@@ -322,7 +315,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_WStringSeq,
+            _tc_CORBA_WStringSeq,
             1,
             ACE_static_cast (void *, tmp),
             CORBA_WStringSeq::_tao_any_destructor
@@ -372,7 +365,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -414,7 +407,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -426,3 +419,4 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
+
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index 64f43fb52dd..bab0046e7a5 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -19,18 +19,18 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_CORBA_STRINGSEQC_H_
-#define _TAO_IDL_CORBA_STRINGSEQC_H_
+#ifndef TAO_IDL_STRINGSEQC_H
+#define TAO_IDL_STRINGSEQC_H
 
 #include "ace/pre.h"
 
-#include "corbafwd.h"
+#include "tao/corbafwd.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Sequence.h"
+#include "tao/Sequence.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -55,219 +55,223 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-#if !defined (_CORBA_STRINGSEQ_CH_)
-#define _CORBA_STRINGSEQ_CH_
-
-  class CORBA_StringSeq;
-  class CORBA_StringSeq_var;
-  
-  // *************************************************************
-  // CORBA::StringSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_StringSeq : public 
+
+#if !defined (TAO_STRINGSEQ_CH)
+#define TAO_STRINGSEQ_CH
+
+class CORBA_StringSeq;
+class CORBA_StringSeq_var;
+
+// *************************************************************
+// CORBA_StringSeq
+// *************************************************************
+
+class TAO_Export CORBA_StringSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_String_Sequence
+  TAO_Unbounded_String_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_StringSeq (void); // default ctor
-    CORBA_StringSeq (CORBA::ULong max); // uses max size
-    CORBA_StringSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      char * *buffer, 
-      CORBA::Boolean release = 0
-    );
-    CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
-    ~CORBA_StringSeq (void);
-    static void _tao_any_destructor (void*);
+  TAO_Unbounded_String_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+{
+public:
+  CORBA_StringSeq (void); // default ctor
+  CORBA_StringSeq (CORBA::ULong max); // uses max size
+  CORBA_StringSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    char * *buffer,
+    CORBA::Boolean release = 0
+  );
+  CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
+  ~CORBA_StringSeq (void);
+  static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_StringSeq_var _var_type;
+  typedef CORBA_StringSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  };
-  
+};
+
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_STRINGSEQ___VAR_CH_)
-#define _CORBA_STRINGSEQ___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::StringSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_StringSeq_var
-  {
-  public:
-    CORBA_StringSeq_var (void); // default constructor
-    CORBA_StringSeq_var (CORBA_StringSeq *);
-    CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
-    ~CORBA_StringSeq_var (void); // destructor
-    
-    CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
-    CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
-    CORBA_StringSeq *operator-> (void);
-    const CORBA_StringSeq *operator-> (void) const;
-    
-    operator const CORBA_StringSeq &() const;
-    operator CORBA_StringSeq &();
-    operator CORBA_StringSeq &() const;
-    operator CORBA_StringSeq *&(); // variable-size base types only
-    
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const CORBA_StringSeq &in (void) const;
-    CORBA_StringSeq &inout (void);
-    CORBA_StringSeq *&out (void);
-    CORBA_StringSeq *_retn (void);
-    CORBA_StringSeq *ptr (void) const;
-
-  private:
-    CORBA_StringSeq *ptr_;
-  };
+#if !defined (TAO_STRINGSEQ___VAR_CH)
+#define TAO_STRINGSEQ___VAR_CH
+
+// *************************************************************
+// class CORBA_StringSeq_var
+// *************************************************************
+
+class TAO_Export CORBA_StringSeq_var
+{
+public:
+  CORBA_StringSeq_var (void); // default constructor
+  CORBA_StringSeq_var (CORBA_StringSeq *);
+  CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
+  ~CORBA_StringSeq_var (void); // destructor
+
+  CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
+  CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
+  CORBA_StringSeq *operator-> (void);
+  const CORBA_StringSeq *operator-> (void) const;
+
+  operator const CORBA_StringSeq &() const;
+  operator CORBA_StringSeq &();
+  operator CORBA_StringSeq &() const;
+  operator CORBA_StringSeq *&(); // variable-size base types only
+
+  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+  // in, inout, out, _retn
+  const CORBA_StringSeq &in (void) const;
+  CORBA_StringSeq &inout (void);
+  CORBA_StringSeq *&out (void);
+  CORBA_StringSeq *_retn (void);
+  CORBA_StringSeq *ptr (void) const;
+
+private:
+  CORBA_StringSeq *ptr_;
+};
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_STRINGSEQ___OUT_CH_)
-#define _CORBA_STRINGSEQ___OUT_CH_
-
-  class TAO_Export CORBA_StringSeq_out
-  {
-  public:
-    CORBA_StringSeq_out (CORBA_StringSeq *&);
-    CORBA_StringSeq_out (CORBA_StringSeq_var &);
-    CORBA_StringSeq_out (const CORBA_StringSeq_out &);
-    CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
-    CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
-    operator CORBA_StringSeq *&();
-    CORBA_StringSeq *&ptr (void);
-    CORBA_StringSeq *operator-> (void);
-    TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_StringSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_StringSeq_var &);
-  };
+#if !defined (TAO_STRINGSEQ___OUT_CH)
+#define TAO_STRINGSEQ___OUT_CH
+
+class TAO_Export CORBA_StringSeq_out
+{
+public:
+  CORBA_StringSeq_out (CORBA_StringSeq *&);
+  CORBA_StringSeq_out (CORBA_StringSeq_var &);
+  CORBA_StringSeq_out (const CORBA_StringSeq_out &);
+  CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
+  CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
+  operator CORBA_StringSeq *&();
+  CORBA_StringSeq *&ptr (void);
+  CORBA_StringSeq *operator-> (void);
+  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+private:
+  CORBA_StringSeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_StringSeq_var &);
+};
 
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_WSTRINGSEQ_CH_)
-#define _CORBA_WSTRINGSEQ_CH_
-
-  class CORBA_WStringSeq;
-  class CORBA_WStringSeq_var;
-  
-  // *************************************************************
-  // CORBA::WStringSeq
-  // *************************************************************
-  
-  class TAO_Export CORBA_WStringSeq : public 
+extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_StringSeq;
+
+
+#if !defined (TAO_WSTRINGSEQ_CH)
+#define TAO_WSTRINGSEQ_CH
+
+class CORBA_WStringSeq;
+class CORBA_WStringSeq_var;
+
+// *************************************************************
+// CORBA_WStringSeq
+// *************************************************************
+
+class TAO_Export CORBA_WStringSeq : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-    TAO_Unbounded_WString_Sequence
+  TAO_Unbounded_WString_Sequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-    TAO_Unbounded_WString_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  {
-  public:
-    CORBA_WStringSeq (void); // default ctor
-    CORBA_WStringSeq (CORBA::ULong max); // uses max size
-    CORBA_WStringSeq (
-      CORBA::ULong max, 
-      CORBA::ULong length, 
-      CORBA::WChar * *buffer, 
-      CORBA::Boolean release = 0
-    );
-    CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
-    ~CORBA_WStringSeq (void);
-    static void _tao_any_destructor (void*);
+  TAO_Unbounded_WString_Sequence
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+{
+public:
+  CORBA_WStringSeq (void); // default ctor
+  CORBA_WStringSeq (CORBA::ULong max); // uses max size
+  CORBA_WStringSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    CORBA::WChar * *buffer,
+    CORBA::Boolean release = 0
+  );
+  CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
+  ~CORBA_WStringSeq (void);
+  static void _tao_any_destructor (void*);
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_WStringSeq_var _var_type;
+  typedef CORBA_WStringSeq_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
-  };
-  
+};
+
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_WSTRINGSEQ___VAR_CH_)
-#define _CORBA_WSTRINGSEQ___VAR_CH_
-
-  // *************************************************************
-  // class CORBA_WStringSeq_var
-  // *************************************************************
-
-  class TAO_Export CORBA_WStringSeq_var
-  {
-  public:
-    CORBA_WStringSeq_var (void); // default constructor
-    CORBA_WStringSeq_var (CORBA_WStringSeq *);
-    CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
-    ~CORBA_WStringSeq_var (void); // destructor
-    
-    CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
-    CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
-    CORBA_WStringSeq *operator-> (void);
-    const CORBA_WStringSeq *operator-> (void) const;
-    
-    operator const CORBA_WStringSeq &() const;
-    operator CORBA_WStringSeq &();
-    operator CORBA_WStringSeq &() const;
-    operator CORBA_WStringSeq *&(); // variable-size base types only
-    
-    TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-    
-    // in, inout, out, _retn 
-    const CORBA_WStringSeq &in (void) const;
-    CORBA_WStringSeq &inout (void);
-    CORBA_WStringSeq *&out (void);
-    CORBA_WStringSeq *_retn (void);
-    CORBA_WStringSeq *ptr (void) const;
-
-  private:
-    CORBA_WStringSeq *ptr_;
-  };
+#if !defined (TAO_WSTRINGSEQ___VAR_CH)
+#define TAO_WSTRINGSEQ___VAR_CH
+
+// *************************************************************
+// class CORBA_WStringSeq_var
+// *************************************************************
+
+class TAO_Export CORBA_WStringSeq_var
+{
+public:
+  CORBA_WStringSeq_var (void); // default constructor
+  CORBA_WStringSeq_var (CORBA_WStringSeq *);
+  CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
+  ~CORBA_WStringSeq_var (void); // destructor
+
+  CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
+  CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
+  CORBA_WStringSeq *operator-> (void);
+  const CORBA_WStringSeq *operator-> (void) const;
+
+  operator const CORBA_WStringSeq &() const;
+  operator CORBA_WStringSeq &();
+  operator CORBA_WStringSeq &() const;
+  operator CORBA_WStringSeq *&(); // variable-size base types only
+
+  TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
+
+  // in, inout, out, _retn
+  const CORBA_WStringSeq &in (void) const;
+  CORBA_WStringSeq &inout (void);
+  CORBA_WStringSeq *&out (void);
+  CORBA_WStringSeq *_retn (void);
+  CORBA_WStringSeq *ptr (void) const;
+
+private:
+  CORBA_WStringSeq *ptr_;
+};
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
-#define _CORBA_WSTRINGSEQ___OUT_CH_
-
-  class TAO_Export CORBA_WStringSeq_out
-  {
-  public:
-    CORBA_WStringSeq_out (CORBA_WStringSeq *&);
-    CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
-    CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
-    CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
-    CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
-    operator CORBA_WStringSeq *&();
-    CORBA_WStringSeq *&ptr (void);
-    CORBA_WStringSeq *operator-> (void);
-    TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-    
-  private:
-    CORBA_WStringSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const CORBA_WStringSeq_var &);
-  };
+#if !defined (TAO_WSTRINGSEQ___OUT_CH)
+#define TAO_WSTRINGSEQ___OUT_CH
+
+class TAO_Export CORBA_WStringSeq_out
+{
+public:
+  CORBA_WStringSeq_out (CORBA_WStringSeq *&);
+  CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
+  CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
+  CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
+  CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
+  operator CORBA_WStringSeq *&();
+  CORBA_WStringSeq *&ptr (void);
+  CORBA_WStringSeq *operator-> (void);
+  TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
+
+private:
+  CORBA_WStringSeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_WStringSeq_var &);
+};
 
 
 #endif /* end #if !defined */
 
-// Proxy Broker Factory function pointer declarations.
+extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_WStringSeq;
 
 TAO_Export void operator<<= (CORBA::Any &, const CORBA_StringSeq &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, CORBA_StringSeq*); // noncopying version
@@ -281,8 +285,8 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_WStringSe
 #ifndef __ACE_INLINE__
 
 
-#if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
-#define _TAO_CDR_OP_CORBA_StringSeq_H_
+#if !defined TAO_TAO_CDR_OP_CORBA_StringSeq_H
+#define TAO_TAO_CDR_OP_CORBA_StringSeq_H
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -293,11 +297,11 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA_StringSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
+#endif /* TAO_TAO_CDR_OP_CORBA_StringSeq_H */
 
 
-#if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
-#define _TAO_CDR_OP_CORBA_WStringSeq_H_
+#if !defined TAO_TAO_CDR_OP_CORBA_WStringSeq_H
+#define TAO_TAO_CDR_OP_CORBA_WStringSeq_H
 
 TAO_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -308,7 +312,7 @@ TAO_Export CORBA::Boolean operator>> (
     CORBA_WStringSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
+#endif /* TAO_TAO_CDR_OP_CORBA_WStringSeq_H */
 
 
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/StringSeqC.i b/TAO/tao/StringSeqC.i
index ea871fc4a05..3a98b4454fe 100644
--- a/TAO/tao/StringSeqC.i
+++ b/TAO/tao/StringSeqC.i
@@ -20,11 +20,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_CORBA_STRINGSEQ_CI_)
-#define _CORBA_STRINGSEQ_CI_
+#if !defined (TAO_STRINGSEQ_CI)
+#define TAO_STRINGSEQ_CI
 
 // *************************************************************
-// Inline operations for class CORBA::StringSeq_var
+// Inline operations for class CORBA_StringSeq_var
 // *************************************************************
 
 ACE_INLINE
@@ -60,8 +60,8 @@ CORBA_StringSeq_var::operator= (CORBA_StringSeq *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA_StringSeq_var &
-CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
+ACE_INLINE CORBA_StringSeq_var &
+CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p) // deep copy
 {
   if (this != &p)
     {
@@ -72,7 +72,7 @@ CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
         }
       else
         {
-          CORBA_StringSeq *deep_copy =
+          CORBA_StringSeq *deep_copy = 
             new CORBA_StringSeq (*p.ptr_);
           
           if (deep_copy != 0)
@@ -167,7 +167,7 @@ CORBA_StringSeq_var::ptr (void) const
 }
 
 // *************************************************************
-// Inline operations for class CORBA::StringSeq_out
+// Inline operations for class CORBA_StringSeq_out
 // *************************************************************
 
 ACE_INLINE
@@ -232,11 +232,11 @@ CORBA_StringSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_WSTRINGSEQ_CI_)
-#define _CORBA_WSTRINGSEQ_CI_
+#if !defined (TAO_WSTRINGSEQ_CI)
+#define TAO_WSTRINGSEQ_CI
 
 // *************************************************************
-// Inline operations for class CORBA::WStringSeq_var
+// Inline operations for class CORBA_WStringSeq_var
 // *************************************************************
 
 ACE_INLINE
@@ -272,31 +272,14 @@ CORBA_WStringSeq_var::operator= (CORBA_WStringSeq *p)
   return *this;
 }
 
-ACE_INLINE ::CORBA_WStringSeq_var &
-CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p)
+ACE_INLINE CORBA_WStringSeq_var &
+CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p) // deep copy
 {
   if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CORBA_WStringSeq *deep_copy =
-            new CORBA_WStringSeq (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              CORBA_WStringSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_, ::CORBA_WStringSeq (*p.ptr_), *this);
+  }
   return *this;
 }
 
@@ -379,7 +362,7 @@ CORBA_WStringSeq_var::ptr (void) const
 }
 
 // *************************************************************
-// Inline operations for class CORBA::WStringSeq_out
+// Inline operations for class CORBA_WStringSeq_out
 // *************************************************************
 
 ACE_INLINE
@@ -444,23 +427,23 @@ CORBA_WStringSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined _TAO_CDR_OP_CORBA_StringSeq_I_
-#define _TAO_CDR_OP_CORBA_StringSeq_I_
+#if !defined TAO_TAO_CDR_OP_CORBA_StringSeq_I
+#define TAO_TAO_CDR_OP_CORBA_StringSeq_I
 
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::StringSeq &
+    const CORBA_StringSeq &
   );
 CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
-    CORBA::StringSeq &
+    CORBA_StringSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_StringSeq_I_ */
+#endif /* TAO_TAO_CDR_OP_CORBA_StringSeq_I */
 
 
-#if !defined _TAO_CDR_OP_CORBA_WStringSeq_I_
-#define _TAO_CDR_OP_CORBA_WStringSeq_I_
+#if !defined TAO_TAO_CDR_OP_CORBA_WStringSeq_I
+#define TAO_TAO_CDR_OP_CORBA_WStringSeq_I
 
 CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
@@ -471,5 +454,5 @@ CORBA::Boolean TAO_Export operator>> (
     CORBA_WStringSeq &
   );
 
-#endif /* _TAO_CDR_OP_CORBA_WStringSeq_I_ */
+#endif /* TAO_TAO_CDR_OP_CORBA_WStringSeq_I */
 
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index f0d12a97ca1..2ecaa2e15ec 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -59,9 +59,7 @@ TAO_Stub::TAO_Stub (const char *repository_id,
 #if (TAO_HAS_CORBA_MESSAGING == 1)
     policies_ (0),
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
-    addressing_mode_ (0),
-    ior_info_ (0),
-    forwarded_ior_info_ (0)
+    addressing_mode_ (0)
 {
   if (this->orb_core_ == 0)
     {
@@ -129,11 +127,6 @@ TAO_Stub::~TAO_Stub (void)
 
   this->orb_core_->_decr_refcnt ();
 
-  if (this->ior_info_)
-    delete this->ior_info_;
-
-  if (this->forwarded_ior_info_)
-    delete this->forwarded_ior_info_;
 
 #if (TAO_HAS_RT_CORBA == 1)
 
@@ -184,111 +177,6 @@ TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
 }
 
 
-int
-TAO_Stub::create_ior_info (IOP::IOR *&ior_info,
-                           CORBA::ULong &index,
-                           CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // We are creating the IOR info. Let us not be disturbed. So grab a
-  // lock.
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            -1));
-
-  IOP::IOR *tmp_info = 0;
-
-  if (this->forward_profiles_ != 0)
-    {
-      if (this->forwarded_ior_info_ == 0)
-        {
-          this->get_profile_ior_info (*this->forward_profiles_,
-                                      tmp_info,
-                                      ACE_TRY_ENV);
-          ACE_CHECK_RETURN (-1);
-
-          this->forwarded_ior_info_ = tmp_info;
-        }
-
-      // First we look at the forward profiles to see whether the
-      // profile_in_use is any of it.
-      for (CORBA::ULong i = 0;
-           i < this->forward_profiles_->profile_count ();
-           ++i)
-        {
-          if (this->forward_profiles_->get_profile (i)
-              == this->profile_in_use_)
-            {
-              ior_info = this->forwarded_ior_info_;
-              index = i;
-              return 0;
-            }
-        }
-    }
-
-  // Else we look at the base profiles
-  if (this->ior_info_ == 0)
-    {
-      this->get_profile_ior_info (this->base_profiles_,
-                                  tmp_info,
-                                  ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-
-      this->ior_info_ = tmp_info;
-    }
-
-
-  for (CORBA::ULong ind = 0;
-       ind < this->base_profiles_.profile_count ();
-       ++ind)
-    {
-      if (this->base_profiles_.get_profile (ind) ==
-          this->profile_in_use_)
-        {
-          index = ind;
-          ior_info = this->ior_info_;
-          return 0;
-        }
-    }
-
-  // Error, there was no match
-  return -1;
-}
-
-
-int
-TAO_Stub::get_profile_ior_info (TAO_MProfile &profiles,
-                                IOP::IOR *&ior_info,
-                                CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-
-  ACE_NEW_THROW_EX (ior_info,
-                    IOP::IOR (),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (-1);
-
-
-  // Get the number of elements
-  CORBA::ULong count = profiles.profile_count ();
-
-  // Set the number of elements in the sequence of tagged_profile
-  ior_info->profiles.length (count);
-
-  // Call the create_tagged_profile one every member of the
-  // profile and make the sequence
-  for (CORBA::ULong index = 0; index < count; ++index)
-    {
-      TAO_Profile *prof = profiles.get_profile (index);
-
-      ior_info->profiles[index] = prof->create_tagged_profile ();
-    }
-
-  return 0;
-}
-
 
 
 // Quick'n'dirty hash of objref data, for partitioning objrefs into
@@ -311,10 +199,10 @@ TAO_Stub::hash (CORBA::ULong max,
                 ACE_TEXT ("(%P|%t) hash called on a null profile\n")));
 
   ACE_THROW_RETURN (CORBA::INTERNAL (
-                      CORBA_SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        0),
-                      CORBA::COMPLETED_NO),
+                                     CORBA_SystemException::_tao_minor_code (
+                                                                             TAO_DEFAULT_MINOR_CODE,
+                                                                             0),
+                                     CORBA::COMPLETED_NO),
                     0);
 }
 
@@ -437,90 +325,96 @@ private:
 #if (TAO_HAS_RT_CORBA == 1)
 
 void
-TAO_Stub::parse_policies (CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::parse_policies (void)
 {
-  CORBA::PolicyList_var policy_list
-    = this->base_profiles_.policy_list (ACE_TRY_ENV);
-  ACE_CHECK;
+  CORBA::PolicyList *policy_list
+    = this->base_profiles_.policy_list ();
 
   CORBA::ULong length = policy_list->length ();
+  //  CORBA::ULong index = 0;
 
-  // @@ Priyanka The code implemented in this methods doesn't do what
-  //    it is supposed to. I reverted your change for the time being.
-  // this->orb_core ()->get_protocols_hooks ()->call_policy_type_hook (policy_list,
-  //   policy_type);
+  CORBA::ULong policy_type = 0;
 
-  for (CORBA::ULong i = 0; i < length; ++i)
+  this->orb_core ()->get_protocols_hooks ()->call_policy_type_hook (policy_list,
+                                                                    policy_type);
+
+  for (unsigned int i = 0; i < length; ++i)
     {
-      if (policy_list[i]->policy_type () ==
-           RTCORBA::PRIORITY_MODEL_POLICY_TYPE)
-        this->exposed_priority_model (policy_list[i].in ());
+      if (policy_type == 0)
+        this->exposed_priority_model ((*policy_list)[i].in ());
 
-      else if (policy_list[i]->policy_type () ==
-                RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE)
-        this->exposed_priority_banded_connection (policy_list[i].in ());
+      else if (policy_type == 1)
+        this->exposed_priority_banded_connection ((*policy_list)[i].in ());
 
-      else if (policy_list[i]->policy_type () ==
-                RTCORBA::CLIENT_PROTOCOL_POLICY_TYPE)
-        this->exposed_client_protocol (policy_list[i].in ());
+      else if (policy_type == 2)
+        this->exposed_client_protocol ((*policy_list)[i].in ());
     }
 
   this->are_policies_parsed_ = 1;
 }
 
 CORBA::Policy *
-TAO_Stub::exposed_priority_model (CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::exposed_priority_model (void)
 {
   if (!this->are_policies_parsed_)
-    {
-      this->parse_policies (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
+    this->parse_policies ();
+
+  if (!CORBA::is_nil (this->priority_model_policy_))
+    this->priority_model_policy_->_add_ref ();
 
-  return CORBA::Policy::_duplicate (this->priority_model_policy_);
+  return this->priority_model_policy_;
 }
 
 void
 TAO_Stub::exposed_priority_model (CORBA::Policy_ptr policy)
 {
-  this->priority_model_policy_ = CORBA::Policy::_duplicate (policy);
+  if (!CORBA::is_nil (policy))
+    {
+      this->priority_model_policy_ = policy;
+    }
 }
 
 CORBA::Policy *
-TAO_Stub::exposed_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::exposed_priority_banded_connection (void)
 {
   if (!this->are_policies_parsed_)
-    {
-      this->parse_policies (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
+    this->parse_policies ();
+
+  if (!CORBA::is_nil (this->priority_banded_connection_policy_))
+    this->priority_banded_connection_policy_->_add_ref ();
 
-  return CORBA::Policy::_duplicate (this->priority_banded_connection_policy_);
+  return this->priority_banded_connection_policy_;
 }
 
 void
 TAO_Stub::exposed_priority_banded_connection (CORBA::Policy_ptr policy)
 {
-  this->priority_banded_connection_policy_ =
-    CORBA::Policy::_duplicate (policy);
+  if (!CORBA::is_nil (policy))
+    {
+      this->priority_banded_connection_policy_ =
+        policy;
+    }
 }
 
 CORBA::Policy *
-TAO_Stub::exposed_client_protocol (CORBA::Environment &ACE_TRY_ENV)
+TAO_Stub::exposed_client_protocol (void)
 {
   if (!this->are_policies_parsed_)
-    {
-      this->parse_policies (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
+    this->parse_policies ();
 
-  return CORBA::Policy::_duplicate (this->client_protocol_policy_);
+  if (!CORBA::is_nil (this->client_protocol_policy_))
+    this->client_protocol_policy_->_add_ref ();
+
+  return this->client_protocol_policy_;
 }
 
 void
 TAO_Stub::exposed_client_protocol (CORBA::Policy_ptr policy)
 {
-  this->client_protocol_policy_ = CORBA::Policy::_duplicate (policy);
+  if (!CORBA::is_nil (policy))
+    {
+      this->client_protocol_policy_ = policy;
+    }
 }
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
@@ -546,7 +440,7 @@ TAO_Stub::get_policy (CORBA::PolicyType type,
   // If we are dealing with a client exposed policy, check if any
   // value came in the IOR/reconcile IOR value and overrides.
   if (type_value == 1)
-    return this->exposed_priority_model (ACE_TRY_ENV);
+    return this->exposed_priority_model ();
 
   if (type_value == 2)
     return this->effective_priority_banded_connection (ACE_TRY_ENV);
@@ -678,15 +572,14 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
       //    CORBA::INV_Policy (). So, in here, I am not checking the
       //    CORBA::Environment variable, but checking on the value of
       //    type_value to throw the right exception. - Priyanka
-      this->orb_core_->get_protocols_hooks ()->validate_policy_type (
-         slot,
-         type_value,
-         ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
+      this->orb_core_->get_protocols_hooks ()->validate_policy_type (slot,
+                                                                     type_value,
+                                                                     ACE_TRY_ENV);
+      //ACE_CHECK;
+      
       if (type_value == 1 || type_value == 4)
         ACE_THROW_RETURN (CORBA::NO_PERMISSION (), 0);
-
+      
     }
 
   // We are not required to check for consistency of <policies> with
@@ -695,8 +588,7 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
 #endif /* TAO_HAS_RT_CORBA == 1 */
 
   // 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 (new TAO_Policy_Manager_Impl);
 
   if (set_add == CORBA::SET_OVERRIDE)
     {
@@ -717,7 +609,6 @@ TAO_Stub::set_policy_overrides (const CORBA::PolicyList & policies,
       policy_manager->copy_from (this->policies_,
                                  ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
-
       policy_manager->set_policy_overrides (policies,
                                             set_add,
                                             ACE_TRY_ENV);
@@ -1071,29 +962,28 @@ CORBA::Policy *
 TAO_Stub::effective_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV)
 {
   // Get effective override.
-  CORBA::Policy_var override =
+  CORBA::Policy *override =
     this->priority_banded_connection ();
 
   // Get the value from the ior.
-  CORBA::Policy_var exposed =
-    this->exposed_priority_banded_connection (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  CORBA::Policy *exposed =
+    this->exposed_priority_banded_connection ();
 
   // Reconcile client-exposed and locally set values.
-  if (CORBA::is_nil (exposed.in ()))
-    return override._retn ();
+  if (exposed == 0)
+    return override;
 
-  if (CORBA::is_nil (override.in ()))
-    return exposed._retn ();
+  if (override == 0)
+    return exposed;
 
   CORBA::Policy_var policy =
     this->orb_core_->get_protocols_hooks ()->
-    effective_priority_banded_connection_hook (override.in (),
-                                               exposed.in (),
+    effective_priority_banded_connection_hook (override,
+                                               exposed,
                                                ACE_TRY_ENV);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
-  return policy._retn ();
+  return policy.in ();
 }
 
 CORBA::Policy *
@@ -1105,15 +995,14 @@ TAO_Stub::effective_client_protocol (CORBA::Environment &ACE_TRY_ENV)
 
   // Get the value from the ior.
   CORBA::Policy_var exposed =
-    this->exposed_client_protocol (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+    this->exposed_client_protocol ();
 
   // Reconcile client-exposed and locally set values.
   if (CORBA::is_nil (exposed.in ()))
-    return override._retn ();
+    return override.in ();
 
   if (CORBA::is_nil (override.in ()))
-    return exposed._retn ();
+    return exposed.in ();
 
   CORBA::Policy_var policy =
     this->orb_core_->get_protocols_hooks ()->effective_client_protocol_hook (
@@ -1127,7 +1016,7 @@ TAO_Stub::effective_client_protocol (CORBA::Environment &ACE_TRY_ENV)
                     CORBA::Policy::_nil ());
   */
 
-  return policy._retn ();
+  return policy.in ();
 }
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index b969ea38761..69ff268f467 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -142,21 +142,21 @@ public:
 
 #if (TAO_HAS_RT_CORBA == 1)
 
-  /// Returns the CORBA::Policy (which will be narrowed to be
+  /// Returns the CORBA::Policy (which will be narrowed to be 
   /// used as RTCORBA::PriorityModelPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_model (CORBA::Environment &ACE_TRY_ENV);
-
+  CORBA::Policy *exposed_priority_model (void);
+  
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::PriorityBandedConnectionPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_priority_banded_connection (CORBA::Environment &ACE_TRY_ENV);
-
+  CORBA::Policy *exposed_priority_banded_connection (void);
+  
   /// Returns the CORBA::Policy (which will be narrowed and used
   /// as RTCORBA::ClientProtocolPolicy) exported
   /// in object's IOR.
-  CORBA::Policy_ptr exposed_client_protocol (CORBA::Environment &ACE_TRY_ENV);
-
+  CORBA::Policy *exposed_client_protocol (void);
+  
 # endif /*TAO_HAS_RT_CORBA == 1*/
 
   // = Methods for obtaining effective overrides.
@@ -258,9 +258,6 @@ public:
   /// Obtain a reference to the basic profile set.
   TAO_MProfile& base_profiles (void);
 
-  /// Obtain a pointer to the forwarded profile set
-  const TAO_MProfile *forward_profiles (void) const;
-
   // Manage forward and base profiles.
   /**
    * THREAD SAFE.  If forward_profiles is null then this will
@@ -342,15 +339,6 @@ public:
   /// preferences on selecting the right profiles.
   CORBA::Boolean service_profile_selection (void);
 
-  /**
-   * Create the IOP::IOR info. We will create the info at most once.
-   * Get the index of the profile we are using to make the invocation.
-   */
-  int create_ior_info (IOP::IOR *&ior_info,
-                       CORBA::ULong &index,
-                       CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
 private:
   /// Makes a copy of the profile and frees the existing profile_in_use.
   /// NOT THREAD SAFE
@@ -374,18 +362,12 @@ private:
   /// NON-THREAD-SAFE.  utility method for next_profile.
   TAO_Profile *next_forward_profile (void);
 
-  /// THREAD-SAFE Create the IOR info
-  int get_profile_ior_info (TAO_MProfile &profile,
-                            IOP::IOR *&ior_info,
-                            CORBA::Environment &ACE_TRY_ENV)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
 #if (TAO_HAS_RT_CORBA == 1)
 
 private:
 
   /// Helper method used to parse the policies.
-  void parse_policies (CORBA::Environment &ACE_TRY_ENV);
+  void parse_policies (void);
 
   void exposed_priority_model (CORBA::Policy_ptr policy);
 
@@ -456,19 +438,6 @@ private:
   /// The addressing mode.
   CORBA::Short addressing_mode_;
 
-  /**
-   * The ior info. This is needed for GIOP 1.2, as the clients could
-   * receive an exception from the server asking for this info.  The
-   * exception that the client receives is LOC_NEEDS_ADDRESSING_MODE.
-   * The data is set up here to be passed on to Invocation classes
-   * when they receive an exception. This info is for the base
-   * profiles that this class stores
-   */
-  IOP::IOR *ior_info_;
-
-  /// Forwarded IOR info
-  IOP::IOR *forwarded_ior_info_;
-
   // = Disallow copy constructor and assignment operator.
   ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &))
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
index 02c950c6e5e..e9e4c5be6ec 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -241,12 +241,6 @@ TAO_Stub::base_profiles (void)
   return this->base_profiles_;
 }
 
-ACE_INLINE const TAO_MProfile *
-TAO_Stub::forward_profiles (void) const
-{
-  return this->forward_profiles_;
-}
-
 
 ACE_INLINE TAO_ORB_Core*
 TAO_Stub::orb_core (void) const
@@ -323,7 +317,7 @@ TAO_Stub_Auto_Ptr::reset (TAO_Stub *p)
 ACE_INLINE TAO_Stub *
 TAO_Stub_Auto_Ptr::operator-> () const
 {
-  ACE_TRACE ("TAO_Stub_Auto_Ptr::operator->");
+  ACE_TRACE ("auto_ptr::operator->");
   return this->get ();
 }
 
diff --git a/TAO/tao/Sync_Strategies.cpp b/TAO/tao/Sync_Strategies.cpp
index c679fc3405c..36c923f1ee0 100644
--- a/TAO/tao/Sync_Strategies.cpp
+++ b/TAO/tao/Sync_Strategies.cpp
@@ -14,129 +14,47 @@ TAO_Sync_Strategy::~TAO_Sync_Strategy (void)
 {
 }
 
-ssize_t
-TAO_Transport_Sync_Strategy::send (TAO_Transport &transport,
-                                   TAO_Stub &,
-                                   const ACE_Message_Block *message_block,
-                                   const ACE_Time_Value *max_wait_time)
-{
-  // Immediate delegation to the transport.
-  return transport.send (message_block,
-                         max_wait_time);
-}
+// ****************************************************************
 
-#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-
-ssize_t
-TAO_Delayed_Buffering_Sync_Strategy::send (TAO_Transport &transport,
-                                           TAO_Stub &stub,
-                                           const ACE_Message_Block *mb,
-                                           const ACE_Time_Value *max_wait_time)
+int
+TAO_Transport_Sync_Strategy::
+    must_queue (int)
 {
-  ACE_Message_Block *message_block =
-    ACE_const_cast (ACE_Message_Block *, mb);
-
-  ssize_t result = 0;
-
-  // Get the message queue from the transport.
-  TAO_Transport_Buffering_Queue &buffering_queue =
-    transport.buffering_queue ();
-
-  // Check if there are messages already in the queue.
-  if (!buffering_queue.is_empty ())
-    return TAO_Eager_Buffering_Sync_Strategy::send (transport,
-                                                    stub,
-                                                    message_block,
-                                                    max_wait_time);
-
-  //
-  // Otherwise there were no queued messages.  We first try to send
-  // the message right away.
-  //
-
-  // Actual network send.
-  size_t bytes_transferred = 0;
-  result = transport.send (message_block,
-                           max_wait_time,
-                           &bytes_transferred);
-
-  // Cannot send completely: timed out.
-  if (result == -1 &&
-      errno == ETIME)
-    {
-      if (bytes_transferred > 0)
-        {
-          // If successful in sending some of the data, reset the
-          // message block appropriately.
-          transport.reset_sent_message (message_block,
-                                        bytes_transferred);
-        }
-
-      // Queue the rest.
-      return bytes_transferred +
-        TAO_Eager_Buffering_Sync_Strategy::send (transport,
-                                                 stub,
-                                                 message_block,
-                                                 max_wait_time);
-    }
-
-  // EOF or other errors.
-  if (result == -1 ||
-      result == 0)
-    return -1;
-
-  // Everything was successfully delivered.
-  return result;
+  return 0;
 }
 
-ssize_t
-TAO_Eager_Buffering_Sync_Strategy::send (TAO_Transport &transport,
-                                         TAO_Stub &stub,
-                                         const ACE_Message_Block *message_block,
-                                         const ACE_Time_Value *max_wait_time)
+int
+TAO_Transport_Sync_Strategy::
+    buffering_constraints_reached (TAO_Stub *,
+                                   size_t ,
+                                   size_t ,
+                                   int &,
+                                   ACE_Time_Value &)
 {
-  ssize_t result = 0;
-
-  // Get the message queue from the transport.
-  TAO_Transport_Buffering_Queue &buffering_queue =
-    transport.buffering_queue ();
-
-  // Copy the message.
-  ACE_Message_Block *copy = message_block->clone ();
-
-  // Enqueue current message.
-  result = buffering_queue.enqueue_tail (copy);
-
-  // Enqueuing error.
-  if (result == -1)
-    {
-      // Eliminate the copy.
-      copy->release ();
+  return 0;
+}
 
-      // Return error.
-      return -1;
-    }
+#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-  // Check if upper bound has been reached.
-  if (this->buffering_constraints_reached (transport,
-                                           stub,
-                                           buffering_queue))
-    {
-      return transport.send_buffered_messages (max_wait_time);
-    }
+// ****************************************************************
 
-  // Hoping that this return value is meaningful or at least
-  // acceptable.
-  return message_block->total_length ();
+int
+TAO_Eager_Buffering_Sync_Strategy::
+    must_queue (int)
+{
+  return 1;
 }
 
 int
-TAO_Eager_Buffering_Sync_Strategy::buffering_constraints_reached (TAO_Transport &transport,
-                                                                  TAO_Stub &stub,
-                                                                  TAO_Transport_Buffering_Queue &buffering_queue)
+TAO_Eager_Buffering_Sync_Strategy::
+    buffering_constraints_reached (TAO_Stub *stub,
+                                   size_t msg_count,
+                                   size_t total_bytes,
+                                   int &set_timer,
+                                   ACE_Time_Value &interval)
 {
   TAO_Buffering_Constraint_Policy *buffering_constraint_policy =
-    stub.buffering_constraint ();
+    stub->buffering_constraint ();
 
   if (buffering_constraint_policy == 0)
     return 1;
@@ -147,86 +65,53 @@ TAO_Eager_Buffering_Sync_Strategy::buffering_constraints_reached (TAO_Transport
   TAO::BufferingConstraint buffering_constraint;
   buffering_constraint_policy->get_buffering_constraint (buffering_constraint);
 
-  this->timer_check (transport,
-                     buffering_constraint);
+  this->timer_check (buffering_constraint, set_timer, interval);
 
   if (buffering_constraint.mode == TAO::BUFFER_FLUSH)
     return 1;
 
   if (ACE_BIT_ENABLED (buffering_constraint.mode,
-                       TAO::BUFFER_MESSAGE_COUNT) &&
-      buffering_queue.message_count () >= buffering_constraint.message_count)
+                       TAO::BUFFER_MESSAGE_COUNT)
+      && msg_count >= buffering_constraint.message_count)
     return 1;
 
   if (ACE_BIT_ENABLED (buffering_constraint.mode,
-                       TAO::BUFFER_MESSAGE_BYTES) &&
-      buffering_queue.message_length () >= buffering_constraint.message_bytes)
+                       TAO::BUFFER_MESSAGE_BYTES)
+      && total_bytes >= buffering_constraint.message_bytes)
     return 1;
 
   return 0;
 }
 
 void
-TAO_Eager_Buffering_Sync_Strategy::timer_check (TAO_Transport &transport,
-                                                const TAO::BufferingConstraint &buffering_constraint)
+TAO_Eager_Buffering_Sync_Strategy::
+    timer_check (const TAO::BufferingConstraint &buffering_constraint,
+                 int &set_timer,
+                 ACE_Time_Value &interval)
 {
-  if (transport.buffering_timer_id () != 0)
+  if (!ACE_BIT_ENABLED (buffering_constraint.mode,
+                        TAO::BUFFER_TIMEOUT))
     {
-      //
-      // There is a timeout set by us, though we are not sure if we
-      // still need the timeout or if the timeout value is correct or
-      // not.
-      //
-
-      // Get our reactor.
-      ACE_Reactor *reactor = transport.orb_core ()->reactor ();
-
-      if (!ACE_BIT_ENABLED (buffering_constraint.mode,
-                            TAO::BUFFER_TIMEOUT))
-        {
-          // Timeouts are no longer needed.  Cancel existing one.
-          reactor->cancel_timer (transport.buffering_timer_id ());
-          transport.buffering_timer_id (0);
-        }
-      else
-        {
-          ACE_Time_Value timeout =
-            this->time_conversion (buffering_constraint.timeout);
-
-          if (transport.buffering_timeout_value () == timeout)
-            {
-              // Timeout value is the same, nothing to be done.
-            }
-          else
-            {
-              // Timeout value has changed, reset the old timer.
-              reactor->reset_timer_interval (transport.buffering_timer_id (),
-                                             timeout);
-            }
-        }
+      set_timer = 0;
+      return;
     }
-  else if (ACE_BIT_ENABLED (buffering_constraint.mode,
-                            TAO::BUFFER_TIMEOUT))
-    {
-      // We didn't have timeouts before, but we want them now.
-      ACE_Time_Value timeout =
-        this->time_conversion (buffering_constraint.timeout);
 
-      // Get our reactor.
-      ACE_Reactor *reactor = transport.orb_core ()->reactor ();
+  ACE_Time_Value timeout =
+    this->time_conversion (buffering_constraint.timeout);
 
-      long timer_id = reactor->schedule_timer (transport.event_handler (),
-                                               0,
-                                               timeout,
-                                               timeout);
-
-      transport.buffering_timer_id (timer_id);
-      transport.buffering_timeout_value (timeout);
+  if (interval == timeout)
+    {
+      set_timer = 0;
+      return;
     }
+
+  set_timer = 1;
+  interval = timeout;
 }
 
 ACE_Time_Value
-TAO_Eager_Buffering_Sync_Strategy::time_conversion (const TimeBase::TimeT &time)
+TAO_Eager_Buffering_Sync_Strategy::
+    time_conversion (const TimeBase::TimeT &time)
 {
   TimeBase::TimeT seconds = time / 10000000u;
   TimeBase::TimeT microseconds = (time % 10000000u) / 10;
@@ -234,4 +119,14 @@ TAO_Eager_Buffering_Sync_Strategy::time_conversion (const TimeBase::TimeT &time)
                          ACE_U64_TO_U32 (microseconds));
 }
 
+// ****************************************************************
+
+int
+TAO_Delayed_Buffering_Sync_Strategy::
+    must_queue (int queue_empty)
+{
+  // If the queue is empty we want to send immediately
+  return !queue_empty;
+}
+
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Sync_Strategies.h b/TAO/tao/Sync_Strategies.h
index 5b273dac3e5..b5f2ae4b2ee 100644
--- a/TAO/tao/Sync_Strategies.h
+++ b/TAO/tao/Sync_Strategies.h
@@ -27,24 +27,57 @@
 #include "tao/Transport.h"
 #include "tao/TAOC.h"
 
+/// Define the interface for the Queueing Strategy
+/**
+ * The low-level I/O components in the ORB use this strategy to
+ * determine when messages must be queued, immediately sent or
+ * flushed.
+ *
+ * The strategy isolates this low-level components from the higher
+ * level strategies used by the application developer.
+ *
+ * @todo The class name (Sync_Strategy) is inherited from the policies
+ * (SyncScopePolicy), but Queueing_Strategy probably captures its
+ * intent better.  It should be changed in a future revision of the
+ * ORB.
+ */
 class TAO_Export TAO_Sync_Strategy
 {
 public:
+  /// Destructor
   virtual ~TAO_Sync_Strategy (void);
 
-  virtual ssize_t send (TAO_Transport &transport,
-                        TAO_Stub &stub,
-                        const ACE_Message_Block *message_block,
-                        const ACE_Time_Value *max_wait_time) = 0;
+  /// Return 1 if a message must be queued
+  virtual int must_queue (int queue_empty) = 0;
+
+  /// Return 1 if it is time to start
+  /**
+   * @param stub The object used to make the request, this is used to
+   *        obtain the policies currently in effect for the request
+   * @param msg_count The number of messages currently queued
+   * @param total_bytes Number of bytes currently queued
+   * @param set_timer Returns 1 if a timer should be set to drain the
+   *        queue
+   * @param interval If set_timer returns 1, this parameter contains
+   *        the timer interval
+   */
+  virtual int buffering_constraints_reached (TAO_Stub *stub,
+                                             size_t msg_count,
+                                             size_t total_bytes,
+                                             int &set_timer,
+                                             ACE_Time_Value &interval) = 0;
 };
 
 class TAO_Export TAO_Transport_Sync_Strategy : public TAO_Sync_Strategy
 {
 public:
-  ssize_t send (TAO_Transport &transport,
-                TAO_Stub &stub,
-                const ACE_Message_Block *message_block,
-                const ACE_Time_Value *max_wait_time);
+  virtual int must_queue (int queue_empty);
+
+  virtual int buffering_constraints_reached (TAO_Stub *stub,
+                                             size_t msg_count,
+                                             size_t total_bytes,
+                                             int &set_timer,
+                                             ACE_Time_Value &interval);
 };
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
@@ -52,28 +85,39 @@ public:
 class TAO_Export TAO_Eager_Buffering_Sync_Strategy : public TAO_Sync_Strategy
 {
 public:
-  ssize_t send (TAO_Transport &transport,
-                TAO_Stub &stub,
-                const ACE_Message_Block *message_block,
-                const ACE_Time_Value *max_wait_time);
-
-  virtual int buffering_constraints_reached (TAO_Transport &transport,
-                                             TAO_Stub &stub,
-                                             TAO_Transport_Buffering_Queue &buffering_queue);
-
-  void timer_check (TAO_Transport &transport,
-                    const TAO::BufferingConstraint &buffering_constraint);
-
+  virtual int must_queue (int queue_empty);
+
+  virtual int buffering_constraints_reached (TAO_Stub *stub,
+                                             size_t msg_count,
+                                             size_t total_bytes,
+                                             int &set_timer,
+                                             ACE_Time_Value &interval);
+
+private:
+  /// Check if the buffering constraint includes any timeouts and
+  /// compute the right timeout interval if needed.
+  /**
+   * @param buffering_constraint The constraints defined by the
+   *        application
+   * @param set_timer Return 1 if the timer should be set
+   * @param interval Return the timer interval value
+   */
+  void timer_check (const TAO::BufferingConstraint &buffering_constraint,
+                    int &set_timer,
+                    ACE_Time_Value &interval);
+
+  /// Convert from standard CORBA time units to seconds/microseconds.
   ACE_Time_Value time_conversion (const TimeBase::TimeT &time);
 };
 
+/// Delay the buffering decision until the transport blocks
+/**
+ * If the queue is empty the transport will try to send immediately.
+ */
 class TAO_Export TAO_Delayed_Buffering_Sync_Strategy : public TAO_Eager_Buffering_Sync_Strategy
 {
 public:
-  ssize_t send (TAO_Transport &transport,
-                TAO_Stub &stub,
-                const ACE_Message_Block *message_block,
-                const ACE_Time_Value *max_wait_time);
+  virtual int must_queue (int queue_empty);
 };
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 1e7007991cf..9b379316e0e 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -3,6 +3,7 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

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

 

 CFG=TAO DLL - Win32 Debug

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

@@ -17,6 +18,8 @@ CFG=TAO DLL - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

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

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

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

 !MESSAGE "TAO DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

@@ -27,11 +30,68 @@ CFG=TAO DLL - Win32 Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ""

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

 CPP=cl.exe

+# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD nologo MT Gt0 W3 GX O2 I "../../" /c

+# ADD 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"

 RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

+# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

+

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

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ""

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /I "../" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd nologo Gt0 W3 GX Zi Od Gy I "../../" /c

+# ADD 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"

+RSC=rc.exe

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

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

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

 

-!IF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -45,12 +105,15 @@ RSC=rc.exe
 # PROP Intermediate_Dir "DLL\MFC_Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

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

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -76,12 +139,15 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\MFC_Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

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

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -104,11 +170,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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /I "../" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -132,11 +201,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../../" /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+RSC=rc.exe

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

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

 BSC32=bscmake.exe

@@ -150,6 +222,8 @@ LINK32=link.exe
 

 # Begin Target

 

+# Name "TAO DLL - Win32 Alpha Release"

+# Name "TAO DLL - Win32 Alpha Debug"

 # Name "TAO DLL - Win32 MFC Release"

 # Name "TAO DLL - Win32 MFC Debug"

 # Name "TAO DLL - Win32 Release"

@@ -160,714 +234,3498 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\Abstract_Servant_Base.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Acceptor_Filter.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Acceptor_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Adapter.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Any.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\append.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_Invocation.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_Reply_Dispatcher.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\Asynch_Timeout_Handler.cpp

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Base_Connection_Property.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\BiDir_ORBInitializer.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\BiDir_Policy_i.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\BiDir_PolicyFactory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\BiDirPolicyC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Bind_Dispatcher_Guard.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Block_Flushing_Strategy.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\BoundsC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Buffering_Constraint_Policy.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cache_Entries.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\CDR_Encaps_Codec.cpp

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Cleanup_Func_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Client_Priority_Policy.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Client_Strategy_Factory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ClientRequestInfo.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\CodecFactory.cpp

-# End Source File

-# Begin Source File

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

 

-SOURCE=.\CodecFactory_ORBInitializer.cpp

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connection_Cache_Manager.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connection_Descriptor_Interface.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connection_Handler.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connector_Impl.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Connector_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CONV_FRAMEC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CONV_FRAMES.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_String.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\corbafwd.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBALOC_Parser.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBANAME_Parser.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CurrentC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\debug.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\default_client.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Default_Protocols_Hooks.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\default_resource.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\default_server.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL_ORB.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL_Parser.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DomainC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Adapter.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DynamicC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Encodable.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Endpoint.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Environment.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Exception.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Exclusive_TMS.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Fault_Tolerance_Service.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Parser.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Flushing_Strategy.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Base.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Generator_Parser.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Generator_Parser_10.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Generator_Parser_11.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Generator_Parser_12.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Generator_Parser_Impl.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Handler.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Lite.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_Locate_Header.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Message_State.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOP_Utils.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\GIOPC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IFR_Client_Adapter.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IFR_TypeCodes.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Acceptor.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Connection_Handler.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Connector.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Endpoint.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\iiop_endpoints.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Factory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Lite_Factory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Profile.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOP_Transport.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IIOPC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Interceptor_List.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Invocation.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Invocation_Endpoint_Selectors.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOPC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\IOPS.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOR_Parser.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IORInfo.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Leader_Follower.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LocalObject.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Managed_Types.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Marshal.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Message_Sent_Callback.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Messaging_ORBInitializer.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Messaging_Policy_i.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Messaging_PolicyFactory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MessagingC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MProfile.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Muxed_TMS.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\NVList.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_KeyC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Loader.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Proxy_Broker.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Proxy_Impl.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Ref_Table.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ObjectIDList.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OctetSeqC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\operation_details.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ORB.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ORB_Core.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ORB_Table.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ORBInitializer_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ORBInitInfo.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\params.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Parser_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pluggable.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pluggable_Messaging.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pluggable_Messaging_Utils.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Policy_Manager.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PolicyC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PolicyFactory_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PollableC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\PollableS.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pool_Per_Endpoint.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PortableInterceptor.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PortableInterceptorC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Principal.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Mapping.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Mapping_Manager.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Private_Connection_Descriptor.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Profile.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Protocol_Factory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Protocols_Hooks.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Queued_Message.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactive_Flushing_Strategy.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor_Registry.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Object_Proxy_Broker.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Object_Proxy_Impl.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reply_Dispatcher.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RequestInfo_Util.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Resource_Factory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_Current.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_Invocation_Endpoint_Selectors.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_Mutex.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_ORB.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_ORB_Loader.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_ORBInitializer.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_Policy_i.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_PolicyFactory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RT_Protocols_Hooks.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RTCORBAC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\RTCORBAS.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\RTCORBAS_T.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sequence.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Server_Strategy_Factory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Callbacks.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Context.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Services.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Services_Activate.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Single_Reactor.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\skip.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\StringSeqC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stub.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sync_Strategies.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_Reply_Dispatcher.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Tagged_Components.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Tagged_Profile.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TAO_Internal.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

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

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

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

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TAO_Server_Request.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TAO_Singleton_Manager.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TAOC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\TAOS.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\target_specification.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeBaseC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TimeBaseS.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Transport.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Transport_Mux_Strategy.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typecode.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typecode_Constants.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ValueBase.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ValueFactory.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ValueFactory_Map.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Wait_On_Leader_Follower.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Wait_On_Reactor.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Wait_On_Read.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Wait_Strategy.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WrongTransactionC.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -907,10 +3765,6 @@ SOURCE=.\Asynch_Reply_Dispatcher.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Timeout_Handler.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Base_Connection_Property.h

 # End Source File

 # Begin Source File

@@ -935,6 +3789,10 @@ SOURCE=.\Bind_Dispatcher_Guard.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Block_Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\BoundsC.h

 # End Source File

 # Begin Source File

@@ -951,10 +3809,6 @@ SOURCE=.\cdr.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Encaps_Codec.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Cleanup_Func_Registry.h

 # End Source File

 # Begin Source File

@@ -975,14 +3829,6 @@ SOURCE=.\ClientRequestInfo.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CodecFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CodecFactory_ORBInitializer.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Connection_Cache_Manager.h

 # End Source File

 # Begin Source File

@@ -1107,6 +3953,10 @@ SOURCE=.\FILE_Parser.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\giop.h

 # End Source File

 # Begin Source File

@@ -1263,6 +4113,14 @@ SOURCE=.\marshal.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Message_Sent_Callback.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_ORBInitializer.h

 # End Source File

 # Begin Source File

@@ -1443,6 +4301,18 @@ SOURCE=.\Protocols_Hooks.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Queued_Message.inl

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactive_Flushing_Strategy.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.h

 # End Source File

 # Begin Source File

@@ -2272,6 +5142,21 @@ SOURCE=.\tao.rc
 # Begin Source File

 

 SOURCE=.\TAO_Singleton.cpp

+

+!IF  "$(CFG)" == "TAO DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "TAO DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index a40a50a230e..b24df416186 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -9,6 +9,7 @@
 
 #include "TAOC.h"
 
+#include "tao/TAOS.h"
 #include "tao/Typecode.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 3f64c5a1cc8..f1f24e4dd47 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -123,10 +123,6 @@ SOURCE=.\Asynch_Reply_Dispatcher.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Timeout_Handler.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Base_Connection_Property.h

 # End Source File

 # Begin Source File

@@ -167,10 +163,6 @@ SOURCE=.\cdr.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Encaps_Codec.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Cleanup_Func_Registry.h

 # End Source File

 # Begin Source File

@@ -187,14 +179,6 @@ SOURCE=.\ClientRequestInfo.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CodecFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CodecFactory_ORBInitializer.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Connection_Cache_Manager.h

 # End Source File

 # Begin Source File

@@ -467,6 +451,10 @@ SOURCE=.\marshal.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_ORBInitializer.h

 # End Source File

 # Begin Source File

@@ -647,6 +635,10 @@ SOURCE=.\Protocols_Hooks.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.h

 # End Source File

 # Begin Source File

@@ -1179,6 +1171,10 @@ SOURCE=.\marshal.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_Policy_i.i

 # End Source File

 # Begin Source File

@@ -1315,6 +1311,10 @@ SOURCE=.\Profile.i
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.inl

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.i

 # End Source File

 # Begin Source File

@@ -1519,10 +1519,6 @@ SOURCE=.\Asynch_Reply_Dispatcher.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_Timeout_Handler.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Base_Connection_Property.cpp

 # End Source File

 # Begin Source File

@@ -1563,10 +1559,6 @@ SOURCE=.\CDR.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Encaps_Codec.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Cleanup_Func_Registry.cpp

 # End Source File

 # Begin Source File

@@ -1583,14 +1575,6 @@ SOURCE=.\ClientRequestInfo.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CodecFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CodecFactory_ORBInitializer.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Connection_Cache_Manager.cpp

 # End Source File

 # Begin Source File

@@ -1615,6 +1599,10 @@ SOURCE=.\CONV_FRAMEC.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\CONV_FRAMES.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\CORBA_String.cpp

 # End Source File

 # Begin Source File

@@ -1815,6 +1803,10 @@ SOURCE=.\IOPC.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\IOPS.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\IOR_Parser.cpp

 # End Source File

 # Begin Source File

@@ -1839,6 +1831,10 @@ SOURCE=.\Marshal.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Message_Sent_Callback.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Messaging_ORBInitializer.cpp

 # End Source File

 # Begin Source File

@@ -1959,6 +1955,10 @@ SOURCE=.\PollableC.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\PollableS.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Pool_Per_Endpoint.cpp

 # End Source File

 # Begin Source File

@@ -1999,6 +1999,10 @@ SOURCE=.\Protocols_Hooks.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Queued_Message.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Reactor_Registry.cpp

 # End Source File

 # Begin Source File

@@ -2063,6 +2067,14 @@ SOURCE=.\RTCORBAC.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\RTCORBAS.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\RTCORBAS_T.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Sequence.cpp

 # End Source File

 # Begin Source File

@@ -2135,6 +2147,10 @@ SOURCE=.\TAOC.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\TAOS.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\target_specification.cpp

 # End Source File

 # Begin Source File

diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h
index aecbda08ada..620ad39e385 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/GIOPC.h"
-#include "ace/SString.h"
+
 
 /**
  * @class TAO_Tagged_Profile
@@ -64,15 +64,8 @@ public:
   /// get the tagged_profile
   IOP::TaggedProfile &tagged_profile (void);
 
-  /// Get/Set the profile index, that needs to be used in the
-  /// sequnce of TaggedProfiles contained  IOP::IOR that is
-  /// receivedfrom the client.
-  CORBA::ULong profile_index (void);
-  void profile_index (CORBA::ULong ind);
-
-  /// Accessor to the type_id contained in the IOP::IOR received from
-  /// the client.
-  ACE_CString &type_id (void);
+  /// get the addressing info
+  GIOP::IORAddressingInfo &addressing_info (void);
 
   /// Extract the object key from the TaggedProfile and store it in
   /// <object_key_>
@@ -88,35 +81,12 @@ private:
   /// The Tagged profile. This class would have the Tagged Profile
   IOP::TaggedProfile profile_;
 
-  /*
-   * The GIOP::IORAddressingInfo is defined as follows
-   *   struct IORAddressingInfo
-   *     {
-   *       unsigned long selected_profile_index;
-   *       IOP::IOR ior;
-   *     };
-   *
-   * and the IOP::IOR is defined to be
-   *   struct IOR
-   *      {
-   *        string type_id;
-   *        sequence<TaggedProfile>   profiles;
-   *      };
-   * The mapping for the type_id of type string is TAO_String_Manager
-   * which does lot of bad things like allocation on construction and
-   * a deallocation on destruction. This is bad along the critical
-   * path. So we will store this nested structure ripped open with the
-   * profile_index and the type_id with the TaggedProfile that is
-   * pointed to.
-   */
-
-  /// The profile index incase we receive a GIOP::IORAddressingInfo
-  /// information
-  CORBA::ULong profile_index_;
-
-  /// The type_id in the IOP::IOR incase we receive the
-  /// GIOP::IORAddressingInfo information.
-  ACE_CString type_id_;
+  /// The addressing info
+  GIOP::IORAddressingInfo addr_info_;
+
+  // The above two declarations are not used in TAO as on date. It is
+  // here so that we can use this anyday. The object_key extracted
+  // from these would still be available in <object_key_>.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Tagged_Profile.i b/TAO/tao/Tagged_Profile.i
index 99345085b95..cccf1d21463 100644
--- a/TAO/tao/Tagged_Profile.i
+++ b/TAO/tao/Tagged_Profile.i
@@ -1,13 +1,12 @@
 // -*- C++ -*-
 // $Id$
 
-ACE_INLINE
+ACE_INLINE 
 TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core),
     object_key_ (),
     profile_ (),
-    profile_index_ (0),
-    type_id_ ()
+    addr_info_ ()
 {
 
 }
@@ -40,19 +39,8 @@ TAO_Tagged_Profile::tagged_profile (void)
   return this->profile_;
 }
 
-ACE_INLINE CORBA::ULong
-TAO_Tagged_Profile::profile_index (void)
+ACE_INLINE GIOP::IORAddressingInfo &
+TAO_Tagged_Profile::addressing_info (void)
 {
-  return this->profile_index_;
-}
-ACE_INLINE void
-TAO_Tagged_Profile::profile_index (CORBA::ULong ind)
-{
-  this->profile_index_ = ind;
-}
-
-ACE_INLINE ACE_CString &
-TAO_Tagged_Profile::type_id (void)
-{
-  return this->type_id_;
+  return this->addr_info_;
 }
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index b864d7438fe..3ea71c3f722 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -17,6 +17,7 @@
 
 #include "tao/TimeBaseC.h"
 
+#include "tao/TimeBaseS.h"
 #include "tao/Typecode.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 4abed277aaa..a40311a02f7 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -10,6 +10,11 @@
 #include "Transport_Mux_Strategy.h"
 #include "Stub.h"
 #include "Sync_Strategies.h"
+#include "Queued_Message.h"
+#include "Flushing_Strategy.h"
+#include "debug.h"
+
+#include "ace/Message_Block.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Transport.inl"
@@ -19,12 +24,13 @@ ACE_RCSID(tao, Transport, "$Id$")
 
 // Constructor.
 TAO_Transport::TAO_Transport (CORBA::ULong tag,
-			      TAO_ORB_Core *orb_core)
+                              TAO_ORB_Core *orb_core)
   : tag_ (tag)
   , orb_core_ (orb_core)
-  , buffering_queue_ (0)
-  , buffering_timer_id_	(0)
-  , bidirectional_flag_	(-1)
+  , bidirectional_flag_ (-1)
+  , head_ (0)
+  , tail_ (0)
+  , current_message_ (0)
 {
   TAO_Client_Strategy_Factory *cf =
     this->orb_core_->client_factory ();
@@ -32,7 +38,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
   // Create WS now.
   this->ws_ = cf->create_wait_strategy (this);
 
-  // Create TMS	now.
+  // Create TMS now.
   this->tms_ = cf->create_transport_mux_strategy (this);
 }
 
@@ -44,158 +50,366 @@ TAO_Transport::~TAO_Transport (void)
   delete this->tms_;
   this->tms_ = 0;
 
-  delete this->buffering_queue_;
+  //  delete this->buffering_queue_;
+
+  TAO_Queued_Message *i = this->head_;
+  while (i != 0)
+    {
+      // @@ This is a good point to insert a flag to indicate that a
+      // CloseConnection message was successfully received.
+      i->connection_closed ();
+
+      TAO_Queued_Message *tmp = i;
+      i = i->next ();
+
+      tmp->destroy ();
+    }
 }
 
-ssize_t
-TAO_Transport::send_or_buffer (TAO_Stub	*stub,
-			       int two_way,
-			       const ACE_Message_Block *message_block,
-			       const ACE_Time_Value *max_wait_time)
+int
+TAO_Transport::handle_output ()
 {
-  if (stub == 0	|| two_way)
-    return this->send (message_block, max_wait_time);
+  if (TAO_debug_level > 4)
+    {
+      ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - handle_output\n"));
+    }
+  // The reactor is asking us to send more data, first check if
+  // there is a current message that needs more sending:
+  int result = this->send_current_message ();
+
+  while (result > 0)
+    {
+      // ... there is no current message or it was completely
+      // sent, time to check the queue....
+      result = this->dequeue_next_message ();
+      if (result == 1)
+        {
+          (void) this->cancel_output ();
+          return 0;
+        }
+      result = this->send_current_message ();
+    }
+  // else { there was an error.... }
 
-  TAO_Sync_Strategy &sync_strategy = stub->sync_strategy ();
+  if (result == -1)
+    return -1; // There was an error, return -1 so the Reactor
 
-  return sync_strategy.send (*this,
-			     *stub,
-			     message_block,
-			     max_wait_time);
+  // There is no more data or socket blocked, just return 0
+  /* if (result >= 0) */
+  return 0; 
 }
 
-ssize_t
-TAO_Transport::send_buffered_messages (const ACE_Time_Value *max_wait_time)
+int
+TAO_Transport::send_message_block_chain (const ACE_Message_Block *message_block,
+                                         size_t &bytes_transferred,
+                                         ACE_Time_Value *timeout)
 {
-  // Make sure we have a buffering queue and there are messages	in it.
-  if (this->buffering_queue_ ==	0 ||
-      this->buffering_queue_->is_empty ())
-    return 1;
+  bytes_transferred = 0;
+
+  iovec iov[IOV_MAX];
+  int iovcnt = 0;
+
+  while (message_block != 0)
+    {
+      size_t message_block_length =
+        message_block->length ();
+
+      // Check if this block has any data to be sent.
+      if (message_block_length > 0)
+        {
+              // Collect the data in the iovec.
+          iov[iovcnt].iov_base = message_block->rd_ptr ();
+          iov[iovcnt].iov_len  = message_block_length;
+
+          // Increment iovec counter.
+          iovcnt++;
+
+          // The buffer is full make a OS call.  @@ TODO find a way to
+          // find IOV_MAX for platforms that do not define it rather
+          // than simply setting IOV_MAX to some arbitrary value such
+          // as 16.
+          if (iovcnt == IOV_MAX)
+            {
+              size_t current_transfer = 0;
+
+              ssize_t result =
+                this->send (iov, iovcnt, current_transfer, timeout);
+
 
-  // Get the first message from	the queue.
-  ACE_Message_Block *queued_message = 0;
-  ssize_t result = this->buffering_queue_->peek_dequeue_head (queued_message);
+              // Errors.
+              if (result == -1 || result == 0)
+                return result;
 
-  // @@	What to	do here	on failures?
-  ACE_ASSERT (result !=	-1);
+              // Add to total bytes transferred.
+              bytes_transferred += current_transfer;
 
-  // Actual network send.
-  size_t bytes_transferred = 0;
-  result = this->send (queued_message,
-		       max_wait_time,
-		       &bytes_transferred);
+              // Reset iovec counter.
+              iovcnt = 0;
+            }
+        }
 
-  // Cannot send completely: timed out.
-  if (result ==	-1 &&
-      errno == ETIME)
+      // Select the next message block in the chain.
+      message_block = message_block->cont ();
+    }
+
+  // Check for remaining buffers to be sent.  This will happen when
+  // IOV_MAX is not a multiple of the number of message blocks.
+  if (iovcnt != 0)
     {
-      if (bytes_transferred > 0)
-	{
-	  // If	successful in sending some of the data,	reset the
-	  // queue appropriately.
-	  this->reset_queued_message (queued_message,
-				      bytes_transferred);
-
-	  // Indicate some success.
-	  return bytes_transferred;
-	}
-
-      // Since we queue	up the message,	this is	not an error.  We can
-      // try next time around.
+      size_t current_transfer = 0;
+
+      ssize_t result =
+        this->send (iov, iovcnt, current_transfer, timeout);
+      // Errors.
+      if (result == -1 || result == 0)
+        return result;
+
+      // Add to total bytes transferred.
+      bytes_transferred += current_transfer;
+    }
+
+  // Return total bytes transferred.
+  return bytes_transferred;
+}
+
+int
+TAO_Transport::send_current_message (void)
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_mutex_, -1);
+
+  if (this->current_message_ == 0)
+    return 1;
+
+  size_t bytes_transferred;
+
+  ssize_t retval =
+    this->send_message_block_chain (this->current_message_->mb (),
+                                    bytes_transferred);
+  if (retval == 0)
+    {
+      // The connection was closed, return -1 to have the Reactor
+      // close this transport and event handler
+      return -1;
+    }
+
+  // Because there can be a partial transfer we need to adjust the
+  // number of bytes sent.
+  this->current_message_->bytes_transferred (bytes_transferred);
+  if (this->current_message_->done ())
+    {
+      // Remove the current message....
+      // @@ We should be using a pool for these guys!
+      this->current_message_->destroy ();
+
+      this->current_message_ = 0;
+
+      if (retval == -1)
+        return -1;
+
       return 1;
     }
 
-  // EOF or other errors.
-  if (result ==	-1 ||
-      result ==	0)
+  if (retval == -1)
     {
-      this->dequeue_all	();
+      // ... timeouts and flow control are not real errors, the
+      // connection is still valid and we must continue sending the
+      // current message ...
+      if (errno == EWOULDBLOCK || errno == ETIME)
+        return 0;
+
       return -1;
     }
 
-  // If	successful in sending data, reset the queue appropriately.
-  this->reset_queued_message (queued_message,
-			      bytes_transferred);
+  return 0;
+}
 
-  // Everything	was successfully delivered.
-  return result;
+int
+TAO_Transport::dequeue_next_message (void)
+{
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_mutex_, -1);
+  if (this->head_ == 0)
+    return 1;
+
+  this->current_message_ = this->head_;
+  this->head_->remove_from_list (this->head_, this->tail_);
+
+  return 0;
 }
 
-void
-TAO_Transport::reset_sent_message (ACE_Message_Block *message_block,
-				   size_t bytes_delivered)
+int
+TAO_Transport::cancel_output (void)
 {
-  this->reset_message (message_block,
-		       bytes_delivered,
-		       0);
+  return 0;
 }
 
-void
-TAO_Transport::reset_queued_message (ACE_Message_Block *message_block,
-				     size_t bytes_delivered)
+int
+TAO_Transport::schedule_output (void)
 {
-  this->reset_message (message_block,
-		       bytes_delivered,
-		       1);
+  return 0;
 }
 
-void
-TAO_Transport::reset_message (ACE_Message_Block	*message_block,
-			      size_t bytes_delivered,
-			      int queued_message)
+int
+TAO_Transport::send_message_i (TAO_Stub *stub,
+                               int twoway_flag,
+                               const ACE_Message_Block *message_block,
+                               ACE_Time_Value *max_wait_time)
 {
-  while	(bytes_delivered != 0)
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_mutex_, -1);
+
+  int queue_empty = (this->head_ == 0);
+
+  // Let's figure out if the message should be queued without trying
+  // to send first:
+  int non_queued_message =
+    (this->current_message_ == 0) // There is an outgoing message already
+    && (twoway_flag
+        || !stub->sync_strategy ().must_queue (queue_empty));
+
+  TAO_Queued_Message *queued_message = 0;
+  if (non_queued_message == 0)
+    {
+      // ... simply queue the message ...
+      size_t length = message_block->total_length ();
+      ACE_Message_Block *copy =
+        new ACE_Message_Block (length);
+      for (const ACE_Message_Block *i = message_block;
+           i != 0;
+           i = i->cont ())
+        copy->copy (i->rd_ptr (), i->length ());
+
+      queued_message =
+        new TAO_Queued_Message (copy, 1);
+      queued_message->push_back (this->head_, this->tail_);
+    }
+  else
+    {
+      // ... in this case we must try to send the message first ...
+
+      size_t byte_count;
+
+      // @@ I don't think we want to hold the mutex here, however if
+      // we release it we need to recheck the status of the transport
+      // after we return... once I understand the final form for this
+      // code I will re-visit this decision
+      ssize_t n = this->send_message_block_chain (message_block,
+                                                  byte_count,
+                                                  max_wait_time);
+      if (n == 0)
+        return -1;
+      else if (n == -1)
+        {
+          if (errno == EWOULDBLOCK)
+            {
+              return this->schedule_output ();
+            }
+          return -1;
+        }
+
+      // ... let's figure out if the complete message was sent ...
+      if (message_block->total_length () == byte_count)
+        {
+          // Done, just return.  Notice that there are no allocations
+          // or copies up to this point (though some fancy calling
+          // back and forth).
+          // This is the common case for the critical path, it should
+          // be fast.
+          return 0;
+        }
+
+      // ... the message was only partially sent, schedule reactive
+      // output...
+      this->schedule_output ();
+
+      // ... and set it as the current message ...
+      if (twoway_flag)
+        {
+          // ... we are going to block, so there is no need to clone
+          // the message block...
+          queued_message =
+            new TAO_Queued_Message (
+                    ACE_const_cast(ACE_Message_Block*,message_block),
+                    0);
+        }
+      else
+        {
+          size_t length = message_block->total_length ();
+          ACE_Message_Block *copy =
+            new ACE_Message_Block (length);
+          for (const ACE_Message_Block *i = message_block;
+               i != 0;
+               i = i->cont ())
+            copy->copy (i->rd_ptr (), i->length ());
+          
+          queued_message =
+            new TAO_Queued_Message (copy, 1);
+        }
+      // @@ Revisit message queue allocations
+
+      queued_message->bytes_transferred (byte_count);
+      this->current_message_ = queued_message;
+    }
+
+  // ... two choices, this is a twoway request or not, if it is
+  // then we must only return once the complete message has been
+  // sent:
+
+  TAO_Flushing_Strategy *flushing_strategy =
+    this->orb_core ()->flushing_strategy ();
+  if (twoway_flag)
     {
-      // Our current message block chain.
-      ACE_Message_Block	*current_message_block = message_block;
-
-      int completely_delivered_current_message_block_chain = 0;
-
-      while (current_message_block != 0	&&
-	     bytes_delivered !=	0)
-	{
-	  size_t current_message_block_length =
-	    current_message_block->length ();
-
-	  int completely_delivered_current_message_block =
-	    bytes_delivered >= current_message_block_length;
-
-	  size_t adjustment_size =
-	    ACE_MIN (current_message_block_length, bytes_delivered);
-
-	  // Reset according to	send size.
-	  current_message_block->rd_ptr	(adjustment_size);
-
-	  // If	queued message,	adjust the queue.
-	  if (queued_message)
-	    // Hand adjust <message_length>.
-	    this->buffering_queue_->message_length (
-	      this->buffering_queue_->message_length ()	- adjustment_size);
-
-	  // Adjust <bytes_delivered>.
-	  bytes_delivered -= adjustment_size;
-
-	  if (completely_delivered_current_message_block)
-	    {
-	      // Next message block in the continuation	chain.
-	      current_message_block = current_message_block->cont ();
-
-	      if (current_message_block	== 0)
-		completely_delivered_current_message_block_chain = 1;
-	    }
-	}
-
-      if (completely_delivered_current_message_block_chain)
-	{
-	  // Go	to the next message block chain.
-	  message_block	= message_block->next ();
-
-	  // If	queued message,	adjust the queue.
-	  if (queued_message)
-	    // Release this <current_message_block>.
-	    this->dequeue_head ();
-	}
+      // Release the mutex, other threads may modify the queue as we
+      // block for a long time writing out data.
+      ace_mon.release ();
+      int result = flushing_strategy->flush_message (this, queued_message);
+      queued_message->destroy ();
+      return result;
     }
+
+  // ... this is not a twoway.  We must check if the buffering
+  // constraints have been reached, if so, then we should start
+  // flushing out data....
+
+  // First let's compute the size of the queue:
+  size_t msg_count = 0;
+  size_t total_bytes = 0;
+  for (TAO_Queued_Message *i = this->head_; i != 0; i = i->next ())
+    {
+      msg_count++;
+      total_bytes += i->mb ()->total_length ();
+    }
+  if (this->current_message_ != 0)
+    {
+      msg_count++;
+      total_bytes += this->current_message_->mb ()->total_length ();
+    }
+
+  int set_timer;
+  ACE_Time_Value interval;
+
+  if (stub->sync_strategy ().buffering_constraints_reached (stub,
+                                                            msg_count,
+                                                            total_bytes,
+                                                            set_timer,
+                                                            interval))
+    {
+      ace_mon.release ();
+      // @@ memory management of the queued messages is getting tricky.
+      int result = flushing_strategy->flush_message (this,
+                                                     this->tail_);
+      return result;
+    }
+  else
+    {
+      // ... it is not time to flush yet, but maybe we need to set a
+      // timer ...
+      if (set_timer)
+        {
+          // @@ We need to schedule the timer. We should also be
+          // careful not to schedule one if there is one scheduled
+          // already.
+        }
+    }
+  return 0;
 }
 
 int
@@ -205,9 +419,9 @@ TAO_Transport::idle_after_send (void)
 }
 
 int
-TAO_Transport::idle_after_reply	(void)
+TAO_Transport::idle_after_reply (void)
 {
-  return this->tms ()->idle_after_reply	();
+  return this->tms ()->idle_after_reply ();
 }
 
 TAO_SYNCH_CONDITION *
@@ -221,9 +435,3 @@ TAO_Transport::tear_listen_point_list (TAO_InputCDR &)
 {
   ACE_NOTSUP_RETURN(-1);
 }
-
-int
-TAO_Transport::reactor_signalling (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index d1ed7984260..80705fdc9de 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -1,4 +1,4 @@
-// This	may look like C, but it's really -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,17 +6,17 @@
  *
  *  $Id$
  *
- *  Define the interface for the Transport component in	TAO's
+ *  Define the interface for the Transport component in TAO's
  *  pluggable protocol framework.
  *
  *
- *  @author  Fred Kuhns	<fredk@cs.wustl.edu>
+ *  @author  Fred Kuhns <fredk@cs.wustl.edu>
  */
 //=============================================================================
 
 
-#ifndef	TAO_TRANSPORT_H
-#define	TAO_TRANSPORT_H
+#ifndef TAO_TRANSPORT_H
+#define TAO_TRANSPORT_H
 #include "ace/pre.h"
 
 #include "corbafwd.h"
@@ -24,7 +24,7 @@
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE	*/
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class TAO_ORB_Core;
 class TAO_Target_Specification;
@@ -32,89 +32,87 @@ class TAO_Operation_Details;
 class TAO_Transport_Mux_Strategy;
 class TAO_Wait_Strategy;
 
-#include "ace/Message_Queue.h"
-
-typedef	ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Transport_Buffering_Queue;
+class TAO_Queued_Message;
 
 /**
  * @class TAO_Transport
  *
- * @brief Generic definitions for the Transport	class.
+ * @brief Generic definitions for the Transport class.
  *
- * The transport object	is created in the Service handler
+ * The transport object is created in the Service handler
  * constructor and deleted in the Service Handler's destructor!!
  *
- * The main responsability of a	Transport object is to encapsulate a
+ * The main responsability of a Transport object is to encapsulate a
  * connection, and provide a transport independent way to send and
- * receive data.  Since	TAO is heavily based on	the Reactor for	all if
+ * receive data.  Since TAO is heavily based on the Reactor for all if
  * not all its I/O the Transport class is usually implemented with a
  * helper Connection Handler that adapts the generic Transport
- * interface to	the Reactor types.
+ * interface to the Reactor types.
  *
  * <H3>The outgoing data path:</H3>
  *
- * One of the responsabilities of the TAO_Transport class is to	send
- * out GIOP messages as	efficiently as possible.  In most cases
- * messages are	put out	in FIFO	order, the transport object will put
+ * One of the responsabilities of the TAO_Transport class is to send
+ * out GIOP messages as efficiently as possible.  In most cases
+ * messages are put out in FIFO order, the transport object will put
  * out the message using a single system call and return control to
  * the application.  However, for oneways and AMI requests it may be
- * more	efficient (or required if the SYNC_NONE	policy is in effect)
- * to queue the	messages until a large enough data set can be put out.
- * Also, large messages	may not	be sent	out without blocking, and in
- * some	applications blocking for I/O is unacceptable.
+ * more efficient (or required if the SYNC_NONE policy is in effect)
+ * to queue the messages until a large enough data set can be put out.
+ * Also, large messages may not be sent out without blocking, and in
+ * some applications blocking for I/O is unacceptable.
  *
  * Therefore, the Transport class may need to use a queue to
- * temporarily hold the	messages, and, in some configurations, it may
- * need	to use the Reactor to concurrently drain such queues.
+ * temporarily hold the messages, and, in some configurations, it may
+ * need to use the Reactor to concurrently drain such queues.
  *
- * <H4>Out of order messages:</H4> TAO provides	explicit policies to
- * send	'urgent' messages.  Such messages may put at the head of the
- * queue. However, they	cannot be sent immediately because the
+ * <H4>Out of order messages:</H4> TAO provides explicit policies to
+ * send 'urgent' messages.  Such messages may put at the head of the
+ * queue. However, they cannot be sent immediately because the
  * transport may already be sending another message in a reactive
  * fashion.
  *
  * Consequently, the Transport must also keep a
- * <TT>current_message</TT>, if	the current message is not null	any
- * new messages	must be	queued.	 Only once the current message is
- * completely sent we can take a message out of	the queue.
+ * <TT>current_message</TT>, if the current message is not null any
+ * new messages must be queued.  Only once the current message is
+ * completely sent we can take a message out of the queue.
  *
- * <H4>Waiting threads:</H4> One or more threads can be	blocked
+ * <H4>Waiting threads:</H4> One or more threads can be blocked
  * waiting for the connection to completely send the message.
  * The thread should return as soon as its message has been sent, so a
- * per-thread condition	is required.  This suggest that	simply using a
+ * per-thread condition is required.  This suggest that simply using a
  * ACE_Message_Queue would not be enough:  there is a significant
  * amount of ancillary information, to keep on each message that the
- * Message_Block class does not	provide	room for.
+ * Message_Block class does not provide room for.
  *
- * Also	some applications may choose, for performance reasons or to
+ * Also some applications may choose, for performance reasons or to
  * avoid complex concurrency scenarios due to nested upcalls, to
  * using blocking I/O
  * block the
  *
- * <H4>Timeouts:</H4> Some or all messages could have a	timeout	period
+ * <H4>Timeouts:</H4> Some or all messages could have a timeout period
  * attached to them.  The timeout source could either be some
- * high-level policy or	maybe some strategy to prevent denial of
- * service attacks.  In	any case the timeouts are per-message, and
- * later messages could	have shorter timeouts.
- * In fact, some kind of scheduling (such as EDF) could	be required in
+ * high-level policy or maybe some strategy to prevent denial of
+ * service attacks.  In any case the timeouts are per-message, and
+ * later messages could have shorter timeouts.
+ * In fact, some kind of scheduling (such as EDF) could be required in
  * a few applications.
  *
- * <H4>Conclusions:</H4> The outgoing data path	consist	in several
+ * <H4>Conclusions:</H4> The outgoing data path consist in several
  * components:
  *
- * - A queue of	pending	messages
+ * - A queue of pending messages
  * - A message currently being transmitted
- * - A per-transport 'send strategy' to	choose between blocking	on
- *   write, blocking on	the reactor or blockin on leader/follower.
+ * - A per-transport 'send strategy' to choose between blocking on
+ *   write, blocking on the reactor or blockin on leader/follower.
  * - A per-message 'waiting object'
  * - A per-meessage timeout
  *
- * The Transport object	provides a single method to send messages
+ * The Transport object provides a single method to send messages
  * (send_message ()).
  *
  * <H3>The incoming data path:</H3>
  *
- * @todo Document the incoming data path design	forces.
+ * @todo Document the incoming data path design forces.
  *
  *
  * <B>See Also:</B>
@@ -124,15 +122,10 @@ typedef	ACE_Message_Queue<ACE_NULL_SYNCH> TAO_Transport_Buffering_Queue;
  */
 class TAO_Export TAO_Transport
 {
-
-  friend class TAO_Transport_Sync_Strategy;
-  friend class TAO_Eager_Buffering_Sync_Strategy;
-  friend class TAO_Delayed_Buffering_Sync_Strategy;
-
 public:
-  /// default creator, requres the tag value be	supplied.
-  TAO_Transport	(CORBA::ULong tag,
-		 TAO_ORB_Core *orb_core);
+  /// default creator, requres the tag value be supplied.
+  TAO_Transport (CORBA::ULong tag,
+                 TAO_ORB_Core *orb_core);
 
   /// destructor
   virtual ~TAO_Transport (void);
@@ -140,91 +133,88 @@ public:
   /// Return the protocol tag.
   /**
    * The OMG assigns unique tags (a 32-bit unsigned number) to each
-   * protocol.	New protocol tags can be obtained free of charge from
-   * the OMG, check the	documents in corbafwd.h	for more details.
+   * protocol.  New protocol tags can be obtained free of charge from
+   * the OMG, check the documents in corbafwd.h for more details.
    */
   CORBA::ULong tag (void) const;
 
   /// Access the ORB that owns this connection.
-  TAO_ORB_Core *orb_core (void)	const;
+  TAO_ORB_Core *orb_core (void) const;
 
-  /// Get the TAO_Tranport_Mux_Strategy	used by	this object.
+  /// Get the TAO_Tranport_Mux_Strategy used by this object.
   /**
-   * The role of the TAO_Transport_Mux_Strategy	is described in	more
-   * detail in that class' documentation.  Enough is to	say that the
-   * class is used to control how many threads can have	pending
-   * requests over the same connection.	Multiplexing multiple threads
-   * over the same connection conserves	resources and is almost
+   * The role of the TAO_Transport_Mux_Strategy is described in more
+   * detail in that class' documentation.  Enough is to say that the
+   * class is used to control how many threads can have pending
+   * requests over the same connection. Multiplexing multiple threads
+   * over the same connection conserves resources and is almost
    * required for AMI, but having only one pending request per
-   * connection	is more	efficient and reduces the possibilities	of
+   * connection is more efficient and reduces the possibilities of
    * priority inversions.
    */
   TAO_Transport_Mux_Strategy *tms (void) const;
 
-  /// Return the TAO_Wait_Strategy used	by this	object.
+  /// Return the TAO_Wait_Strategy used by this object.
   /**
    * The role of the TAO_Wait_Strategy is described in more detail in
-   * that class' documentation.	Enough is to say that the ORB can wait
+   * that class' documentation. Enough is to say that the ORB can wait
    * for a reply blocking on read(), using the Reactor to wait for
    * multiple events concurrently or using the Leader/Followers
    * protocol.
    */
   TAO_Wait_Strategy *wait_strategy (void) const;
 
-  /// Send a request or	queue it for later.
+  /// Callback method to reactively drain the outgoing data queue
+  int handle_output (void);
+
+  /**
+   * Return the TSS leader follower condition variable used in the
+   * Wait Strategy. Muxed Leader Follower implementation returns a
+   * valid condition variable, others return 0.
+   */
+  virtual TAO_SYNCH_CONDITION *leader_follower_condition_variable (void);
+
+#if 0
+  /// Send a request or queue it for later.
   /**
-   * If	the right policies are set queue the request for later.
-   * Otherwise,	or if the queue	size has reached the configured
-   * limits, start draining the	queue.
+   * If the right policies are set queue the request for later.
+   * Otherwise, or if the queue size has reached the configured
+   * limits, start draining the queue.
    *
-   * If	any data is to be sent it blocks until the queue is completely
+   * If any data is to be sent it blocks until the queue is completely
    * drained.
    *
    * @todo: this routine will probably go away as part of the
    * reorganization to support non-blocking writes.
    */
   ssize_t send_or_buffer (TAO_Stub *stub,
-			  int two_way,
-			  const	ACE_Message_Block *mblk,
-			  const	ACE_Time_Value *s = 0);
+                          int two_way,
+                          const ACE_Message_Block *mblk,
+                          const ACE_Time_Value *s = 0);
 
-  /**
-   * Return the	TSS leader follower condition variable used in the
-   * Wait Strategy. Muxed Leader Follower implementation returns a
-   * valid condition variable, others return 0.
-   */
-  virtual TAO_SYNCH_CONDITION *leader_follower_condition_variable (void);
-
-  /// Queue for	buffering transport messages.
-  virtual TAO_Transport_Buffering_Queue	&buffering_queue (void);
+  /// Queue for buffering transport messages.
+  virtual TAO_Transport_Buffering_Queue &buffering_queue (void);
 
   /// Timer id associated with buffering.
   long buffering_timer_id (void) const;
   void buffering_timer_id (long);
 
   /// Timeout value associated with buffering.
-  const	ACE_Time_Value &buffering_timeout_value	(void) const;
+  const ACE_Time_Value &buffering_timeout_value (void) const;
   void buffering_timeout_value (const ACE_Time_Value &time);
 
-  /// Send any messages	that have been buffered.
-  ssize_t send_buffered_messages (const	ACE_Time_Value *max_wait_time =	0);
+  /// Send any messages that have been buffered.
+  ssize_t send_buffered_messages (const ACE_Time_Value *max_wait_time = 0);
+#endif /* 0 */
 
-  /**
-   * Initialising the messaging	object.	This would be used by the
-   * connector	side. On the acceptor side the connection handler
-   * would take	care of	the messaging objects.
-   */
-  virtual int messaging_init (CORBA::Octet major,
-			      CORBA::Octet minor) = 0;
-
-  /// Get/Set the bidirectional	flag
-  virtual int bidirectional_flag (void)	const;
+  /// Get/Set the bidirectional flag
+  virtual int bidirectional_flag (void) const;
   virtual void bidirectional_flag (int flag);
 
-  /// @@ Bala: you must	document this function!!
-  /// @@ Bala: from the	implementation in IIOP_Transport it looks more
-  //	 like it process the list of listening endpoints, or it	is
-  //	 parsing it, but 'tearing'???
+  /// @@ Bala: you must document this function!!
+  /// @@ Bala: from the implementation in IIOP_Transport it looks more
+  //     like it process the list of listening endpoints, or it is
+  //     parsing it, but 'tearing'???
   virtual int tear_listen_point_list (TAO_InputCDR &cdr);
 
   /// Remove all messages from the outgoing queue.
@@ -237,11 +227,11 @@ public:
    * @name Control connection lifecycle
    *
    * These methods are routed through the TMS object. The TMS
-   * strategies	implement them correctly.
+   * strategies implement them correctly.
    */
   //@{
 
-  /// Request has been just sent, but the reply	is not received. Idle
+  /// Request has been just sent, but the reply is not received. Idle
   /// the transport now.
   virtual int idle_after_send (void);
 
@@ -256,32 +246,32 @@ public:
    * The Transport class uses the Template Method Pattern to implement
    * the protocol specific functionality.
    * Implementors of a pluggable protocol should override the
-   * following methods with the	semantics documented below.
+   * following methods with the semantics documented below.
    */
   //@{
 
-  /// Call the corresponding connection	handler's <close>
+  /// Call the corresponding connection handler's <close>
   /// method.
-  virtual void close_connection	(void) = 0;
+  virtual void close_connection (void) = 0;
 
-  /// The connection is	now idle, i.e. not in used by any ORB thread.
+  /// The connection is now idle, i.e. not in used by any ORB thread.
   /// The protocol can take advantage of this to recycle the
-  /// connection immediately or	as an indication that it can be	safely
+  /// connection immediately or as an indication that it can be safely
   /// removed from the connection cache.
   ///
-  /// @todo Bala: this looks like a generic method to me.  IMHO	TAO's
-  /// connection cache should only know	about Transport	objects, and
-  /// this method can be implemented in	the base class!
+  /// @todo Bala: this looks like a generic method to me.  IMHO TAO's
+  /// connection cache should only know about Transport objects, and
+  /// this method can be implemented in the base class!
   virtual int idle (void) = 0;
 
   /// Return the file descriptor used for this connection.
   /**
-   * @todo Someday we should be	able to	support	protocols that do not
+   * @todo Someday we should be able to support protocols that do not
    * have or use file descriptors. But this will require implementing
    * non-reactive concurrency models for some connections.  Really
-   * hard to do.  Meanwhile, look at the SHMIOP	protocol for an
-   * example on	how to use file	descriptors for	signalling while the
-   * actual data is transfer via shared	memory (where there are	no
+   * hard to do.  Meanwhile, look at the SHMIOP protocol for an
+   * example on how to use file descriptors for signalling while the
+   * actual data is transfer via shared memory (where there are no
    * file descriptors.)
    */
   virtual ACE_HANDLE handle (void) = 0;
@@ -289,216 +279,240 @@ public:
   /// Return the event handler used to receive notifications from the
   /// Reactor.
   /**
-   * Normally a	concrete TAO_Transport object has-a ACE_Event_Handler
-   * member that function as an	adapter	between	the ACE_Reactor
+   * Normally a concrete TAO_Transport object has-a ACE_Event_Handler
+   * member that function as an adapter between the ACE_Reactor
    * framework and the TAO pluggable protocol framework.
-   * In	all the	protocols implemented so far this role is fullfilled
-   * by	an instance of ACE_Svc_Handler.
+   * In all the protocols implemented so far this role is fullfilled
+   * by an instance of ACE_Svc_Handler.
    *
    * @todo Since we only use a limited functionality of
-   * ACE_Svc_Handler we	could probably implement a generic
-   * adapter class (TAO_Transport_Event_Handler	or something), this
-   * will reduce footprint and simplify	the process of implementing a
+   * ACE_Svc_Handler we could probably implement a generic
+   * adapter class (TAO_Transport_Event_Handler or something), this
+   * will reduce footprint and simplify the process of implementing a
    * pluggable protocol.
    */
   virtual ACE_Event_Handler *event_handler (void) = 0;
 
-  /// Write the	complete Message_Block chain to	the connection.
+  /// Write the complete Message_Block chain to the connection.
   /**
    * Often the implementation simply forwards the arguments to the
-   * underlying	ACE_Svc_Handler	class.	Using the code factored	out
+   * underlying ACE_Svc_Handler class.  Using the code factored out
    * into ACE.
    *
-   * Be	careful	with protocols that perform non-trivial
-   * transformations of	the data, such as SSLIOP or protocols that
+   * Be careful with protocols that perform non-trivial
+   * transformations of the data, such as SSLIOP or protocols that
    * compress the stream.
    *
-   * @param mblk contains the data that	must be	sent.  For each
+   * @param mblk contains the data that must be sent.  For each
    * message block in the cont() chain all the data between rd_ptr()
    * and wr_ptr() should be delivered to the remote peer.
    *
-   * @param timeout is the maximum time	that the application is
-   * willing to	wait for the data to be	sent, useful in	platforms that
+   * @param timeout is the maximum time that the application is
+   * willing to wait for the data to be sent, useful in platforms that
    * implement timed writes.
-   * The timeout value is obtained from	the policies set by the
+   * The timeout value is obtained from the policies set by the
    * application.
    *
-   * @param bytes_transferred should return the	total number of	bytes
+   * @param bytes_transferred should return the total number of bytes
    * successfully transferred before the connection blocked.  This is
-   * required because in some platforms	and/or protocols multiple
+   * required because in some platforms and/or protocols multiple
    * system calls may be required to send the chain of message
-   * blocks.  The first	few calls can work successfully, but the final
+   * blocks.  The first few calls can work successfully, but the final
    * one can fail or signal a flow control situation (via EAGAIN).
-   * In	this case the ORB expects the function to return -1, errno to
-   * be	appropriately set and this argument to return the number of
+   * In this case the ORB expects the function to return -1, errno to
+   * be appropriately set and this argument to return the number of
    * bytes already on the OS I/O subsystem.
    *
    */
-  virtual ssize_t send (const ACE_Message_Block	*mblk,
-			const ACE_Time_Value *timeout =	0,
-			size_t *bytes_transferred = 0) = 0;
+  virtual ssize_t send (iovec *iov, int iovcnt,
+                        size_t &bytes_transferred,
+                        const ACE_Time_Value *timeout = 0) = 0;
 
   // Read len bytes from into buf.
   /**
-   * @param buffer ORB allocated buffer	where the data should be
-   * @@	The ACE_Time_Value *s is just a	place holder for now.  It is
-   * not clear this this is the	best place to specify this.  The actual
-   * timeout values will be kept in the	Policies.
+   * @param buffer ORB allocated buffer where the data should be
+   * @@ The ACE_Time_Value *s is just a place holder for now.  It is
+   * not clear this this is the best place to specify this.  The actual
+   * timeout values will be kept in the Policies.
    */
   virtual ssize_t recv (char *buffer,
-			size_t len,
-			const ACE_Time_Value *timeout =	0) = 0;
+                        size_t len,
+                        const ACE_Time_Value *timeout = 0) = 0;
 
-  /// Fill into	<output> the right headers to make a request.
+  /// Fill into <output> the right headers to make a request.
   /**
-   * @todo Bala: in the	good old days it was decided that the
-   * pluggable protocol	framework would	not raise exceptions.
+   * @todo Bala: in the good old days it was decided that the
+   * pluggable protocol framework would not raise exceptions.
    */
   virtual void start_request (TAO_ORB_Core *orb_core,
-			      TAO_Target_Specification &spec,
-			      TAO_OutputCDR &output,
-			      CORBA::Environment &ACE_TRY_ENV =
-			      TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException)) =	0;
+                              TAO_Target_Specification &spec,
+                              TAO_OutputCDR &output,
+                              CORBA::Environment &ACE_TRY_ENV =
+                              TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
-  /// Fill into	<output> the right headers to make a locate request.
+  /// Fill into <output> the right headers to make a locate request.
   /**
-   * @todo Bala: in the	good old days it was decided that the
-   * pluggable protocol	framework would	not raise exceptions.
+   * @todo Bala: in the good old days it was decided that the
+   * pluggable protocol framework would not raise exceptions.
    */
   virtual void start_locate (TAO_ORB_Core *orb_core,
-			     TAO_Target_Specification &spec,
-			     TAO_Operation_Details &opdetails,
-			     TAO_OutputCDR &output,
-			     CORBA::Environment	&ACE_TRY_ENV =
-			     TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException)) =	0;
-
-  /// Prepare the waiting and demuxing strategy	to receive a reply for
-  /// a	new request.
+                             TAO_Target_Specification &spec,
+                             TAO_Operation_Details &opdetails,
+                             TAO_OutputCDR &output,
+                             CORBA::Environment &ACE_TRY_ENV =
+                             TAO_default_environment ())
+    ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+
+  /// Prepare the waiting and demuxing strategy to receive a reply for
+  /// a new request.
   /**
    * Preparing the ORB to receive the reply only once the request is
-   * completely	sent opens the system to some subtle race conditions:
-   * suppose the ORB is	running	in a multi-threaded configuration,
-   * thread A makes a request while thread B is	using the Reactor to
+   * completely sent opens the system to some subtle race conditions:
+   * suppose the ORB is running in a multi-threaded configuration,
+   * thread A makes a request while thread B is using the Reactor to
    * process all incoming requests.
    * Thread A could be implemented as follows:
-   * 1)	send the request
-   * 2)	setup the ORB to receive the reply
-   * 3)	wait for the request
+   * 1) send the request
+   * 2) setup the ORB to receive the reply
+   * 3) wait for the request
    *
    * but in this case thread B may receive the reply between step (1)
-   * and (2), and drop it as an	invalid	or unexpected message.
+   * and (2), and drop it as an invalid or unexpected message.
    * Consequently the correct implementation is:
-   * 1)	setup the ORB to receive the reply
-   * 2)	send the request
-   * 3)	wait for the reply
+   * 1) setup the ORB to receive the reply
+   * 2) send the request
+   * 3) wait for the reply
    *
    * The following method encapsulates this idiom.
    *
-   * @todo This	is generic code, it should be factored out into	the
+   * @todo This is generic code, it should be factored out into the
    * Transport class.
    */
   virtual int send_request (TAO_Stub *stub,
-			    TAO_ORB_Core *orb_core,
-			    TAO_OutputCDR &stream,
-			    int	twoway,
-			    ACE_Time_Value *max_time_wait) = 0;
+                            TAO_ORB_Core *orb_core,
+                            TAO_OutputCDR &stream,
+                            int twoway,
+                            ACE_Time_Value *max_time_wait) = 0;
 
-  /// This is a	request	for the	transport object to write a request
+  /// This is a request for the transport object to write a request
   /// header before it sends out a request
   /**
-   * @todo: Bala shouldn't this	be <write_request_header> or maybe
+   * @todo: Bala shouldn't this be <write_request_header> or maybe
    *   <init_request_header>, or <prepare_request_header>? Nothing is
    *   really sent at this point, right?
    *
    * @todo: This looks like generic code too.
    */
   virtual CORBA::Boolean send_request_header (TAO_Operation_Details &opd,
-					      TAO_Target_Specification &spec,
-					      TAO_OutputCDR &msg) = 0;
+                                              TAO_Target_Specification &spec,
+                                              TAO_OutputCDR &msg) = 0;
 
-  /// This method formats the stream and then sends the	message	on the
+  /// This method formats the stream and then sends the message on the
   /// transport.
   /**
    * Once the ORB is prepared to receive a reply (see send_request()
-   * above), and all the arguments have	been marshaled the CDR stream
-   * must be 'formatted', i.e. the message_size	field in the GIOP
-   * header can	finally	be set to the proper value.
+   * above), and all the arguments have been marshaled the CDR stream
+   * must be 'formatted', i.e. the message_size field in the GIOP
+   * header can finally be set to the proper value.
    *
-   * @todo Another generic method, move	to TAO_Transport.
+   * @todo Another generic method, move to TAO_Transport.
    */
   virtual int send_message (TAO_OutputCDR &stream,
-			    TAO_Stub *stub = 0,
-			    int	twoway = 1,
-			    ACE_Time_Value *max_time_wait = 0) = 0;
+                            TAO_Stub *stub = 0,
+                            int twoway = 1,
+                            ACE_Time_Value *max_time_wait = 0) = 0;
 
-  /// Callback to read incoming	data
+  /// Callback to read incoming data
   /**
-   * The ACE_Event_Handler adapter invokes this	method as part of its
+   * The ACE_Event_Handler adapter invokes this method as part of its
    * handle_input() operation.
    *
-   * @todo: the	method name is confusing! Calling it handle_input()
-   * would probably make things	easier to understand and follow!
+   * @todo: the method name is confusing! Calling it handle_input()
+   * would probably make things easier to understand and follow!
    *
-   * Once a complete message is	read the Transport class delegates on
-   * the Messaging layer to invoke the right upcall (on	the server) or
+   * Once a complete message is read the Transport class delegates on
+   * the Messaging layer to invoke the right upcall (on the server) or
    * the TAO_Reply_Dispatcher (on the client side).
    *
-   * @param max_wait_time In some cases	the I/O	is synchronous,	e.g. a
+   * @param max_wait_time In some cases the I/O is synchronous, e.g. a
    * thread-per-connection server or when Wait_On_Read is enabled.  In
-   * those cases a maximum read	time can be specified.
+   * those cases a maximum read time can be specified.
    *
-   * @param block Is deprecated	and ignored.
+   * @param block Is deprecated and ignored.
    *
    */
   virtual int read_process_message (ACE_Time_Value *max_wait_time = 0,
-				    int	block =	0) = 0;
+                                    int block = 0) = 0;
 
-  /// Register the handler with	the reactor.
+  /// Register the handler with the reactor.
   /**
-   * This method is used by the	Wait_On_Reactor	strategy. The
-   * transport must register its event handler with the	ORB's Reactor.
+   * This method is used by the Wait_On_Reactor strategy. The
+   * transport must register its event handler with the ORB's Reactor.
    *
-   * @todo: I think this method	is pretty much useless,	the
+   * @todo: I think this method is pretty much useless, the
    * connections are *always* registered with the Reactor, except in
    * thread-per-connection mode.  In that case putting the connection
-   * in	the Reactor would produce unpredictable	results	anyway.
+   * in the Reactor would produce unpredictable results anyway.
    */
-  virtual int register_handler (void) =	0;
+  virtual int register_handler (void) = 0;
 
-  /// Indicates	whether	the reactor is used by the protocol for
-  /// signalling.
   /**
-   * @todo: This method	needs to go. This is part of the hack for
-   * making SHMIOP work	at the last minute for TAO 1.1.13
+   * Initialising the messaging object. This would be used by the
+   * connector  side. On the acceptor side the connection handler
+   * would take care of the messaging objects.
    */
-  virtual int reactor_signalling (void);
+  virtual int messaging_init (CORBA::Octet major,
+                              CORBA::Octet minor) = 0;
+
+  /// There is data queued or pending data in the current
+  /// message. Enable the reactive calls through the reactor
+  virtual int schedule_output (void);
+
+  /// There is no more data to send, cancel any reactive calls through
+  /// the reactor
+  virtual int cancel_output (void);
 
   //@}
 
+  /// Send a message block chain,
+  int send_message_block_chain (const ACE_Message_Block *message_block,
+                                size_t &bytes_transferred,
+                                ACE_Time_Value *max_wait_time = 0);
+
 protected:
-  /// Remove the first message from the	outgoing queue.
-  void dequeue_head (void);
-
-  /// Update the state of the outgoing queue, assuming that
-  /// bytes_delivered bytes have been sent already.
-  void reset_queued_message (ACE_Message_Block *message_block,
-			     size_t bytes_delivered);
-
-  /// Update the state of the outgoing queue, this time	a complete
-  /// message was sent.
-  void reset_sent_message (ACE_Message_Block *message_block,
-			   size_t bytes_delivered);
-
-  /// Helper function used to implement	the two	methods	above.
-  void reset_message (ACE_Message_Block	*message_block,
-		      size_t bytes_delivered,
-		      int queued_message);
+  /// Sent the contents of <message_block>, blocking if required by
+  /// the twoway flag or by the current policies in the stub.
+  int send_message_i (TAO_Stub *stub,
+                      int twoway_flag,
+                      const ACE_Message_Block *message_block,
+                      ACE_Time_Value *max_wait_time);
+
 private:
+
+  /// Try to send the current message.
+  /**
+   * As the outgoing data is drained this method is invoked to send as
+   * much of the current message as possible.
+   *
+   * Returns 0 if there is more data to send, -1 if there was an error
+   * and 1 if the message was completely sent.
+   */
+  int send_current_message (void);
+
+  /// Dequeue the next message, if any, and continue sending data
+  /**
+   * Once a message is completely sent, a new message is dequeued and
+   * setup as the current message.
+   *
+   * Returns 0 if there is more data to send, -1 if there was an error
+   * and 1 if the message was completely sent.
+   */
+  int dequeue_next_message (void);
+
   /// Prohibited
-  ACE_UNIMPLEMENTED_FUNC (TAO_Transport	(const TAO_Transport&))
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const	TAO_Transport&))
+  ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&))
 
 protected:
   /// IOP protocol tag.
@@ -508,42 +522,55 @@ protected:
   TAO_ORB_Core *orb_core_;
 
   /// Strategy to decide whether multiple requests can be sent over the
-  /// same connection or the connection	is exclusive for a request.
+  /// same connection or the connection is exclusive for a request.
   TAO_Transport_Mux_Strategy *tms_;
 
   /// Strategy for waiting for the reply after sending the request.
   TAO_Wait_Strategy *ws_;
 
-  /// Queue for	buffering transport messages.
-  TAO_Transport_Buffering_Queue	*buffering_queue_;
+#if 0
+  /// Queue for buffering transport messages.
+  TAO_Transport_Buffering_Queue *buffering_queue_;
 
-  /// Buffering	timer id.
+  /// Buffering timer id.
   long buffering_timer_id_;
 
-  /// Buffering	timeout	value.
+  /// Buffering timeout value.
   ACE_Time_Value buffering_timeout_value_;
+#endif /* 0 */
 
   /// Use to check if bidirectional info has been synchronized with
   /// the peer.
   /**
-   * Have we sent any info on bidirectional information	or have	we
-   * received any info regarding making	the connection served by this
+   * Have we sent any info on bidirectional information or have we
+   * received any info regarding making the connection served by this
    * transport bidirectional.
    * The flag is used as follows:
-   * + We dont want to send the	bidirectional context info more	than
+   * + We dont want to send the bidirectional context info more than
    *   once on the connection. Why? Waste of marshalling and
    *   demarshalling time on the client.
-   * + On the server side -- once a client that	has established	the
-   *   connection asks the server to use the connection	both ways, we
+   * + On the server side -- once a client that has established the
+   *   connection asks the server to use the connection both ways, we
    *   *dont* want the server to go pack service info to the
    *   client. That would be *bad*..
-   *   @@ Bala:	what would this	be *bad*? Exactly what breaks?	The
-   *	  protocol? Some GIOP rules?  Performance?
+   *   @@ Bala: what would this be *bad*? Exactly what breaks?  The
+   *      protocol? Some GIOP rules?  Performance?
    *
    * The value of this flag will be 0 if the client sends info and 1
-   * if	the server receives the	info.
+   * if the server receives the info.
    */
   int bidirectional_flag_;
+
+  /// Synchronize access to the outgoing data queue
+  TAO_SYNCH_MUTEX queue_mutex_;
+
+  /// Implement the outgoing data queue
+  TAO_Queued_Message *head_;
+  TAO_Queued_Message *tail_;
+
+  /// Once part of a message has been sent it is kept here until it is
+  /// completely sent
+  TAO_Queued_Message *current_message_;
 };
 
 #if defined (__ACE_INLINE__)
@@ -551,4 +578,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif	/* TAO_TRANSPORT_H */
+#endif  /* TAO_TRANSPORT_H */
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index 6bc1316cb35..f9c281342c9 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -1,5 +1,11 @@
 // $Id$
 
+ACE_INLINE CORBA::ULong
+TAO_Transport::tag (void) const
+{
+  return this->tag_;
+}
+
 ACE_INLINE TAO_ORB_Core *
 TAO_Transport::orb_core (void) const
 {
@@ -19,12 +25,7 @@ TAO_Transport::wait_strategy (void) const
   return this->ws_;
 }
 
-ACE_INLINE CORBA::ULong
-TAO_Transport::tag (void) const
-{
-  return this->tag_;
-}
-
+#if 0
 ACE_INLINE long
 TAO_Transport::buffering_timer_id (void) const
 {
@@ -77,6 +78,19 @@ TAO_Transport::dequeue_head (void)
   message_block->release ();
 }
 
+ACE_INLINE void
+TAO_Transport::dequeue_all (void)
+{
+  // Flush all queued messages.
+  if (this->buffering_queue_)
+    {
+      while (!this->buffering_queue_->is_empty ())
+        this->dequeue_head ();
+    }
+}
+
+#endif /* 0 */
+
 ACE_INLINE int
 TAO_Transport::bidirectional_flag (void) const
 {
@@ -88,14 +102,3 @@ TAO_Transport::bidirectional_flag (int flag)
 {
   this->bidirectional_flag_ = flag;
 }
-
-ACE_INLINE void
-TAO_Transport::dequeue_all (void)
-{
-  // Flush all queued messages.
-  if (this->buffering_queue_)
-    {
-      while (!this->buffering_queue_->is_empty ())
-        this->dequeue_head ();
-    }
-}
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index b748fcfaf94..711e71b0b35 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -1919,9 +1919,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
       ACE_CHECK_RETURN (0);
 
       if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          return 0;
-        }
+        return 0;
 
       char* end = temp.rd_ptr ();
 
@@ -1935,49 +1933,17 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
                          ACE_Allocator::instance (),
                          ACE_Allocator::instance ());
 
-      CORBA::TypeCode_ptr label_tc;
-
-      // If we are computing the label for the default index,
-      // the label must contain an octet value of 0.
-      if (i == (ACE_static_cast (CORBA::ULong, this->private_default_index ())))
-        {
-          label_tc = CORBA::_tc_octet;
-
-          if (out.write_octet (ACE_static_cast (CORBA::Octet, 0)) == 0)
-            {
-              return 0;
-            }
-
-          retval =
-            TAO_Marshal_Object::perform_skip (disc_tc,
-                                              &stream,
-                                              ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-            {
-              return 0;
-            }
-        }
-      else
-        {
-          label_tc = disc_tc;
-
-          retval =
-            TAO_Marshal_Object::perform_append (label_tc,
-                                                &stream,
-                                                &out,
-                                                ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-            {
-              return 0;
-            }
-        }
+      retval =
+        TAO_Marshal_Object::perform_append (disc_tc,
+                                            &stream,
+                                            &out,
+                                            ACE_TRY_ENV);
+      ACE_CHECK_RETURN (0);
+      if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 0;
 
       ACE_NEW_THROW_EX (label_list[i],
-                        CORBA::Any (label_tc,
+                        CORBA::Any (disc_tc,
                                     0,
                                     ACE_CDR_BYTE_ORDER,
                                     out.begin ()),
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
index 1505f62ce21..13512177934 100644
--- a/TAO/tao/ValueBase.cpp
+++ b/TAO/tao/ValueBase.cpp
@@ -196,7 +196,7 @@ CORBA_ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
       return 0;
     }
 
-  factory = strm.orb_core ()->orb ()
+  factory = TAO_ORB_Core_instance ()->orb ()   // @@ %! right way to access ?
     ->lookup_value_factory (repo_id_stream.in());
   if (factory == 0) // %! except.!
     {
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 3ec54218ad4..84e0bb2bcac 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,5 +3,5 @@
 
 #define TAO_MAJOR_VERSION 1
 #define TAO_MINOR_VERSION 1
-#define TAO_BETA_VERSION 13
-#define TAO_VERSION "1.1.13"
+#define TAO_BETA_VERSION 12
+#define TAO_VERSION "1.1.12"
diff --git a/TAO/tao/Wait_On_Leader_Follower.cpp b/TAO/tao/Wait_On_Leader_Follower.cpp
index 0188f32f49a..747a9dfa17b 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -36,7 +36,9 @@ TAO_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core,
   // Register the handler.
   // @@ We could probably move this somewhere else, and remove this
   //    function totally. (Alex).
-  this->transport_->register_handler ();
+  // @@ The handler is registered already, when the connection is
+  //    created!
+  // this->transport_->register_handler ();
 
   // Send the request.
   return this->TAO_Wait_Strategy::sending_request (orb_core,
@@ -144,13 +146,7 @@ TAO_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time,
                                   ACE_TEXT ("TAO (%P|%t) - wait (follower) on <%x> ")
                                   ACE_TEXT ("cond == 0 || cond->wait (tv) == -1\n"),
                                   this->transport_));
-
-                    if (leader_follower.remove_follower (cond) == -1)
-                      ACE_ERROR ((LM_ERROR,
-                                  "TAO (%P|%t) TAO_Wait_On_Leader_Follower::wait - "
-                                  "remove_follower failed for <%x>\n", cond));
-
-                    return -1;
+                  return -1;
                   }
               }
           }
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index e03cc72e78f..d40d3464058 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -479,15 +479,10 @@ TAO_NAMESPACE CORBA
   typedef ACE_CDR::LongDouble LongDouble;
   typedef LongDouble &LongDouble_out;
 
+
   typedef ACE_CDR::Char Char;
   typedef Char &Char_out;
 
-  // CORBA::TypeCode typedefs.
-  typedef CORBA_TypeCode TypeCode;
-  typedef CORBA_TypeCode *TypeCode_ptr;
-  typedef CORBA_TypeCode_var TypeCode_var;
-  typedef CORBA_TypeCode_out TypeCode_out;
-
   // = String memory management.
   TAO_NAMESPACE_INLINE_FUNCTION char *string_alloc (ULong len);
   TAO_NAMESPACE_STORAGE_CLASS  char *string_dup (const char *);
@@ -510,21 +505,19 @@ TAO_NAMESPACE CORBA
   typedef CORBA_WString_out WString_out;
 
   /// String sequence typedefs
+
   typedef CORBA_StringSeq StringSeq;
   typedef CORBA_StringSeq_var StringSeq_var;
   typedef CORBA_StringSeq_out StringSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_StringSeq;
 
   typedef CORBA_WStringSeq WStringSeq;
   typedef CORBA_WStringSeq_var WStringSeq_var;
   typedef CORBA_WStringSeq_out WStringSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_WStringSeq;
 
   /// Octet sequence typedef
   typedef CORBA_OctetSeq OctetSeq;
   typedef CORBA_OctetSeq_var OctetSeq_var;
   typedef CORBA_OctetSeq_out OctetSeq_out;
-  TAO_NAMESPACE_STORAGE_CLASS TypeCode_ptr _tc_OctetSeq;
 
 //   typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
 //   typedef TAO_Unbounded_Sequence<Octet> OctetSeq_var;
@@ -593,6 +586,11 @@ TAO_NAMESPACE CORBA
   typedef CORBA_ServerRequest ServerRequest;
   typedef ServerRequest *ServerRequest_ptr;
 
+  typedef CORBA_TypeCode TypeCode;
+  typedef CORBA_TypeCode *TypeCode_ptr;
+  typedef CORBA_TypeCode_var TypeCode_var;
+  typedef CORBA_TypeCode_out TypeCode_out;
+
   typedef CORBA_ExceptionList ExceptionList;
   typedef CORBA_ExceptionList_var ExceptionList_var;
   typedef CORBA_ExceptionList *ExceptionList_ptr;
@@ -1030,7 +1028,7 @@ TAO_NAMESPACE_CLOSE  // end of class (namespace) CORBA
 // #define TAO_TAG_AIOP_PROFILE   0x54414f01U /* ATM/AAL5 */
 #define TAO_TAG_SHMEM_PROFILE  0x54414f02U /* Shared memory */
 // #define TAO_TAG_MSGQ_PROFILE   0x54414f03U /* Message Queue */
-#define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
+// #define TAO_TAG_UDP_PROFILE    0x54414f04U /* UDP */
 // #define TAO_TAG_MCAST_PROFILE  0x54414f05U /* IP/Multicast */
 // #define TAO_TAG_CPCI_PROFILE   0x54414f06U /* Compact/PCI */
 // #define TAO_TAG_VME_PROFILE    0x54414f07U /* VME Bus */
@@ -1038,7 +1036,7 @@ TAO_NAMESPACE_CLOSE  // end of class (namespace) CORBA
 // #define TAO_TAG_HTTPNG_PROFILE 0x54414f09U /* HTTP-NG */
 // #define TAO_TAG_PIPE_PROFILE   0x54414f0AU /* Pipe */
 // #define TAO_TAG_XXXX_PROFILE   0x54414f0BU /* ???? */
-#define TAO_TAG_BIOP_PROFILE   0x54414f0FU /* Boeing Custom Protocol */
+#define TAO_TAG_BIOP_PROFILE   0x54414f0FU /* Boeign Custom Protocol */
 
 // We reserved the range 0x54414f00 - 0x54414f0f with the OMG to
 // define our own profile tagged components in TAO.
@@ -1100,7 +1098,7 @@ TAO_NAMESPACE_CLOSE  // end of class (namespace) CORBA
 #define TAO_TIMEOUT_CONNECT_MINOR_CODE             (0x0AU << 7)
 #define TAO_TIMEOUT_SEND_MINOR_CODE                (0x0BU << 7)
 #define TAO_TIMEOUT_RECV_MINOR_CODE                (0x0CU << 7)
-#define TAO_IMPLREPO_MINOR_CODE                    (0x0DU << 7)
+#define TAO_IMPLREPO_SERVER_MANUAL_ACTIVATION      (0x0DU << 7)
 #define TAO_ACCEPTOR_REGISTRY_OPEN_LOCATION_CODE   (0x0EU << 7)
 #define TAO_ORB_CORE_INIT_LOCATION_CODE            (0x0FU << 7)
 #define TAO_POLICY_NARROW_CODE                     (0x10U << 7)
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index cded694781c..d7920738bf8 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -11,6 +11,9 @@
 #include "tao/Single_Reactor.h"
 #include "tao/Priority_Mapping.h"
 
+#include "tao/Reactive_Flushing_Strategy.h"
+#include "tao/Block_Flushing_Strategy.h"
+
 #include "ace/TP_Reactor.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
@@ -33,6 +36,7 @@ TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
     reactor_mask_signals_ (1),
     dynamically_allocated_reactor_ (0),
     cached_connection_lock_type_ (TAO_THREAD_LOCK)
+  , flushing_strategy_type_ (TAO_REACTIVE_FLUSHING)
 {
 }
 
@@ -59,7 +63,7 @@ TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
 int
 TAO_Default_Resource_Factory::init (int argc, char **argv)
 {
-  ACE_TRACE ("TAO_Default_Resource_Factory::init");
+  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
 
   this->parser_names_count_ = 0;
 
@@ -89,7 +93,6 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
       }
   }
 
-
   for (curarg = 0; curarg < argc; curarg++)
     if (ACE_OS::strcasecmp (argv[curarg],
                             "-ORBResources") == 0)
@@ -194,22 +197,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
             this->add_to_ior_parser_names (argv[curarg]);
           }
       }
-    else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBConnectionCacheLock") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
-              this->cached_connection_lock_type_ = TAO_THREAD_LOCK;
-            else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
-              this->cached_connection_lock_type_ = TAO_NULL_LOCK;
-          }
-      }
     else if (ACE_OS::strcasecmp (argv[curarg],
                                  "-ORBConnectionLock") == 0)
       {
@@ -218,10 +206,6 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
           {
             char *name = argv[curarg];
 
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) This option has been deprecated \n")
-                        ACE_TEXT ("using -ORBConnectionCacheLock instead ")));
-
             if (ACE_OS::strcasecmp (name,
                                     "thread") == 0)
               this->cached_connection_lock_type_ = TAO_THREAD_LOCK;
@@ -230,24 +214,21 @@ TAO_Default_Resource_Factory::init (int argc, char **argv)
               this->cached_connection_lock_type_ = TAO_NULL_LOCK;
           }
       }
+
     else if (ACE_OS::strcasecmp (argv[curarg],
-                                 "-ORBConnectorLock") == 0)
+                                 "-ORBFlushingStrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO (%P|%t) This option has been deprecated \n")
-                        ACE_TEXT ("using -ORBConnectionCacheLock instead \n")));
-
             if (ACE_OS::strcasecmp (name,
-                                    "thread") == 0)
-              this->cached_connection_lock_type_ = TAO_THREAD_LOCK;
+                                    "reactive") == 0)
+              this->flushing_strategy_type_ = TAO_REACTIVE_FLUSHING;
             else if (ACE_OS::strcasecmp (name,
-                                         "null") == 0)
-              this->cached_connection_lock_type_ = TAO_NULL_LOCK;
+                                         "blocking") == 0)
+              this->flushing_strategy_type_ = TAO_BLOCKING_FLUSHING;
           }
       }
 
@@ -699,6 +680,21 @@ TAO_Default_Resource_Factory::create_cached_connection_lock (void)
   return the_lock;
 }
 
+TAO_Flushing_Strategy *
+TAO_Default_Resource_Factory::create_flushing_strategy (void)
+{
+  TAO_Flushing_Strategy *strategy = 0;
+  if (this->flushing_strategy_type_ == TAO_REACTIVE_FLUSHING)
+    ACE_NEW_RETURN (strategy,
+                    TAO_Reactive_Flushing_Strategy,
+                    0);
+  else
+    ACE_NEW_RETURN (strategy,
+                    TAO_Block_Flushing_Strategy,
+                    0);
+  return strategy;
+}
+
 TAO_Priority_Mapping *
 TAO_Default_Resource_Factory::get_priority_mapping (void)
 {
@@ -734,6 +730,6 @@ template class ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate auto_ptr<TAO_Protocol_Factory>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>
+#pragma ACE_Auto_Basic_Ptr<TAO_Protocol_Factory>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 300a823ac47..674f676148b 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -61,6 +61,12 @@ public:
     TAO_ALLOCATOR_THREAD_LOCK
   };
 
+  // = Type of Reactor
+  enum
+  {
+    TAO_REACTOR_SELECT_MT // Use ACE_Token
+  };
+
   // = Reactor mappings strategy
   enum
   {
@@ -91,6 +97,7 @@ public:
   virtual double purge_percentage (void) const;
   virtual TAO_Priority_Mapping *get_priority_mapping (void);
   virtual ACE_Lock *create_cached_connection_lock (void);
+  virtual TAO_Flushing_Strategy *create_flushing_strategy (void);
 
 protected:
   /// Obtain the reactor implementation
@@ -161,6 +168,15 @@ private:
 
   /// Type of lock used by the cached connector.
   Lock_Type cached_connection_lock_type_;
+
+  enum Flushing_Strategy_Type
+  {
+    TAO_REACTIVE_FLUSHING,
+    TAO_BLOCKING_FLUSHING
+  };
+
+  /// Type of flushing strategy configured
+  int flushing_strategy_type_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/diffs/IOP.diff b/TAO/tao/diffs/IOP.diff
index f9924c9f401..ee716db57cb 100644
--- a/TAO/tao/diffs/IOP.diff
+++ b/TAO/tao/diffs/IOP.diff
@@ -1,45 +1,71 @@
---- IOPC.h.old	Fri Feb 23 15:57:27 2001
-+++ IOPC.h	Fri Feb 23 18:22:02 2001
-@@ -23,13 +23,18 @@
+--- IOPC.h.old	Sun Sep 24 17:32:44 2000
++++ IOPC.h	Sun Sep 24 19:47:04 2000
+@@ -21,17 +21,18 @@
+ 
+ #ifndef _TAO_IDL_IOPC_H_
  #define _TAO_IDL_IOPC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
-+
-+#include "TAO_Export.h"
++#include "tao/TAO_Export.h"
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
--#include "TAO_Export.h"
-+#include "Any.h"
-+#include "Object.h"
-+#include "Exception.h"
-+#include "CDR.h"
-+#include "Sequence.h"
+-#include "tao/TAO_Export.h"
++#include "tao/CDR.h"
++#include "tao/Sequence.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
---- IOPC.cpp.old	Fri Feb 23 15:57:27 2001
-+++ IOPC.cpp	Fri Feb 23 18:22:02 2001
-@@ -21,10 +21,6 @@
+ #endif
+ #define TAO_EXPORT_MACRO TAO_Export
+--- IOPS.h.old	Sun Sep 24 17:32:44 2000
++++ IOPS.h	Sun Sep 24 19:47:08 2000
+@@ -28,14 +28,10 @@
  
- #include "IOPC.h"
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
  
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-#include "tao/PortableServer/PortableServer.h"
+-#include "tao/PortableServer/Servant_Base.h"
+-#include "tao/PortableServer/Collocated_Object.h"
 -
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus
- #endif /* __BORLANDC__ */
-@@ -32,6 +28,8 @@
+ #if defined(_MSC_VER)
+ #if (_MSC_VER >= 1200)
+ #pragma warning(push)
+ #endif /* _MSC_VER >= 1200 */
+ #pragma warning(disable:4250)
+--- IOPC.cpp.old	Sun Sep 24 17:32:44 2000
++++ IOPC.cpp	Sun Sep 24 19:47:04 2000
+@@ -23,10 +23,13 @@
+ 
  #if !defined (__ACE_INLINE__)
  #include "IOPC.i"
  #endif /* !defined INLINE */
-+
-+#include "Typecode.h"
  
++#include "tao/Any.h"
++#include "tao/Typecode.h"
++
  static const CORBA::Long _oc_IOP_ProfileId[] =
  {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+   10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
+--- IOPS.cpp.old	Sun Sep 24 17:32:44 2000
++++ IOPS.cpp	Sun Sep 24 19:47:08 2000
+@@ -18,12 +18,10 @@
+ //
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+ #include "IOPS.h"
+-#include "tao/PortableServer/Object_Adapter.h"
+-#include "tao/PortableServer/Operation_Table.h"
+ 
+ #if !defined (__ACE_INLINE__)
+ #include "IOPS.i"
+ #endif /* !defined INLINE */
+ 
diff --git a/TAO/tao/diffs/OctetSeq.diff b/TAO/tao/diffs/OctetSeq.diff
index 3841ebd382f..82a2ec88e9d 100644
--- a/TAO/tao/diffs/OctetSeq.diff
+++ b/TAO/tao/diffs/OctetSeq.diff
@@ -1,191 +1,180 @@
---- OctetSeqC.h.old	Sat Mar  3 11:32:55 2001
-+++ OctetSeqC.h	Sat Mar  3 11:33:44 2001
-@@ -19,16 +19,17 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_OCTETSEQC_H_
--#define _TAO_IDL_OCTETSEQC_H_
-+#ifndef _TAO_IDL_CORBA_OCTETSEQC_H_
-+#define _TAO_IDL_CORBA_OCTETSEQC_H_
+--- OctetSeqC.h.old	Sun Oct 22 22:28:28 2000
++++ OctetSeqC.h	Sun Oct 22 22:29:06 2000
+@@ -23,13 +23,14 @@
+ #define _TAO_IDL_OCTETSEQC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
-+#include "corbafwd.h"
++
++#include "tao/corbafwd.h"
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
-+#include "Sequence.h"
+-#include "tao/corbafwd.h"
++#include "tao/Sequence.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -53,20 +54,17 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  CORBA
--{
--
- #if !defined (_CORBA_OCTETSEQ_CH_)
- #define _CORBA_OCTETSEQ_CH_
- 
--  class OctetSeq;
--  class OctetSeq_var;
-+  class CORBA_OctetSeq;
-+  class CORBA_OctetSeq_var;
-   
-   // *************************************************************
--  // OctetSeq
-+  // CORBA::OctetSeq
-   // *************************************************************
-   
--  class TAO_Export OctetSeq : public 
-+  class TAO_Export CORBA_OctetSeq : public 
+@@ -54,14 +55,14 @@
+ #if !defined (_OCTETSEQ_CH_)
+ #define _OCTETSEQ_CH_
+ 
+-class OctetSeq;
+-class OctetSeq_var;
++class CORBA_OctetSeq;
++class CORBA_OctetSeq_var;
+ 
+ // *************************************************************
+-// OctetSeq
++// CORBA_OctetSeq
+ // *************************************************************
+ 
+-class TAO_Export OctetSeq : public 
++class TAO_Export CORBA_OctetSeq : public 
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-     TAO_Unbounded_Sequence<CORBA::Octet>
+   TAO_Unbounded_Sequence<CORBA::Octet>
  #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -74,25 +72,25 @@
+@@ -69,25 +70,25 @@
  #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-   {
-   public:
--    OctetSeq (void); // default ctor
--    OctetSeq (CORBA::ULong max); // uses max size
--    OctetSeq (
-+    CORBA_OctetSeq (void); // default ctor
-+    CORBA_OctetSeq (CORBA::ULong max); // uses max size
-+    CORBA_OctetSeq (
-       CORBA::ULong max, 
-       CORBA::ULong length, 
-       CORBA::Octet *buffer, 
-       CORBA::Boolean release = 0
-     );
--    OctetSeq (const OctetSeq &); // copy ctor
--    ~OctetSeq (void);
-+    CORBA_OctetSeq (const CORBA_OctetSeq &); // copy ctor
-+    ~CORBA_OctetSeq (void);
-     static void _tao_any_destructor (void*);
+ {
+ public:
+-  OctetSeq (void); // default ctor
+-  OctetSeq (CORBA::ULong max); // uses max size
+-  OctetSeq (
++  CORBA_OctetSeq (void); // default ctor
++  CORBA_OctetSeq (CORBA::ULong max); // uses max size
++  CORBA_OctetSeq (
+     CORBA::ULong max, 
+     CORBA::ULong length, 
+     CORBA::Octet *buffer, 
+     CORBA::Boolean release = 0
+   );
+-  OctetSeq (const OctetSeq &); // copy ctor
+-  ~OctetSeq (void);
++  CORBA_OctetSeq (const CORBA_OctetSeq &); // copy ctor
++  ~CORBA_OctetSeq (void);
+   static void _tao_any_destructor (void*);
  
  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef OctetSeq_var _var_type;
-+    typedef CORBA_OctetSeq_var _var_type;
+-  typedef OctetSeq_var _var_type;
++  typedef CORBA_OctetSeq_var _var_type;
  #endif /* ! __GNUC__ || g++ >= 2.8 */
  
  
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
--    OctetSeq (
-+    CORBA_OctetSeq (
-         CORBA::ULong length,
-         const ACE_Message_Block* mb
-       )
-@@ -111,37 +109,37 @@
-   // class CORBA::OctetSeq_var
-   // *************************************************************
- 
--  class TAO_Export OctetSeq_var
-+  class TAO_Export CORBA_OctetSeq_var
-   {
-   public:
--    OctetSeq_var (void); // default constructor
--    OctetSeq_var (OctetSeq *);
--    OctetSeq_var (const OctetSeq_var &); // copy constructor
--    OctetSeq_var (const OctetSeq &); // fixed-size base types only
--    ~OctetSeq_var (void); // destructor
-+    CORBA_OctetSeq_var (void); // default constructor
-+    CORBA_OctetSeq_var (CORBA_OctetSeq *);
-+    CORBA_OctetSeq_var (const CORBA_OctetSeq_var &); // copy constructor
-+    CORBA_OctetSeq_var (const CORBA_OctetSeq &); // fixed-size base types only
-+    ~CORBA_OctetSeq_var (void); // destructor
-     
--    OctetSeq_var &operator= (OctetSeq *);
--    OctetSeq_var &operator= (const OctetSeq_var &);
--    OctetSeq_var &operator= (const OctetSeq &); // fixed-size base types only
--    OctetSeq *operator-> (void);
--    const OctetSeq *operator-> (void) const;
-+    CORBA_OctetSeq_var &operator= (CORBA_OctetSeq *);
-+    CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq_var &);
-+    CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq &); // fixed-size base types only
-+    CORBA_OctetSeq *operator-> (void);
-+    const CORBA_OctetSeq *operator-> (void) const;
-     
--    operator const OctetSeq &() const;
--    operator OctetSeq &();
--    operator OctetSeq &() const;
-+    operator const CORBA_OctetSeq &() const;
-+    operator CORBA_OctetSeq &();
-+    operator CORBA_OctetSeq &() const;
-     
-     CORBA::Octet & operator[] (CORBA::ULong index);
-     const CORBA::Octet & operator[] (CORBA::ULong index) const;
-     
-     // in, inout, out, _retn 
--    const OctetSeq &in (void) const;
--    OctetSeq &inout (void);
--    OctetSeq *&out (void);
--    OctetSeq *_retn (void);
--    OctetSeq *ptr (void) const;
-+    const CORBA_OctetSeq &in (void) const;
-+    CORBA_OctetSeq &inout (void);
-+    CORBA_OctetSeq *&out (void);
-+    CORBA_OctetSeq *_retn (void);
-+    CORBA_OctetSeq *ptr (void) const;
- 
-   private:
--    OctetSeq *ptr_;
-+    CORBA_OctetSeq *ptr_;
-   };
- 
- 
-@@ -151,40 +149,34 @@
- #if !defined (_CORBA_OCTETSEQ___OUT_CH_)
- #define _CORBA_OCTETSEQ___OUT_CH_
- 
--  class TAO_Export OctetSeq_out
-+  class TAO_Export CORBA_OctetSeq_out
-   {
-   public:
--    OctetSeq_out (OctetSeq *&);
--    OctetSeq_out (OctetSeq_var &);
--    OctetSeq_out (const OctetSeq_out &);
--    OctetSeq_out &operator= (const OctetSeq_out &);
--    OctetSeq_out &operator= (OctetSeq *);
--    operator OctetSeq *&();
--    OctetSeq *&ptr (void);
--    OctetSeq *operator-> (void);
-+    CORBA_OctetSeq_out (CORBA_OctetSeq *&);
-+    CORBA_OctetSeq_out (CORBA_OctetSeq_var &);
-+    CORBA_OctetSeq_out (const CORBA_OctetSeq_out &);
-+    CORBA_OctetSeq_out &operator= (const CORBA_OctetSeq_out &);
-+    CORBA_OctetSeq_out &operator= (CORBA_OctetSeq *);
-+    operator CORBA_OctetSeq *&();
-+    CORBA_OctetSeq *&ptr (void);
-+    CORBA_OctetSeq *operator-> (void);
-     CORBA::Octet & operator[] (CORBA::ULong index);
-     
-   private:
--    OctetSeq *&ptr_;
-+    CORBA_OctetSeq *&ptr_;
-     // assignment from T_var not allowed
--    void operator= (const OctetSeq_var &);
-+    void operator= (const CORBA_OctetSeq_var &);
-   };
+-  OctetSeq (
++  CORBA_OctetSeq (
+       CORBA::ULong length,
+       const ACE_Message_Block* mb
+     )
+@@ -103,40 +104,40 @@
+ #define _OCTETSEQ___VAR_CH_
+ 
+ // *************************************************************
+-// class OctetSeq_var
++// class CORBA_OctetSeq_var
+ // *************************************************************
+ 
+-class TAO_Export OctetSeq_var
++class TAO_Export CORBA_OctetSeq_var
+ {
+ public:
+-  OctetSeq_var (void); // default constructor
+-  OctetSeq_var (OctetSeq *);
+-  OctetSeq_var (const OctetSeq_var &); // copy constructor
+-  OctetSeq_var (const OctetSeq &); // fixed-size base types only
+-  ~OctetSeq_var (void); // destructor
++  CORBA_OctetSeq_var (void); // default constructor
++  CORBA_OctetSeq_var (CORBA_OctetSeq *);
++  CORBA_OctetSeq_var (const CORBA_OctetSeq_var &); // copy constructor
++  CORBA_OctetSeq_var (const CORBA_OctetSeq &); // fixed-size base types only
++  ~CORBA_OctetSeq_var (void); // destructor
+   
+-  OctetSeq_var &operator= (OctetSeq *);
+-  OctetSeq_var &operator= (const OctetSeq_var &);
+-  OctetSeq_var &operator= (const OctetSeq &); // fixed-size base types only
+-  OctetSeq *operator-> (void);
+-  const OctetSeq *operator-> (void) const;
++  CORBA_OctetSeq_var &operator= (CORBA_OctetSeq *);
++  CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq_var &);
++  CORBA_OctetSeq_var &operator= (const CORBA_OctetSeq &); // fixed-size base types only
++  CORBA_OctetSeq *operator-> (void);
++  const CORBA_OctetSeq *operator-> (void) const;
+   
+-  operator const OctetSeq &() const;
+-  operator OctetSeq &();
+-  operator OctetSeq &() const;
++  operator const CORBA_OctetSeq &() const;
++  operator CORBA_OctetSeq &();
++  operator CORBA_OctetSeq &() const;
+   
+   CORBA::Octet & operator[] (CORBA::ULong index);
+   const CORBA::Octet & operator[] (CORBA::ULong index) const;
+   
+   // in, inout, out, _retn 
+-  const OctetSeq &in (void) const;
+-  OctetSeq &inout (void);
+-  OctetSeq *&out (void);
+-  OctetSeq *_retn (void);
+-  OctetSeq *ptr (void) const;
++  const CORBA_OctetSeq &in (void) const;
++  CORBA_OctetSeq &inout (void);
++  CORBA_OctetSeq *&out (void);
++  CORBA_OctetSeq *_retn (void);
++  CORBA_OctetSeq *ptr (void) const;
+ 
+ private:
+-  OctetSeq *ptr_;
++  CORBA_OctetSeq *ptr_;
+ };
+ 
+ 
+@@ -146,51 +147,51 @@
+ #if !defined (_OCTETSEQ___OUT_CH_)
+ #define _OCTETSEQ___OUT_CH_
+ 
+-class TAO_Export OctetSeq_out
++class TAO_Export CORBA_OctetSeq_out
+ {
+ public:
+-  OctetSeq_out (OctetSeq *&);
+-  OctetSeq_out (OctetSeq_var &);
+-  OctetSeq_out (const OctetSeq_out &);
+-  OctetSeq_out &operator= (const OctetSeq_out &);
+-  OctetSeq_out &operator= (OctetSeq *);
+-  operator OctetSeq *&();
+-  OctetSeq *&ptr (void);
+-  OctetSeq *operator-> (void);
++  CORBA_OctetSeq_out (CORBA_OctetSeq *&);
++  CORBA_OctetSeq_out (CORBA_OctetSeq_var &);
++  CORBA_OctetSeq_out (const CORBA_OctetSeq_out &);
++  CORBA_OctetSeq_out &operator= (const CORBA_OctetSeq_out &);
++  CORBA_OctetSeq_out &operator= (CORBA_OctetSeq *);
++  operator CORBA_OctetSeq *&();
++  CORBA_OctetSeq *&ptr (void);
++  CORBA_OctetSeq *operator-> (void);
+   CORBA::Octet & operator[] (CORBA::ULong index);
+   
+ private:
+-  OctetSeq *&ptr_;
++  CORBA_OctetSeq *&ptr_;
+   // assignment from T_var not allowed
+-  void operator= (const OctetSeq_var &);
++  void operator= (const CORBA_OctetSeq_var &);
+ };
  
  
  #endif /* end #if !defined */
  
--  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OctetSeq;
--
--
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
- // Proxy Broker Factory function pointer declarations.
- 
--TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
--TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
+-extern TAO_Export CORBA::TypeCode_ptr  _tc_OctetSeq;
++extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_OctetSeq;
+ 
+-TAO_Export void operator<<= (CORBA::Any &, const OctetSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, OctetSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, OctetSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const OctetSeq *&);
 +TAO_Export void operator<<= (CORBA::Any &, const CORBA_OctetSeq &); // copying version
 +TAO_Export void operator<<= (CORBA::Any &, CORBA_OctetSeq*); // noncopying version
 +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OctetSeq *&); // deprecated
@@ -193,43 +182,56 @@
  
  #ifndef __ACE_INLINE__
  
-@@ -194,11 +186,11 @@
+ 
+-#if !defined _TAO_CDR_OP_OctetSeq_H_
+-#define _TAO_CDR_OP_OctetSeq_H_
++#if !defined _TAO_CDR_OP_CORBA_OctetSeq_H_
++#define _TAO_CDR_OP_CORBA_OctetSeq_H_
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
--    const CORBA::OctetSeq &
+-    const OctetSeq &
 +    const CORBA_OctetSeq &
    );
  TAO_Export CORBA::Boolean operator>> (
      TAO_InputCDR &,
--    CORBA::OctetSeq &
+-    OctetSeq &
 +    CORBA_OctetSeq &
    );
  
- #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
---- OctetSeqC.i.old	Sat Mar  3 11:32:55 2001
-+++ OctetSeqC.i	Sat Mar  3 11:33:52 2001
-@@ -28,47 +28,47 @@
+-#endif /* _TAO_CDR_OP_OctetSeq_H_ */
++#endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
+ 
+ 
+ #endif /* __ACE_INLINE__ */
+--- OctetSeqC.i.old	Sun Oct 22 22:28:28 2000
++++ OctetSeqC.i	Sun Oct 22 22:29:06 2000
+@@ -24,162 +24,162 @@
+ #define _OCTETSEQ_CI_
+ 
+ // *************************************************************
+-// Inline operations for class OctetSeq_var
++// Inline operations for class CORBA_OctetSeq_var
  // *************************************************************
  
  ACE_INLINE
--CORBA::OctetSeq_var::OctetSeq_var (void) // default constructor
+-OctetSeq_var::OctetSeq_var (void) // default constructor
 +CORBA_OctetSeq_var::CORBA_OctetSeq_var (void) // default constructor
    : ptr_ (0)
  {}
  
  ACE_INLINE
--CORBA::OctetSeq_var::OctetSeq_var (OctetSeq *p)
+-OctetSeq_var::OctetSeq_var (OctetSeq *p)
 +CORBA_OctetSeq_var::CORBA_OctetSeq_var (CORBA_OctetSeq *p)
    : ptr_ (p)
  {}
  
  ACE_INLINE
--CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq_var &p) // copy constructor
+-OctetSeq_var::OctetSeq_var (const ::OctetSeq_var &p) // copy constructor
 +CORBA_OctetSeq_var::CORBA_OctetSeq_var (const ::CORBA_OctetSeq_var &p) // copy constructor
  {
    if (p.ptr_)
--    ACE_NEW (this->ptr_, ::CORBA::OctetSeq (*p.ptr_));
+-    ACE_NEW (this->ptr_, ::OctetSeq (*p.ptr_));
 +    ACE_NEW (this->ptr_, ::CORBA_OctetSeq (*p.ptr_));
    else
      this->ptr_ = 0;
@@ -237,22 +239,22 @@
  
  // fixed-size base types only
  ACE_INLINE
--CORBA::OctetSeq_var::OctetSeq_var (const ::CORBA::OctetSeq &p)
+-OctetSeq_var::OctetSeq_var (const ::OctetSeq &p)
 +CORBA_OctetSeq_var::CORBA_OctetSeq_var (const ::CORBA_OctetSeq &p)
  {
--  ACE_NEW (this->ptr_, ::CORBA::OctetSeq (p));
+-  ACE_NEW (this->ptr_, ::OctetSeq (p));
 +  ACE_NEW (this->ptr_, ::CORBA_OctetSeq (p));
  }
  
  ACE_INLINE
--CORBA::OctetSeq_var::~OctetSeq_var (void) // destructor
+-OctetSeq_var::~OctetSeq_var (void) // destructor
 +CORBA_OctetSeq_var::~CORBA_OctetSeq_var (void) // destructor
  {
    delete this->ptr_;
  }
  
--ACE_INLINE CORBA::OctetSeq_var &
--CORBA::OctetSeq_var::operator= (OctetSeq *p)
+-ACE_INLINE OctetSeq_var &
+-OctetSeq_var::operator= (OctetSeq *p)
 +ACE_INLINE CORBA_OctetSeq_var &
 +CORBA_OctetSeq_var::operator= (CORBA_OctetSeq *p)
  {
@@ -261,57 +263,45 @@
    return *this;
  }
  
--ACE_INLINE ::CORBA::OctetSeq_var &
--CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq_var &p)
-+ACE_INLINE ::CORBA_OctetSeq_var &
-+CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p)
+-ACE_INLINE OctetSeq_var &
+-OctetSeq_var::operator= (const ::OctetSeq_var &p) // deep copy
++ACE_INLINE CORBA_OctetSeq_var &
++CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq_var &p) // deep copy
  {
    if (this != &p)
-     {
-@@ -79,12 +79,12 @@
-         }
-       else
-         {
--          OctetSeq *deep_copy =
--            new OctetSeq (*p.ptr_);
-+          CORBA_OctetSeq *deep_copy =
-+            new CORBA_OctetSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              OctetSeq *tmp = deep_copy;
-+              CORBA_OctetSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -96,107 +96,107 @@
+   {
+     delete this->ptr_;
+-    ACE_NEW_RETURN (this->ptr_, ::OctetSeq (*p.ptr_), *this);
++    ACE_NEW_RETURN (this->ptr_, ::CORBA_OctetSeq (*p.ptr_), *this);
+   }
+   return *this;
  }
  
  // fixed-size types only
--ACE_INLINE ::CORBA::OctetSeq_var &
--CORBA::OctetSeq_var::operator= (const ::CORBA::OctetSeq &p)
+-ACE_INLINE ::OctetSeq_var &
+-OctetSeq_var::operator= (const ::OctetSeq &p)
 +ACE_INLINE ::CORBA_OctetSeq_var &
 +CORBA_OctetSeq_var::operator= (const ::CORBA_OctetSeq &p)
  {
    if (this->ptr_ != &p)
    {
      delete this->ptr_;
--    ACE_NEW_RETURN (this->ptr_, ::CORBA::OctetSeq (p), *this);
+-    ACE_NEW_RETURN (this->ptr_, ::OctetSeq (p), *this);
 +    ACE_NEW_RETURN (this->ptr_, ::CORBA_OctetSeq (p), *this);
    }
    return *this;
  }
  
--ACE_INLINE const ::CORBA::OctetSeq *
--CORBA::OctetSeq_var::operator-> (void) const
+-ACE_INLINE const ::OctetSeq *
+-OctetSeq_var::operator-> (void) const
 +ACE_INLINE const ::CORBA_OctetSeq *
 +CORBA_OctetSeq_var::operator-> (void) const
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::OctetSeq *
--CORBA::OctetSeq_var::operator-> (void)
+-ACE_INLINE ::OctetSeq *
+-OctetSeq_var::operator-> (void)
 +ACE_INLINE ::CORBA_OctetSeq *
 +CORBA_OctetSeq_var::operator-> (void)
  {
@@ -319,50 +309,50 @@
  }
  
  ACE_INLINE 
--CORBA::OctetSeq_var::operator const ::CORBA::OctetSeq &() const // cast
+-OctetSeq_var::operator const ::OctetSeq &() const // cast
 +CORBA_OctetSeq_var::operator const ::CORBA_OctetSeq &() const // cast
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() // cast 
+-OctetSeq_var::operator ::OctetSeq &() // cast 
 +CORBA_OctetSeq_var::operator ::CORBA_OctetSeq &() // cast 
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--CORBA::OctetSeq_var::operator ::CORBA::OctetSeq &() const // cast 
+-OctetSeq_var::operator ::OctetSeq &() const // cast 
 +CORBA_OctetSeq_var::operator ::CORBA_OctetSeq &() const // cast 
  {
    return *this->ptr_;
  }
  
  ACE_INLINE CORBA::Octet &
--CORBA::OctetSeq_var::operator[] (CORBA::ULong index)
+-OctetSeq_var::operator[] (CORBA::ULong index)
 +CORBA_OctetSeq_var::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
  
  ACE_INLINE const CORBA::Octet &
--CORBA::OctetSeq_var::operator[] (CORBA::ULong index) const
+-OctetSeq_var::operator[] (CORBA::ULong index) const
 +CORBA_OctetSeq_var::operator[] (CORBA::ULong index) const
  {
    return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
  }
  
--ACE_INLINE const ::CORBA::OctetSeq &
--CORBA::OctetSeq_var::in (void) const
+-ACE_INLINE const ::OctetSeq &
+-OctetSeq_var::in (void) const
 +ACE_INLINE const ::CORBA_OctetSeq &
 +CORBA_OctetSeq_var::in (void) const
  {
    return *this->ptr_;
  }
  
--ACE_INLINE ::CORBA::OctetSeq &
--CORBA::OctetSeq_var::inout (void)
+-ACE_INLINE ::OctetSeq &
+-OctetSeq_var::inout (void)
 +ACE_INLINE ::CORBA_OctetSeq &
 +CORBA_OctetSeq_var::inout (void)
  {
@@ -370,8 +360,8 @@
  }
  
  // mapping for variable size 
--ACE_INLINE ::CORBA::OctetSeq *&
--CORBA::OctetSeq_var::out (void)
+-ACE_INLINE ::OctetSeq *&
+-OctetSeq_var::out (void)
 +ACE_INLINE ::CORBA_OctetSeq *&
 +CORBA_OctetSeq_var::out (void)
  {
@@ -380,19 +370,19 @@
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::OctetSeq *
--CORBA::OctetSeq_var::_retn (void)
+-ACE_INLINE ::OctetSeq *
+-OctetSeq_var::_retn (void)
 +ACE_INLINE ::CORBA_OctetSeq *
 +CORBA_OctetSeq_var::_retn (void)
  {
--  ::CORBA::OctetSeq *tmp = this->ptr_;
+-  ::OctetSeq *tmp = this->ptr_;
 +  ::CORBA_OctetSeq *tmp = this->ptr_;
    this->ptr_ = 0;
    return tmp;
  }
  
--ACE_INLINE ::CORBA::OctetSeq *
--CORBA::OctetSeq_var::ptr (void) const
+-ACE_INLINE ::OctetSeq *
+-OctetSeq_var::ptr (void) const
 +ACE_INLINE ::CORBA_OctetSeq *
 +CORBA_OctetSeq_var::ptr (void) const
  {
@@ -400,12 +390,12 @@
  }
  
  // *************************************************************
--// Inline operations for class CORBA::OctetSeq_out
+-// Inline operations for class OctetSeq_out
 +// Inline operations for class CORBA_OctetSeq_out
  // *************************************************************
  
  ACE_INLINE
--CORBA::OctetSeq_out::OctetSeq_out (OctetSeq *&p)
+-OctetSeq_out::OctetSeq_out (OctetSeq *&p)
 +CORBA_OctetSeq_out::CORBA_OctetSeq_out (CORBA_OctetSeq *&p)
    : ptr_ (p)
  {
@@ -413,23 +403,23 @@
  }
  
  ACE_INLINE
--CORBA::OctetSeq_out::OctetSeq_out (OctetSeq_var &p) // constructor from _var
+-OctetSeq_out::OctetSeq_out (OctetSeq_var &p) // constructor from _var
 +CORBA_OctetSeq_out::CORBA_OctetSeq_out (CORBA_OctetSeq_var &p) // constructor from _var
    : ptr_ (p.out ())
  {
    delete this->ptr_;
-@@ -204,44 +204,44 @@
+@@ -187,44 +187,44 @@
  }
  
  ACE_INLINE
--CORBA::OctetSeq_out::OctetSeq_out (const ::CORBA::OctetSeq_out &p) // copy constructor
+-OctetSeq_out::OctetSeq_out (const ::OctetSeq_out &p) // copy constructor
 -  : ptr_ (ACE_const_cast (OctetSeq_out&, p).ptr_)
 +CORBA_OctetSeq_out::CORBA_OctetSeq_out (const ::CORBA_OctetSeq_out &p) // copy constructor
 +  : ptr_ (ACE_const_cast (CORBA_OctetSeq_out&, p).ptr_)
  {}
  
--ACE_INLINE ::CORBA::OctetSeq_out &
--CORBA::OctetSeq_out::operator= (const ::CORBA::OctetSeq_out &p)
+-ACE_INLINE ::OctetSeq_out &
+-OctetSeq_out::operator= (const ::OctetSeq_out &p)
 +ACE_INLINE ::CORBA_OctetSeq_out &
 +CORBA_OctetSeq_out::operator= (const ::CORBA_OctetSeq_out &p)
  {
@@ -438,8 +428,8 @@
    return *this;
  }
  
--ACE_INLINE ::CORBA::OctetSeq_out &
--CORBA::OctetSeq_out::operator= (OctetSeq *p)
+-ACE_INLINE ::OctetSeq_out &
+-OctetSeq_out::operator= (OctetSeq *p)
 +ACE_INLINE ::CORBA_OctetSeq_out &
 +CORBA_OctetSeq_out::operator= (CORBA_OctetSeq *p)
  {
@@ -448,22 +438,22 @@
  }
  
  ACE_INLINE 
--CORBA::OctetSeq_out::operator ::CORBA::OctetSeq *&() // cast
+-OctetSeq_out::operator ::OctetSeq *&() // cast
 +CORBA_OctetSeq_out::operator ::CORBA_OctetSeq *&() // cast
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::OctetSeq *&
--CORBA::OctetSeq_out::ptr (void) // ptr
+-ACE_INLINE ::OctetSeq *&
+-OctetSeq_out::ptr (void) // ptr
 +ACE_INLINE ::CORBA_OctetSeq *&
 +CORBA_OctetSeq_out::ptr (void) // ptr
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::OctetSeq *
--CORBA::OctetSeq_out::operator-> (void)
+-ACE_INLINE ::OctetSeq *
+-OctetSeq_out::operator-> (void)
 +ACE_INLINE ::CORBA_OctetSeq *
 +CORBA_OctetSeq_out::operator-> (void)
  {
@@ -471,95 +461,84 @@
  }
  
  ACE_INLINE CORBA::Octet &
--CORBA::OctetSeq_out::operator[] (CORBA::ULong index)
+-OctetSeq_out::operator[] (CORBA::ULong index)
 +CORBA_OctetSeq_out::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
-@@ -255,11 +255,11 @@
+@@ -233,17 +233,17 @@
+ #endif /* end #if !defined */
+ 
+ 
+-#if !defined _TAO_CDR_OP_OctetSeq_I_
+-#define _TAO_CDR_OP_OctetSeq_I_
++#if !defined _TAO_CDR_OP_CORBA_OctetSeq_I_
++#define _TAO_CDR_OP_CORBA_OctetSeq_I_
  
  CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
--    const CORBA::OctetSeq &
+-    const OctetSeq &
 +    const CORBA_OctetSeq &
    );
  CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
--    CORBA::OctetSeq &
+-    OctetSeq &
 +    CORBA_OctetSeq &
    );
  
- #endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */
---- OctetSeqC.cpp.old	Sat Mar  3 11:32:55 2001
-+++ OctetSeqC.cpp	Sat Mar  3 11:34:02 2001
-@@ -21,10 +21,6 @@
- 
- #include "OctetSeqC.h"
- 
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
--
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus
- #endif /* __BORLANDC__ */
-@@ -33,6 +29,9 @@
+-#endif /* _TAO_CDR_OP_OctetSeq_I_ */
++#endif /* _TAO_CDR_OP_CORBA_OctetSeq_I_ */
+ 
+--- OctetSeqC.cpp.old	Sun Oct 22 22:28:28 2000
++++ OctetSeqC.cpp	Sun Oct 22 22:29:06 2000
+@@ -25,17 +25,18 @@
  #include "OctetSeqC.i"
  #endif /* !defined INLINE */
  
-+#include "Any.h"
-+#include "CDR.h"
-+#include "Typecode.h"
++#include "tao/Any.h"
+ 
+ #if !defined (_OCTETSEQ_CS_)
+ #define _OCTETSEQ_CS_
  
- #if !defined (_CORBA_OCTETSEQ_CS_)
- #define _CORBA_OCTETSEQ_CS_
-@@ -41,40 +40,40 @@
- // CORBA::OctetSeq
+ // *************************************************************
+-// OctetSeq
++// CORBA_OctetSeq
  // *************************************************************
  
--CORBA::OctetSeq::OctetSeq (void)
+-OctetSeq::OctetSeq (void)
 +CORBA_OctetSeq::CORBA_OctetSeq (void)
  {}
--CORBA::OctetSeq::OctetSeq (CORBA::ULong max) // uses max size
--  : 
+-OctetSeq::OctetSeq (CORBA::ULong max) // uses max size
 +CORBA_OctetSeq::CORBA_OctetSeq (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 */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -44,7 +45,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max)
  {}
--CORBA::OctetSeq::OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
--  : 
+-OctetSeq::OctetSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
 +CORBA_OctetSeq::CORBA_OctetSeq (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 */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -53,7 +54,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max, length, buffer, release)
  {}
--CORBA::OctetSeq::OctetSeq (const OctetSeq &seq) // copy ctor
--  : 
+-OctetSeq::OctetSeq (const OctetSeq &seq) // copy ctor
 +CORBA_OctetSeq::CORBA_OctetSeq (const CORBA_OctetSeq &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 */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -62,22 +63,22 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (seq)
  {}
--CORBA::OctetSeq::~OctetSeq (void) // dtor
+-OctetSeq::~OctetSeq (void) // dtor
 +CORBA_OctetSeq::~CORBA_OctetSeq (void) // dtor
  {}
--void CORBA::OctetSeq::_tao_any_destructor (void *x)
+-void OctetSeq::_tao_any_destructor (void *x)
 +void CORBA_OctetSeq::_tao_any_destructor (void *x)
  {
 -  OctetSeq *tmp = ACE_static_cast (OctetSeq*,x);
@@ -567,62 +546,91 @@
    delete tmp;
  }
  
-@@ -94,14 +93,15 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_OctetSeq[] =
++static const CORBA::Long _oc_CORBA_OctetSeq[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+-  17, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:OctetSeq:1.0
+-  9, ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x0),  // name = OctetSeq
++  17, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:CORBA_OctetSeq:1.0
++  9, ACE_NTOHL (0x4f637465), ACE_NTOHL (0x74536571), ACE_NTOHL (0x0),  // name = CORBA_OctetSeq
+   CORBA::tk_sequence, // typecode kind
+   12, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -86,54 +87,54 @@
      0U,
  
  };
--static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA::OctetSeq));
+-static CORBA::TypeCode _tc_TAO_tc_OctetSeq (CORBA::tk_alias, sizeof (_oc_OctetSeq), (char *) &_oc_OctetSeq, 0, sizeof (OctetSeq));
+-CORBA::TypeCode_ptr _tc_OctetSeq = &_tc_TAO_tc_OctetSeq;
 +static CORBA::TypeCode _tc_TAO_tc_CORBA_OctetSeq (CORBA::tk_alias, sizeof (_oc_CORBA_OctetSeq), (char *) &_oc_CORBA_OctetSeq, 0, sizeof (CORBA_OctetSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (CORBA)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OctetSeq, &_tc_TAO_tc_CORBA_OctetSeq)
- TAO_NAMESPACE_END
-+
++CORBA::TypeCode_ptr _tc_CORBA_OctetSeq = &_tc_TAO_tc_CORBA_OctetSeq;
+ 
  void operator<<= (
      CORBA::Any &_tao_any,
--    const CORBA::OctetSeq &_tao_elem
+-    const OctetSeq &_tao_elem
 +    const CORBA_OctetSeq &_tao_elem
    ) // copying
  {
    TAO_OutputCDR stream;
-@@ -115,7 +115,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_OctetSeq,
++        _tc_CORBA_OctetSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
    }
  }
  
--void operator<<= (CORBA::Any &_tao_any, CORBA::OctetSeq *_tao_elem) // non copying
+-void operator<<= (CORBA::Any &_tao_any, OctetSeq *_tao_elem) // non copying
 +void operator<<= (CORBA::Any &_tao_any, CORBA_OctetSeq *_tao_elem) // non copying
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
-@@ -125,19 +125,19 @@
+   _tao_any._tao_replace (
+-      _tc_OctetSeq,
++      _tc_CORBA_OctetSeq,
+       TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
        _tao_elem,
--      CORBA::OctetSeq::_tao_any_destructor
+-      OctetSeq::_tao_any_destructor
 +      CORBA_OctetSeq::_tao_any_destructor
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OctetSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, OctetSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OctetSeq *&_tao_elem)
  {
    return _tao_any >>= ACE_const_cast(
--      const CORBA::OctetSeq*&,
+-      const OctetSeq*&,
 +      const CORBA_OctetSeq*&,
        _tao_elem
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OctetSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const OctetSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OctetSeq *&_tao_elem)
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
-@@ -151,15 +151,15 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    if (!type->equivalent (_tc_OctetSeq, ACE_TRY_ENV)) // not equal
++    if (!type->equivalent (_tc_CORBA_OctetSeq, ACE_TRY_ENV)) // not equal
+       {
+         return 0;
+       }
+@@ -141,15 +142,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
--          const CORBA::OctetSeq*,
+-          const OctetSeq*,
 +          const CORBA_OctetSeq*,
            _tao_any.value ()
          );
@@ -630,94 +638,50 @@
      }
      else
      {
--      CORBA::OctetSeq *tmp;
--      ACE_NEW_RETURN (tmp, CORBA::OctetSeq, 0);
+-      OctetSeq *tmp;
+-      ACE_NEW_RETURN (tmp, OctetSeq, 0);
 +      CORBA_OctetSeq *tmp;
 +      ACE_NEW_RETURN (tmp, CORBA_OctetSeq, 0);
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -170,7 +170,7 @@
-             CORBA::_tc_OctetSeq,
+@@ -157,10 +158,10 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_OctetSeq,
++            _tc_CORBA_OctetSeq,
              1,
              ACE_static_cast (void *, tmp),
--            CORBA::OctetSeq::_tao_any_destructor
+-            OctetSeq::_tao_any_destructor
 +            CORBA_OctetSeq::_tao_any_destructor
            );
          _tao_elem = tmp;
          return 1;
-@@ -190,26 +190,26 @@
+@@ -180,7 +181,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
--    const CORBA::OctetSeq &_tao_sequence
+-    const OctetSeq &_tao_sequence
 +    const CORBA_OctetSeq &_tao_sequence
    )
  {
    if (strm << _tao_sequence.length ())
-   {
-     // encode all elements
--    
-+
+@@ -190,7 +191,7 @@
  #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
      {
--      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
--        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA::OctetSeq *)&_tao_sequence);
-+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+       TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+-        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (OctetSeq *)&_tao_sequence);
 +        ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_OctetSeq *)&_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 == 0 */
-     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
--  
-+
- #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-   }
-   return 0; // error
-@@ -217,7 +217,7 @@
+@@ -207,7 +208,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
--    CORBA::OctetSeq &_tao_sequence
+-    OctetSeq &_tao_sequence
 +    CORBA_OctetSeq &_tao_sequence
    )
  {
    CORBA::ULong _tao_seq_len;
-@@ -226,14 +226,14 @@
-     // set the length of the sequence
-     _tao_sequence.length (_tao_seq_len);
-     // If length is 0 we return true.
--    if (0 >= _tao_seq_len) 
-+    if (0 >= _tao_seq_len)
-       return 1;
-     // retrieve all the elements
--    
-+
- #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-     {
--      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-         ACE_static_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);
-@@ -242,12 +242,11 @@
-     }
-     else
-       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
--    
-+
- #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
--  
-+
- #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-   }
-   return 0; // error
- }
--
diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff
index 9a9de357892..b1820a80a13 100644
--- a/TAO/tao/diffs/PortableInterceptor.diff
+++ b/TAO/tao/diffs/PortableInterceptor.diff
@@ -1,12 +1,11 @@
---- PortableInterceptorC.h.old	Fri Mar  2 12:18:45 2001
-+++ PortableInterceptorC.h	Fri Mar  2 12:18:56 2001
-@@ -23,15 +23,17 @@
+--- PortableInterceptorC.h.old	Mon Oct 23 22:19:37 2000
++++ PortableInterceptorC.h	Mon Oct 23 22:21:26 2000
+@@ -23,15 +23,16 @@
  #define _TAO_IDL_PORTABLEINTERCEPTORC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
-+
-+#include "corbafwd.h"
++#include "tao/corbafwd.h"
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
@@ -20,64 +19,167 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -156,16 +158,14 @@
+@@ -152,8 +153,7 @@
        }
  
      virtual char * name (
--        CORBA::Environment &ACE_TRY_ENV =
--          TAO_default_environment ()
-+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-       )
-       ACE_THROW_SPEC ((
-         CORBA::SystemException
-       )) = 0;
- 
-     virtual void destroy (
--        CORBA::Environment &ACE_TRY_ENV =
+-                CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException
-@@ -600,6 +600,8 @@
+@@ -586,6 +586,8 @@
          CORBA::SystemException
        )) = 0;
  
-+#if TAO_HAS_CORBA_MESSAGING == 1
++#if (TAO_HAS_CORBA_MESSAGING == 1)
 +
      virtual Messaging::SyncScope sync_scope (
-         CORBA::Environment &ACE_TRY_ENV =
+                 CORBA::Environment &ACE_TRY_ENV = 
            TAO_default_environment ()
-@@ -608,6 +610,8 @@
+@@ -594,6 +596,8 @@
          CORBA::SystemException
        )) = 0;
  
-+#endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
++#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 +
      virtual PortableInterceptor::ReplyStatus reply_status (
-         CORBA::Environment &ACE_TRY_ENV =
+                 CORBA::Environment &ACE_TRY_ENV = 
            TAO_default_environment ()
-@@ -1140,9 +1144,8 @@
+@@ -792,8 +796,7 @@
+ 
+     virtual IOP::TaggedComponent * get_effective_component (
+         IOP::ComponentId id,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -801,8 +804,7 @@
+ 
+     virtual CORBA::Policy_ptr get_request_policy (
+         CORBA::PolicyType type,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -811,8 +813,7 @@
+     virtual void add_request_service_context (
+         const IOP::ServiceContext & service_context,
+         CORBA::Boolean replace,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -931,32 +932,28 @@
+       }
+ 
+     virtual CORBA::Any * sending_exception (
+-                CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual CORBA::OctetSeq * object_id (
+-                CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual CORBA::OctetSeq * adapter_id (
+-                CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual char * target_most_derived_interface (
+-                CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -964,8 +961,7 @@
+ 
+     virtual CORBA::Policy_ptr get_server_policy (
+         CORBA::PolicyType type,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -974,9 +970,8 @@
+     virtual void set_slot (
+         PortableInterceptor::SlotId id,
+         const CORBA::Any & data,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
+-      )
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
++        )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+         PortableInterceptor::InvalidSlot
+@@ -984,8 +979,7 @@
+ 
+     virtual CORBA::Boolean target_is_a (
+         const char * id,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -994,9 +988,8 @@
+     virtual void add_reply_service_context (
+         const IOP::ServiceContext & service_context,
+         CORBA::Boolean replace,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
+-      )
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
++        )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+@@ -1114,47 +1107,42 @@
        }
  
      virtual void send_request (
 -        PortableInterceptor::ClientRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
+-      )
 +        PortableInterceptor::ClientRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-       )
++        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -1150,27 +1153,24 @@
+         PortableInterceptor::ForwardRequest
        )) = 0;
  
      virtual void send_poll (
 -        PortableInterceptor::ClientRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableInterceptor::ClientRequestInfo_ptr ri
-+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS        
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException
@@ -85,125 +187,160 @@
  
      virtual void receive_reply (
 -        PortableInterceptor::ClientRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
+-      )
 +        PortableInterceptor::ClientRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-       )
++        )
        ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
  
      virtual void receive_exception (
 -        PortableInterceptor::ClientRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
+-      )
 +        PortableInterceptor::ClientRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-       )
++        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -1178,9 +1178,8 @@
+         PortableInterceptor::ForwardRequest
        )) = 0;
  
      virtual void receive_other (
 -        PortableInterceptor::ClientRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableInterceptor::ClientRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -1301,9 +1300,8 @@
+@@ -1274,9 +1262,8 @@
        }
  
      virtual void receive_request_service_contexts (
 -        PortableInterceptor::ServerRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableInterceptor::ServerRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -1311,9 +1309,8 @@
+@@ -1284,38 +1271,34 @@
        )) = 0;
  
      virtual void receive_request (
 -        PortableInterceptor::ServerRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
+-      )
 +        PortableInterceptor::ServerRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-       )
++        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -1321,18 +1318,16 @@
+         PortableInterceptor::ForwardRequest
        )) = 0;
  
      virtual void send_reply (
 -        PortableInterceptor::ServerRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
+-      )
 +        PortableInterceptor::ServerRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-       )
++        )
        ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
  
      virtual void send_exception (
 -        PortableInterceptor::ServerRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
+-      )
 +        PortableInterceptor::ServerRequestInfo_ptr ri
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-       )
++        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -1340,9 +1335,8 @@
+         PortableInterceptor::ForwardRequest
        )) = 0;
  
      virtual void send_other (
 -        PortableInterceptor::ServerRequestInfo_ptr ri,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableInterceptor::ServerRequestInfo_ptr ri
-+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS        
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -1604,9 +1598,8 @@
+@@ -1436,8 +1419,7 @@
+ 
+     virtual CORBA::Policy_ptr get_effective_policy (
+         CORBA::PolicyType type,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -1445,8 +1427,7 @@
+ 
+     virtual void add_ior_component (
+         const IOP::TaggedComponent & component,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -1455,8 +1436,7 @@
+     virtual void add_ior_component_to_profile (
+         const IOP::TaggedComponent & component,
+         IOP::ProfileId profile_id,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -1575,9 +1555,8 @@
        }
  
      virtual void establish_components (
 -        PortableInterceptor::IORInfo_ptr info,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableInterceptor::IORInfo_ptr info
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException
-@@ -1727,9 +1720,8 @@
+@@ -1697,9 +1676,8 @@
  
      virtual CORBA::Policy_ptr create_policy (
          CORBA::PolicyType type,
 -        const CORBA::Any & value,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        const CORBA::Any & value
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException,
-@@ -2145,18 +2137,16 @@
+@@ -2105,18 +2083,16 @@
        }
  
      virtual void pre_init (
 -        PortableInterceptor::ORBInitInfo_ptr info,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableInterceptor::ORBInitInfo_ptr info
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
@@ -214,202 +351,32 @@
  
      virtual void post_init (
 -        PortableInterceptor::ORBInitInfo_ptr info,
--        CORBA::Environment &ACE_TRY_ENV =
+-        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableInterceptor::ORBInitInfo_ptr info
 +        TAO_ENV_ARG_DECL_WITH_DEFAULTS
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException
-@@ -2178,6 +2168,11 @@
+@@ -2137,6 +2113,11 @@
  
  #endif /* end #if !defined */
  
-+/// Register an ORBInitializer with the global ORBInitializer
-+/// table.
-+TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
-+  ORBInitializer_ptr init,
-+  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
++ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
++   ORBInitializer_ptr init,
++   CORBA::Environment & = TAO_default_environment ());
++ ///< Register an ORBInitializer with the global ORBInitializer
++ ///< table.
  
  }
  TAO_NAMESPACE_CLOSE // module PortableInterceptor
---- PortableInterceptorC.i.old	Fri Mar  2 12:16:13 2001
-+++ PortableInterceptorC.i	Fri Mar  2 12:16:42 2001
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- PortableInterceptorC.cpp.old	Fri Mar  2 12:16:13 2001
-+++ PortableInterceptorC.cpp	Fri Mar  2 12:19:47 2001
-@@ -21,10 +21,6 @@
- 
- #include "PortableInterceptorC.h"
- 
--#if TAO_HAS_INTERCEPTORS == 1
--#include "tao/RequestInfo_Util.h"
--#endif  /* TAO_HAS_INTERCEPTORS == 1 */
--
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus
- #endif /* __BORLANDC__ */
-@@ -33,6 +29,7 @@
+--- PortableInterceptorC.cpp.old	Mon Oct 23 22:19:37 2000
++++ PortableInterceptorC.cpp	Mon Oct 23 22:20:52 2000
+@@ -25,6 +25,7 @@
  #include "PortableInterceptorC.i"
  #endif /* !defined INLINE */
  
-+#include "CORBA_String.h"
++#include "tao/CORBA_String.h"
  
  // default constructor
- PortableInterceptor::Interceptor::Interceptor ()
-@@ -91,7 +88,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -165,7 +162,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -178,7 +175,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -338,7 +335,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -351,7 +348,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -452,7 +449,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -521,7 +518,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -602,7 +599,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -683,7 +680,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -764,7 +761,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -845,7 +842,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -914,7 +911,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -995,7 +992,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -1064,7 +1061,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -1133,7 +1130,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -1348,7 +1345,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -1618,4 +1615,3 @@
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-   #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
--
+ PortableInterceptor::Interceptor::Interceptor (void)
diff --git a/TAO/tao/diffs/RTCORBAC.cpp.diff b/TAO/tao/diffs/RTCORBAC.cpp.diff
index d8fc5025632..8cf219951ba 100644
--- a/TAO/tao/diffs/RTCORBAC.cpp.diff
+++ b/TAO/tao/diffs/RTCORBAC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/RTCORBAC.cpp	Sun Mar  4 10:31:32 2001
-+++ RTCORBAC.cpp	Sun Mar  4 10:36:38 2001
+--- orig/RTCORBAC.cpp	Tue Jan 30 19:10:17 2001
++++ RTCORBAC.cpp	Tue Jan 30 19:07:30 2001
 @@ -21,6 +21,11 @@
  
  #include "RTCORBAC.h"
@@ -12,8 +12,8 @@
  #if TAO_HAS_INTERCEPTORS == 1
  #include "tao/RequestInfo_Util.h"
  #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-@@ -851,6 +856,20 @@
-   return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
+@@ -843,6 +848,20 @@
+   return "IDL:omg.org/RTCORBA/ProtocolProperties:1.0";
  }
  
 +//////////////////////////////////////////////////////
diff --git a/TAO/tao/diffs/RTCORBAC.h.diff b/TAO/tao/diffs/RTCORBAC.h.diff
index 94463b6c7ff..ffc69645582 100644
--- a/TAO/tao/diffs/RTCORBAC.h.diff
+++ b/TAO/tao/diffs/RTCORBAC.h.diff
@@ -1,5 +1,5 @@
---- orig/RTCORBAC.h	Sun Mar  4 10:31:28 2001
-+++ RTCORBAC.h	Sun Mar  4 10:50:47 2001
+--- orig/RTCORBAC.h	Tue Jan 30 19:10:26 2001
++++ RTCORBAC.h	Tue Jan 30 19:06:01 2001
 @@ -23,16 +23,22 @@
  #define _TAO_IDL_ORIG_RTCORBAC_H_
  
@@ -42,7 +42,7 @@
    typedef CORBA::ULong ThreadpoolId;
    typedef CORBA::ULong_out ThreadpoolId_out;
      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadpoolId;
-@@ -612,7 +621,8 @@
+@@ -1053,7 +1062,8 @@
  #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
  #define _RTCORBA_PROTOCOLPROPERTIES_CH_
  
@@ -52,7 +52,7 @@
    {
    public:
    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-@@ -641,6 +651,11 @@
+@@ -1082,6 +1092,11 @@
  
      virtual const char* _interface_repository_id (void) const;
  
@@ -64,7 +64,7 @@
    protected:
      ProtocolProperties ();
  
-@@ -2661,7 +2676,7 @@
+@@ -2648,7 +2663,7 @@
            CORBA::Environment &
          );
  
@@ -73,7 +73,7 @@
  
  
        // = TAO extension.
-@@ -2858,6 +2873,8 @@
+@@ -2845,6 +2860,8 @@
  #if defined (__BORLANDC__)
  #pragma option pop
  #endif /* __BORLANDC__ */
diff --git a/TAO/tao/diffs/RTCORBAS.cpp.diff b/TAO/tao/diffs/RTCORBAS.cpp.diff
index 87aebc41211..e698ce9bdde 100644
--- a/TAO/tao/diffs/RTCORBAS.cpp.diff
+++ b/TAO/tao/diffs/RTCORBAS.cpp.diff
@@ -1,8 +1,8 @@
---- orig/RTCORBAS.cpp	Sun Mar  4 10:31:22 2001
-+++ RTCORBAS.cpp	Sun Mar  4 10:51:41 2001
-@@ -22,6 +22,10 @@
- #ifndef _TAO_IDL_ORIG_RTCORBAS_CPP_
- #define _TAO_IDL_ORIG_RTCORBAS_CPP_
+--- orig/RTCORBAS.cpp	Tue Jan 30 18:58:34 2001
++++ RTCORBAS.cpp	Tue Jan 30 19:08:47 2001
+@@ -19,6 +19,10 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 +#include "tao/orbconf.h"
 +
@@ -11,9 +11,8 @@
  #include "RTCORBAS.h"
  #include "tao/PortableServer/Object_Adapter.h"
  #include "tao/PortableServer/Operation_Table.h"
-@@ -40,3 +44,5 @@
+@@ -35,3 +39,4 @@
+ #include "RTCORBAS.i"
+ #endif /* !defined INLINE */
  
- 
- #endif /* ifndef */
-+
-+#endif /* (TAO_HAS_RT_CORBA == 1) */
++#endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/diffs/RTCORBAS.h.diff b/TAO/tao/diffs/RTCORBAS.h.diff
index 66757e24ddd..4d521366644 100644
--- a/TAO/tao/diffs/RTCORBAS.h.diff
+++ b/TAO/tao/diffs/RTCORBAS.h.diff
@@ -1,5 +1,5 @@
---- orig/RTCORBAS.h	Sun Mar  4 10:31:17 2001
-+++ RTCORBAS.h	Sun Mar  4 10:52:10 2001
+--- orig/RTCORBAS.h	Tue Jan 30 18:58:33 2001
++++ RTCORBAS.h	Tue Jan 30 19:07:55 2001
 @@ -23,6 +23,10 @@
  #define _TAO_IDL_ORIG_RTCORBAS_H_
  
diff --git a/TAO/tao/diffs/StringSeq.diff b/TAO/tao/diffs/StringSeq.diff
index b1a11be744e..e6ac79964a3 100644
--- a/TAO/tao/diffs/StringSeq.diff
+++ b/TAO/tao/diffs/StringSeq.diff
@@ -1,332 +1,383 @@
---- StringSeqC.h.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.h	Sat Mar  3 11:28:11 2001
+--- StringSeqC.h.old	Tue Jan 16 17:48:05 2001
++++ StringSeqC.h	Tue Jan 16 18:00:15 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -19,17 +19,18 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#ifndef _TAO_IDL_STRINGSEQC_H_
 -#define _TAO_IDL_STRINGSEQC_H_
-+#ifndef _TAO_IDL_CORBA_STRINGSEQC_H_
-+#define _TAO_IDL_CORBA_STRINGSEQC_H_
++#ifndef TAO_IDL_STRINGSEQC_H
++#define TAO_IDL_STRINGSEQC_H
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
 +
-+#include "corbafwd.h"
++#include "tao/corbafwd.h"
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
--#include "corbafwd.h"
-+#include "Sequence.h"
+-#include "tao/corbafwd.h"
++#include "tao/Sequence.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -54,20 +55,17 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+@@ -55,38 +56,38 @@
  #endif /* __BORLANDC__ */
  
--TAO_NAMESPACE  CORBA
--{
--
- #if !defined (_CORBA_STRINGSEQ_CH_)
- #define _CORBA_STRINGSEQ_CH_
- 
--  class StringSeq;
--  class StringSeq_var;
-+  class CORBA_StringSeq;
-+  class CORBA_StringSeq_var;
-   
-   // *************************************************************
--  // StringSeq
-+  // CORBA::StringSeq
-   // *************************************************************
-   
--  class TAO_Export StringSeq : public 
-+  class TAO_Export CORBA_StringSeq : public 
+ 
+-#if !defined (_STRINGSEQ_CH_)
+-#define _STRINGSEQ_CH_
++#if !defined (TAO_STRINGSEQ_CH)
++#define TAO_STRINGSEQ_CH
+ 
+-class StringSeq;
+-class StringSeq_var;
++class CORBA_StringSeq;
++class CORBA_StringSeq_var;
+ 
+ // *************************************************************
+-// StringSeq
++// CORBA_StringSeq
+ // *************************************************************
+ 
+-class TAO_Export StringSeq : public 
++class TAO_Export CORBA_StringSeq : public
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-     TAO_Unbounded_String_Sequence
+   TAO_Unbounded_String_Sequence
  #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -75,20 +73,20 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-   {
-   public:
--    StringSeq (void); // default ctor
--    StringSeq (CORBA::ULong max); // uses max size
--    StringSeq (
-+    CORBA_StringSeq (void); // default ctor
-+    CORBA_StringSeq (CORBA::ULong max); // uses max size
-+    CORBA_StringSeq (
-       CORBA::ULong max, 
-       CORBA::ULong length, 
-       char * *buffer, 
-       CORBA::Boolean release = 0
-     );
--    StringSeq (const StringSeq &); // copy ctor
--    ~StringSeq (void);
-+    CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
-+    ~CORBA_StringSeq (void);
-     static void _tao_any_destructor (void*);
+   TAO_Unbounded_String_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+-  StringSeq (void); // default ctor
+-  StringSeq (CORBA::ULong max); // uses max size
+-  StringSeq (
+-    CORBA::ULong max, 
+-    CORBA::ULong length, 
+-    char * *buffer, 
++  CORBA_StringSeq (void); // default ctor
++  CORBA_StringSeq (CORBA::ULong max); // uses max size
++  CORBA_StringSeq (
++    CORBA::ULong max,
++    CORBA::ULong length,
++    char * *buffer,
+     CORBA::Boolean release = 0
+   );
+-  StringSeq (const StringSeq &); // copy ctor
+-  ~StringSeq (void);
++  CORBA_StringSeq (const CORBA_StringSeq &); // copy ctor
++  ~CORBA_StringSeq (void);
+   static void _tao_any_destructor (void*);
  
  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef StringSeq_var _var_type;
-+    typedef CORBA_StringSeq_var _var_type;
+-  typedef StringSeq_var _var_type;
++  typedef CORBA_StringSeq_var _var_type;
  #endif /* ! __GNUC__ || g++ >= 2.8 */
  
-   };
-@@ -103,35 +101,35 @@
-   // class CORBA::StringSeq_var
-   // *************************************************************
+ };
+@@ -94,108 +95,108 @@
+ #endif /* end #if !defined */
  
--  class TAO_Export StringSeq_var
-+  class TAO_Export CORBA_StringSeq_var
-   {
-   public:
--    StringSeq_var (void); // default constructor
--    StringSeq_var (StringSeq *);
--    StringSeq_var (const StringSeq_var &); // copy constructor
--    ~StringSeq_var (void); // destructor
-+    CORBA_StringSeq_var (void); // default constructor
-+    CORBA_StringSeq_var (CORBA_StringSeq *);
-+    CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
-+    ~CORBA_StringSeq_var (void); // destructor
-     
--    StringSeq_var &operator= (StringSeq *);
--    StringSeq_var &operator= (const StringSeq_var &);
--    StringSeq *operator-> (void);
--    const StringSeq *operator-> (void) const;
-+    CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
-+    CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
-+    CORBA_StringSeq *operator-> (void);
-+    const CORBA_StringSeq *operator-> (void) const;
-     
--    operator const StringSeq &() const;
--    operator StringSeq &();
--    operator StringSeq &() const;
--    operator StringSeq *&(); // variable-size base types only
-+    operator const CORBA_StringSeq &() const;
-+    operator CORBA_StringSeq &();
-+    operator CORBA_StringSeq &() const;
-+    operator CORBA_StringSeq *&(); // variable-size base types only
-     
-     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-     
-     // in, inout, out, _retn 
--    const StringSeq &in (void) const;
--    StringSeq &inout (void);
--    StringSeq *&out (void);
--    StringSeq *_retn (void);
--    StringSeq *ptr (void) const;
-+    const CORBA_StringSeq &in (void) const;
-+    CORBA_StringSeq &inout (void);
-+    CORBA_StringSeq *&out (void);
-+    CORBA_StringSeq *_retn (void);
-+    CORBA_StringSeq *ptr (void) const;
- 
-   private:
--    StringSeq *ptr_;
-+    CORBA_StringSeq *ptr_;
-   };
- 
- 
-@@ -141,42 +139,39 @@
- #if !defined (_CORBA_STRINGSEQ___OUT_CH_)
- #define _CORBA_STRINGSEQ___OUT_CH_
- 
--  class TAO_Export StringSeq_out
-+  class TAO_Export CORBA_StringSeq_out
-   {
-   public:
--    StringSeq_out (StringSeq *&);
--    StringSeq_out (StringSeq_var &);
--    StringSeq_out (const StringSeq_out &);
--    StringSeq_out &operator= (const StringSeq_out &);
--    StringSeq_out &operator= (StringSeq *);
--    operator StringSeq *&();
--    StringSeq *&ptr (void);
--    StringSeq *operator-> (void);
-+    CORBA_StringSeq_out (CORBA_StringSeq *&);
-+    CORBA_StringSeq_out (CORBA_StringSeq_var &);
-+    CORBA_StringSeq_out (const CORBA_StringSeq_out &);
-+    CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
-+    CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
-+    operator CORBA_StringSeq *&();
-+    CORBA_StringSeq *&ptr (void);
-+    CORBA_StringSeq *operator-> (void);
-     TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-     
-   private:
--    StringSeq *&ptr_;
-+    CORBA_StringSeq *&ptr_;
-     // assignment from T_var not allowed
--    void operator= (const StringSeq_var &);
-+    void operator= (const CORBA_StringSeq_var &);
-   };
+ 
+-#if !defined (_STRINGSEQ___VAR_CH_)
+-#define _STRINGSEQ___VAR_CH_
++#if !defined (TAO_STRINGSEQ___VAR_CH)
++#define TAO_STRINGSEQ___VAR_CH
+ 
+ // *************************************************************
+-// class StringSeq_var
++// class CORBA_StringSeq_var
+ // *************************************************************
+ 
+-class TAO_Export StringSeq_var
++class TAO_Export CORBA_StringSeq_var
+ {
+ public:
+-  StringSeq_var (void); // default constructor
+-  StringSeq_var (StringSeq *);
+-  StringSeq_var (const StringSeq_var &); // copy constructor
+-  ~StringSeq_var (void); // destructor
+-  
+-  StringSeq_var &operator= (StringSeq *);
+-  StringSeq_var &operator= (const StringSeq_var &);
+-  StringSeq *operator-> (void);
+-  const StringSeq *operator-> (void) const;
+-  
+-  operator const StringSeq &() const;
+-  operator StringSeq &();
+-  operator StringSeq &() const;
+-  operator StringSeq *&(); // variable-size base types only
+-  
++  CORBA_StringSeq_var (void); // default constructor
++  CORBA_StringSeq_var (CORBA_StringSeq *);
++  CORBA_StringSeq_var (const CORBA_StringSeq_var &); // copy constructor
++  ~CORBA_StringSeq_var (void); // destructor
++
++  CORBA_StringSeq_var &operator= (CORBA_StringSeq *);
++  CORBA_StringSeq_var &operator= (const CORBA_StringSeq_var &);
++  CORBA_StringSeq *operator-> (void);
++  const CORBA_StringSeq *operator-> (void) const;
++
++  operator const CORBA_StringSeq &() const;
++  operator CORBA_StringSeq &();
++  operator CORBA_StringSeq &() const;
++  operator CORBA_StringSeq *&(); // variable-size base types only
++
+   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+-  
+-  // in, inout, out, _retn 
+-  const StringSeq &in (void) const;
+-  StringSeq &inout (void);
+-  StringSeq *&out (void);
+-  StringSeq *_retn (void);
+-  StringSeq *ptr (void) const;
++
++  // in, inout, out, _retn
++  const CORBA_StringSeq &in (void) const;
++  CORBA_StringSeq &inout (void);
++  CORBA_StringSeq *&out (void);
++  CORBA_StringSeq *_retn (void);
++  CORBA_StringSeq *ptr (void) const;
+ 
+ private:
+-  StringSeq *ptr_;
++  CORBA_StringSeq *ptr_;
+ };
  
  
  #endif /* end #if !defined */
  
--  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringSeq;
--
--
- #if !defined (_CORBA_WSTRINGSEQ_CH_)
- #define _CORBA_WSTRINGSEQ_CH_
- 
--  class WStringSeq;
--  class WStringSeq_var;
-+  class CORBA_WStringSeq;
-+  class CORBA_WStringSeq_var;
-   
-   // *************************************************************
--  // WStringSeq
-+  // CORBA::WStringSeq
-   // *************************************************************
-   
--  class TAO_Export WStringSeq : public 
-+  class TAO_Export CORBA_WStringSeq : public 
+ 
+-#if !defined (_STRINGSEQ___OUT_CH_)
+-#define _STRINGSEQ___OUT_CH_
++#if !defined (TAO_STRINGSEQ___OUT_CH)
++#define TAO_STRINGSEQ___OUT_CH
+ 
+-class TAO_Export StringSeq_out
++class TAO_Export CORBA_StringSeq_out
+ {
+ public:
+-  StringSeq_out (StringSeq *&);
+-  StringSeq_out (StringSeq_var &);
+-  StringSeq_out (const StringSeq_out &);
+-  StringSeq_out &operator= (const StringSeq_out &);
+-  StringSeq_out &operator= (StringSeq *);
+-  operator StringSeq *&();
+-  StringSeq *&ptr (void);
+-  StringSeq *operator-> (void);
++  CORBA_StringSeq_out (CORBA_StringSeq *&);
++  CORBA_StringSeq_out (CORBA_StringSeq_var &);
++  CORBA_StringSeq_out (const CORBA_StringSeq_out &);
++  CORBA_StringSeq_out &operator= (const CORBA_StringSeq_out &);
++  CORBA_StringSeq_out &operator= (CORBA_StringSeq *);
++  operator CORBA_StringSeq *&();
++  CORBA_StringSeq *&ptr (void);
++  CORBA_StringSeq *operator-> (void);
+   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+-  
++
+ private:
+-  StringSeq *&ptr_;
++  CORBA_StringSeq *&ptr_;
+   // assignment from T_var not allowed
+-  void operator= (const StringSeq_var &);
++  void operator= (const CORBA_StringSeq_var &);
+ };
+ 
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_Export CORBA::TypeCode_ptr  _tc_StringSeq;
++extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_StringSeq;
+ 
+ 
+-#if !defined (_WSTRINGSEQ_CH_)
+-#define _WSTRINGSEQ_CH_
++#if !defined (TAO_WSTRINGSEQ_CH)
++#define TAO_WSTRINGSEQ_CH
+ 
+-class WStringSeq;
+-class WStringSeq_var;
++class CORBA_WStringSeq;
++class CORBA_WStringSeq_var;
+ 
+ // *************************************************************
+-// WStringSeq
++// CORBA_WStringSeq
+ // *************************************************************
+ 
+-class TAO_Export WStringSeq : public 
++class TAO_Export CORBA_WStringSeq : public
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-     TAO_Unbounded_WString_Sequence
+   TAO_Unbounded_WString_Sequence
  #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -184,20 +179,20 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-   {
-   public:
--    WStringSeq (void); // default ctor
--    WStringSeq (CORBA::ULong max); // uses max size
--    WStringSeq (
-+    CORBA_WStringSeq (void); // default ctor
-+    CORBA_WStringSeq (CORBA::ULong max); // uses max size
-+    CORBA_WStringSeq (
-       CORBA::ULong max, 
-       CORBA::ULong length, 
-       CORBA::WChar * *buffer, 
-       CORBA::Boolean release = 0
-     );
--    WStringSeq (const WStringSeq &); // copy ctor
--    ~WStringSeq (void);
-+    CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
-+    ~CORBA_WStringSeq (void);
-     static void _tao_any_destructor (void*);
+   TAO_Unbounded_WString_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+-  WStringSeq (void); // default ctor
+-  WStringSeq (CORBA::ULong max); // uses max size
+-  WStringSeq (
+-    CORBA::ULong max, 
+-    CORBA::ULong length, 
+-    CORBA::WChar * *buffer, 
++  CORBA_WStringSeq (void); // default ctor
++  CORBA_WStringSeq (CORBA::ULong max); // uses max size
++  CORBA_WStringSeq (
++    CORBA::ULong max,
++    CORBA::ULong length,
++    CORBA::WChar * *buffer,
+     CORBA::Boolean release = 0
+   );
+-  WStringSeq (const WStringSeq &); // copy ctor
+-  ~WStringSeq (void);
++  CORBA_WStringSeq (const CORBA_WStringSeq &); // copy ctor
++  ~CORBA_WStringSeq (void);
+   static void _tao_any_destructor (void*);
  
  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef WStringSeq_var _var_type;
-+    typedef CORBA_WStringSeq_var _var_type;
+-  typedef WStringSeq_var _var_type;
++  typedef CORBA_WStringSeq_var _var_type;
  #endif /* ! __GNUC__ || g++ >= 2.8 */
  
-   };
-@@ -209,38 +204,38 @@
- #define _CORBA_WSTRINGSEQ___VAR_CH_
+ };
+@@ -203,117 +204,115 @@
+ #endif /* end #if !defined */
  
-   // *************************************************************
--  // class CORBA::WStringSeq_var
-+  // class CORBA_WStringSeq_var
-   // *************************************************************
  
--  class TAO_Export WStringSeq_var
-+  class TAO_Export CORBA_WStringSeq_var
-   {
-   public:
--    WStringSeq_var (void); // default constructor
--    WStringSeq_var (WStringSeq *);
--    WStringSeq_var (const WStringSeq_var &); // copy constructor
--    ~WStringSeq_var (void); // destructor
-+    CORBA_WStringSeq_var (void); // default constructor
-+    CORBA_WStringSeq_var (CORBA_WStringSeq *);
-+    CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
-+    ~CORBA_WStringSeq_var (void); // destructor
-     
--    WStringSeq_var &operator= (WStringSeq *);
--    WStringSeq_var &operator= (const WStringSeq_var &);
--    WStringSeq *operator-> (void);
--    const WStringSeq *operator-> (void) const;
-+    CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
-+    CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
-+    CORBA_WStringSeq *operator-> (void);
-+    const CORBA_WStringSeq *operator-> (void) const;
-     
--    operator const WStringSeq &() const;
--    operator WStringSeq &();
--    operator WStringSeq &() const;
--    operator WStringSeq *&(); // variable-size base types only
-+    operator const CORBA_WStringSeq &() const;
-+    operator CORBA_WStringSeq &();
-+    operator CORBA_WStringSeq &() const;
-+    operator CORBA_WStringSeq *&(); // variable-size base types only
-     
-     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-     
-     // in, inout, out, _retn 
--    const WStringSeq &in (void) const;
--    WStringSeq &inout (void);
--    WStringSeq *&out (void);
--    WStringSeq *_retn (void);
--    WStringSeq *ptr (void) const;
-+    const CORBA_WStringSeq &in (void) const;
-+    CORBA_WStringSeq &inout (void);
-+    CORBA_WStringSeq *&out (void);
-+    CORBA_WStringSeq *_retn (void);
-+    CORBA_WStringSeq *ptr (void) const;
- 
-   private:
--    WStringSeq *ptr_;
-+    CORBA_WStringSeq *ptr_;
-   };
- 
- 
-@@ -250,44 +245,38 @@
- #if !defined (_CORBA_WSTRINGSEQ___OUT_CH_)
- #define _CORBA_WSTRINGSEQ___OUT_CH_
- 
--  class TAO_Export WStringSeq_out
-+  class TAO_Export CORBA_WStringSeq_out
-   {
-   public:
--    WStringSeq_out (WStringSeq *&);
--    WStringSeq_out (WStringSeq_var &);
--    WStringSeq_out (const WStringSeq_out &);
--    WStringSeq_out &operator= (const WStringSeq_out &);
--    WStringSeq_out &operator= (WStringSeq *);
--    operator WStringSeq *&();
--    WStringSeq *&ptr (void);
--    WStringSeq *operator-> (void);
-+    CORBA_WStringSeq_out (CORBA_WStringSeq *&);
-+    CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
-+    CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
-+    CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
-+    CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
-+    operator CORBA_WStringSeq *&();
-+    CORBA_WStringSeq *&ptr (void);
-+    CORBA_WStringSeq *operator-> (void);
-     TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
-     
-   private:
--    WStringSeq *&ptr_;
-+    CORBA_WStringSeq *&ptr_;
-     // assignment from T_var not allowed
--    void operator= (const WStringSeq_var &);
-+    void operator= (const CORBA_WStringSeq_var &);
-   };
+-#if !defined (_WSTRINGSEQ___VAR_CH_)
+-#define _WSTRINGSEQ___VAR_CH_
++#if !defined (TAO_WSTRINGSEQ___VAR_CH)
++#define TAO_WSTRINGSEQ___VAR_CH
+ 
+ // *************************************************************
+-// class WStringSeq_var
++// class CORBA_WStringSeq_var
+ // *************************************************************
+ 
+-class TAO_Export WStringSeq_var
++class TAO_Export CORBA_WStringSeq_var
+ {
+ public:
+-  WStringSeq_var (void); // default constructor
+-  WStringSeq_var (WStringSeq *);
+-  WStringSeq_var (const WStringSeq_var &); // copy constructor
+-  ~WStringSeq_var (void); // destructor
+-  
+-  WStringSeq_var &operator= (WStringSeq *);
+-  WStringSeq_var &operator= (const WStringSeq_var &);
+-  WStringSeq *operator-> (void);
+-  const WStringSeq *operator-> (void) const;
+-  
+-  operator const WStringSeq &() const;
+-  operator WStringSeq &();
+-  operator WStringSeq &() const;
+-  operator WStringSeq *&(); // variable-size base types only
+-  
++  CORBA_WStringSeq_var (void); // default constructor
++  CORBA_WStringSeq_var (CORBA_WStringSeq *);
++  CORBA_WStringSeq_var (const CORBA_WStringSeq_var &); // copy constructor
++  ~CORBA_WStringSeq_var (void); // destructor
++
++  CORBA_WStringSeq_var &operator= (CORBA_WStringSeq *);
++  CORBA_WStringSeq_var &operator= (const CORBA_WStringSeq_var &);
++  CORBA_WStringSeq *operator-> (void);
++  const CORBA_WStringSeq *operator-> (void) const;
++
++  operator const CORBA_WStringSeq &() const;
++  operator CORBA_WStringSeq &();
++  operator CORBA_WStringSeq &() const;
++  operator CORBA_WStringSeq *&(); // variable-size base types only
++
+   TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
+-  
+-  // in, inout, out, _retn 
+-  const WStringSeq &in (void) const;
+-  WStringSeq &inout (void);
+-  WStringSeq *&out (void);
+-  WStringSeq *_retn (void);
+-  WStringSeq *ptr (void) const;
++
++  // in, inout, out, _retn
++  const CORBA_WStringSeq &in (void) const;
++  CORBA_WStringSeq &inout (void);
++  CORBA_WStringSeq *&out (void);
++  CORBA_WStringSeq *_retn (void);
++  CORBA_WStringSeq *ptr (void) const;
+ 
+ private:
+-  WStringSeq *ptr_;
++  CORBA_WStringSeq *ptr_;
+ };
  
  
  #endif /* end #if !defined */
  
--  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WStringSeq;
--
--
--}
--TAO_NAMESPACE_CLOSE // module CORBA
+ 
+-#if !defined (_WSTRINGSEQ___OUT_CH_)
+-#define _WSTRINGSEQ___OUT_CH_
++#if !defined (TAO_WSTRINGSEQ___OUT_CH)
++#define TAO_WSTRINGSEQ___OUT_CH
+ 
+-class TAO_Export WStringSeq_out
++class TAO_Export CORBA_WStringSeq_out
+ {
+ public:
+-  WStringSeq_out (WStringSeq *&);
+-  WStringSeq_out (WStringSeq_var &);
+-  WStringSeq_out (const WStringSeq_out &);
+-  WStringSeq_out &operator= (const WStringSeq_out &);
+-  WStringSeq_out &operator= (WStringSeq *);
+-  operator WStringSeq *&();
+-  WStringSeq *&ptr (void);
+-  WStringSeq *operator-> (void);
++  CORBA_WStringSeq_out (CORBA_WStringSeq *&);
++  CORBA_WStringSeq_out (CORBA_WStringSeq_var &);
++  CORBA_WStringSeq_out (const CORBA_WStringSeq_out &);
++  CORBA_WStringSeq_out &operator= (const CORBA_WStringSeq_out &);
++  CORBA_WStringSeq_out &operator= (CORBA_WStringSeq *);
++  operator CORBA_WStringSeq *&();
++  CORBA_WStringSeq *&ptr (void);
++  CORBA_WStringSeq *operator-> (void);
+   TAO_SeqElem_WString_Manager operator[] (CORBA::ULong index);
+-  
++
+ private:
+-  WStringSeq *&ptr_;
++  CORBA_WStringSeq *&ptr_;
+   // assignment from T_var not allowed
+-  void operator= (const WStringSeq_var &);
++  void operator= (const CORBA_WStringSeq_var &);
+ };
+ 
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_Export CORBA::TypeCode_ptr  _tc_WStringSeq;
 -
- // Proxy Broker Factory function pointer declarations.
- 
--TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
--TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
--TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
--TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
+-// Proxy Broker Factory function pointer declarations.
++extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_WStringSeq;
+ 
+-TAO_Export void operator<<= (CORBA::Any &, const StringSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, StringSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, StringSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const StringSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const WStringSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, WStringSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, WStringSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const WStringSeq *&);
 +TAO_Export void operator<<= (CORBA::Any &, const CORBA_StringSeq &); // copying version
 +TAO_Export void operator<<= (CORBA::Any &, CORBA_StringSeq*); // noncopying version
 +TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StringSeq *&); // deprecated
@@ -338,71 +389,104 @@
  
  #ifndef __ACE_INLINE__
  
-@@ -297,11 +286,11 @@
+ 
+-#if !defined _TAO_CDR_OP_StringSeq_H_
+-#define _TAO_CDR_OP_StringSeq_H_
++#if !defined TAO_TAO_CDR_OP_CORBA_StringSeq_H
++#define TAO_TAO_CDR_OP_CORBA_StringSeq_H
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
--    const CORBA::StringSeq &
+-    const StringSeq &
 +    const CORBA_StringSeq &
    );
  TAO_Export CORBA::Boolean operator>> (
      TAO_InputCDR &,
--    CORBA::StringSeq &
+-    StringSeq &
 +    CORBA_StringSeq &
    );
  
- #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
-@@ -312,11 +301,11 @@
+-#endif /* _TAO_CDR_OP_StringSeq_H_ */
++#endif /* TAO_TAO_CDR_OP_CORBA_StringSeq_H */
+ 
+ 
+-#if !defined _TAO_CDR_OP_WStringSeq_H_
+-#define _TAO_CDR_OP_WStringSeq_H_
++#if !defined TAO_TAO_CDR_OP_CORBA_WStringSeq_H
++#define TAO_TAO_CDR_OP_CORBA_WStringSeq_H
  
  TAO_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
--    const CORBA::WStringSeq &
+-    const WStringSeq &
 +    const CORBA_WStringSeq &
    );
  TAO_Export CORBA::Boolean operator>> (
      TAO_InputCDR &,
--    CORBA::WStringSeq &
+-    WStringSeq &
 +    CORBA_WStringSeq &
    );
  
- #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
---- StringSeqC.i.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.i	Sat Mar  3 11:28:19 2001
-@@ -28,40 +28,40 @@
+-#endif /* _TAO_CDR_OP_WStringSeq_H_ */
++#endif /* TAO_TAO_CDR_OP_CORBA_WStringSeq_H */
+ 
+ 
+ #endif /* __ACE_INLINE__ */
+--- StringSeqC.i.old	Tue Jan 16 17:48:05 2001
++++ StringSeqC.i	Tue Jan 16 17:03:27 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -20,148 +20,148 @@
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+ 
+-#if !defined (_STRINGSEQ_CI_)
+-#define _STRINGSEQ_CI_
++#if !defined (TAO_STRINGSEQ_CI)
++#define TAO_STRINGSEQ_CI
+ 
+ // *************************************************************
+-// Inline operations for class StringSeq_var
++// Inline operations for class CORBA_StringSeq_var
  // *************************************************************
  
  ACE_INLINE
--CORBA::StringSeq_var::StringSeq_var (void) // default constructor
+-StringSeq_var::StringSeq_var (void) // default constructor
 +CORBA_StringSeq_var::CORBA_StringSeq_var (void) // default constructor
    : ptr_ (0)
  {}
  
  ACE_INLINE
--CORBA::StringSeq_var::StringSeq_var (StringSeq *p)
+-StringSeq_var::StringSeq_var (StringSeq *p)
 +CORBA_StringSeq_var::CORBA_StringSeq_var (CORBA_StringSeq *p)
    : ptr_ (p)
  {}
  
  ACE_INLINE
--CORBA::StringSeq_var::StringSeq_var (const ::CORBA::StringSeq_var &p) // copy constructor
+-StringSeq_var::StringSeq_var (const ::StringSeq_var &p) // copy constructor
 +CORBA_StringSeq_var::CORBA_StringSeq_var (const ::CORBA_StringSeq_var &p) // copy constructor
  {
    if (p.ptr_)
--    ACE_NEW (this->ptr_, ::CORBA::StringSeq (*p.ptr_));
+-    ACE_NEW (this->ptr_, ::StringSeq (*p.ptr_));
 +    ACE_NEW (this->ptr_, ::CORBA_StringSeq (*p.ptr_));
    else
      this->ptr_ = 0;
  }
  
  ACE_INLINE
--CORBA::StringSeq_var::~StringSeq_var (void) // destructor
+-StringSeq_var::~StringSeq_var (void) // destructor
 +CORBA_StringSeq_var::~CORBA_StringSeq_var (void) // destructor
  {
    delete this->ptr_;
  }
  
--ACE_INLINE CORBA::StringSeq_var &
--CORBA::StringSeq_var::operator= (StringSeq *p)
+-ACE_INLINE StringSeq_var &
+-StringSeq_var::operator= (StringSeq *p)
 +ACE_INLINE CORBA_StringSeq_var &
 +CORBA_StringSeq_var::operator= (CORBA_StringSeq *p)
  {
@@ -411,43 +495,30 @@
    return *this;
  }
  
--ACE_INLINE ::CORBA::StringSeq_var &
--CORBA::StringSeq_var::operator= (const ::CORBA::StringSeq_var &p)
-+ACE_INLINE ::CORBA_StringSeq_var &
-+CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p)
+-ACE_INLINE StringSeq_var &
+-StringSeq_var::operator= (const ::StringSeq_var &p) // deep copy
++ACE_INLINE CORBA_StringSeq_var &
++CORBA_StringSeq_var::operator= (const ::CORBA_StringSeq_var &p) // deep copy
  {
    if (this != &p)
-     {
-@@ -72,12 +72,12 @@
-         }
-       else
-         {
--          StringSeq *deep_copy =
--            new StringSeq (*p.ptr_);
-+          CORBA_StringSeq *deep_copy =
-+            new CORBA_StringSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              StringSeq *tmp = deep_copy;
-+              CORBA_StringSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -88,80 +88,80 @@
+   {
+     delete this->ptr_;
+-    ACE_NEW_RETURN (this->ptr_, ::StringSeq (*p.ptr_), *this);
++    ACE_NEW_RETURN (this->ptr_, ::CORBA_StringSeq (*p.ptr_), *this);
+   }
    return *this;
  }
  
--ACE_INLINE const ::CORBA::StringSeq *
--CORBA::StringSeq_var::operator-> (void) const
+-ACE_INLINE const ::StringSeq *
+-StringSeq_var::operator-> (void) const
 +ACE_INLINE const ::CORBA_StringSeq *
 +CORBA_StringSeq_var::operator-> (void) const
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_var::operator-> (void)
+-ACE_INLINE ::StringSeq *
+-StringSeq_var::operator-> (void)
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_var::operator-> (void)
  {
@@ -455,21 +526,21 @@
  }
  
  ACE_INLINE 
--CORBA::StringSeq_var::operator const ::CORBA::StringSeq &() const // cast
+-StringSeq_var::operator const ::StringSeq &() const // cast
 +CORBA_StringSeq_var::operator const ::CORBA_StringSeq &() const // cast
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--CORBA::StringSeq_var::operator ::CORBA::StringSeq &() // cast 
+-StringSeq_var::operator ::StringSeq &() // cast 
 +CORBA_StringSeq_var::operator ::CORBA_StringSeq &() // cast 
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--CORBA::StringSeq_var::operator ::CORBA::StringSeq &() const // cast 
+-StringSeq_var::operator ::StringSeq &() const // cast 
 +CORBA_StringSeq_var::operator ::CORBA_StringSeq &() const // cast 
  {
    return *this->ptr_;
@@ -477,29 +548,29 @@
  
  // variable-size types only
  ACE_INLINE
--CORBA::StringSeq_var::operator ::CORBA::StringSeq *&() // cast 
+-StringSeq_var::operator ::StringSeq *&() // cast 
 +CORBA_StringSeq_var::operator ::CORBA_StringSeq *&() // cast 
  {
    return this->ptr_;
  }
  
  ACE_INLINE TAO_SeqElem_String_Manager
--CORBA::StringSeq_var::operator[] (CORBA::ULong index)
+-StringSeq_var::operator[] (CORBA::ULong index)
 +CORBA_StringSeq_var::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
  
--ACE_INLINE const ::CORBA::StringSeq &
--CORBA::StringSeq_var::in (void) const
+-ACE_INLINE const ::StringSeq &
+-StringSeq_var::in (void) const
 +ACE_INLINE const ::CORBA_StringSeq &
 +CORBA_StringSeq_var::in (void) const
  {
    return *this->ptr_;
  }
  
--ACE_INLINE ::CORBA::StringSeq &
--CORBA::StringSeq_var::inout (void)
+-ACE_INLINE ::StringSeq &
+-StringSeq_var::inout (void)
 +ACE_INLINE ::CORBA_StringSeq &
 +CORBA_StringSeq_var::inout (void)
  {
@@ -507,8 +578,8 @@
  }
  
  // mapping for variable size 
--ACE_INLINE ::CORBA::StringSeq *&
--CORBA::StringSeq_var::out (void)
+-ACE_INLINE ::StringSeq *&
+-StringSeq_var::out (void)
 +ACE_INLINE ::CORBA_StringSeq *&
 +CORBA_StringSeq_var::out (void)
  {
@@ -517,29 +588,32 @@
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_var::_retn (void)
+-ACE_INLINE ::StringSeq *
+-StringSeq_var::_retn (void)
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_var::_retn (void)
  {
--  ::CORBA::StringSeq *tmp = this->ptr_;
+-  ::StringSeq *tmp = this->ptr_;
 +  ::CORBA_StringSeq *tmp = this->ptr_;
    this->ptr_ = 0;
    return tmp;
  }
  
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_var::ptr (void) const
+-ACE_INLINE ::StringSeq *
+-StringSeq_var::ptr (void) const
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_var::ptr (void) const
  {
    return this->ptr_;
  }
-@@ -171,14 +171,14 @@
+ 
+ // *************************************************************
+-// Inline operations for class StringSeq_out
++// Inline operations for class CORBA_StringSeq_out
  // *************************************************************
  
  ACE_INLINE
--CORBA::StringSeq_out::StringSeq_out (StringSeq *&p)
+-StringSeq_out::StringSeq_out (StringSeq *&p)
 +CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq *&p)
    : ptr_ (p)
  {
@@ -547,23 +621,23 @@
  }
  
  ACE_INLINE
--CORBA::StringSeq_out::StringSeq_out (StringSeq_var &p) // constructor from _var
+-StringSeq_out::StringSeq_out (StringSeq_var &p) // constructor from _var
 +CORBA_StringSeq_out::CORBA_StringSeq_out (CORBA_StringSeq_var &p) // constructor from _var
    : ptr_ (p.out ())
  {
    delete this->ptr_;
-@@ -186,44 +186,44 @@
+@@ -169,44 +169,44 @@
  }
  
  ACE_INLINE
--CORBA::StringSeq_out::StringSeq_out (const ::CORBA::StringSeq_out &p) // copy constructor
+-StringSeq_out::StringSeq_out (const ::StringSeq_out &p) // copy constructor
 -  : ptr_ (ACE_const_cast (StringSeq_out&, p).ptr_)
 +CORBA_StringSeq_out::CORBA_StringSeq_out (const ::CORBA_StringSeq_out &p) // copy constructor
 +  : ptr_ (ACE_const_cast (CORBA_StringSeq_out&, p).ptr_)
  {}
  
--ACE_INLINE ::CORBA::StringSeq_out &
--CORBA::StringSeq_out::operator= (const ::CORBA::StringSeq_out &p)
+-ACE_INLINE ::StringSeq_out &
+-StringSeq_out::operator= (const ::StringSeq_out &p)
 +ACE_INLINE ::CORBA_StringSeq_out &
 +CORBA_StringSeq_out::operator= (const ::CORBA_StringSeq_out &p)
  {
@@ -572,8 +646,8 @@
    return *this;
  }
  
--ACE_INLINE ::CORBA::StringSeq_out &
--CORBA::StringSeq_out::operator= (StringSeq *p)
+-ACE_INLINE ::StringSeq_out &
+-StringSeq_out::operator= (StringSeq *p)
 +ACE_INLINE ::CORBA_StringSeq_out &
 +CORBA_StringSeq_out::operator= (CORBA_StringSeq *p)
  {
@@ -582,22 +656,22 @@
  }
  
  ACE_INLINE 
--CORBA::StringSeq_out::operator ::CORBA::StringSeq *&() // cast
+-StringSeq_out::operator ::StringSeq *&() // cast
 +CORBA_StringSeq_out::operator ::CORBA_StringSeq *&() // cast
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::StringSeq *&
--CORBA::StringSeq_out::ptr (void) // ptr
+-ACE_INLINE ::StringSeq *&
+-StringSeq_out::ptr (void) // ptr
 +ACE_INLINE ::CORBA_StringSeq *&
 +CORBA_StringSeq_out::ptr (void) // ptr
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::StringSeq *
--CORBA::StringSeq_out::operator-> (void)
+-ACE_INLINE ::StringSeq *
+-StringSeq_out::operator-> (void)
 +ACE_INLINE ::CORBA_StringSeq *
 +CORBA_StringSeq_out::operator-> (void)
  {
@@ -605,46 +679,57 @@
  }
  
  ACE_INLINE TAO_SeqElem_String_Manager
--CORBA::StringSeq_out::operator[] (CORBA::ULong index)
+-StringSeq_out::operator[] (CORBA::ULong index)
 +CORBA_StringSeq_out::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
-@@ -240,40 +240,40 @@
+@@ -215,148 +215,148 @@
+ #endif /* end #if !defined */
+ 
+ 
+-#if !defined (_WSTRINGSEQ_CI_)
+-#define _WSTRINGSEQ_CI_
++#if !defined (TAO_WSTRINGSEQ_CI)
++#define TAO_WSTRINGSEQ_CI
+ 
+ // *************************************************************
+-// Inline operations for class WStringSeq_var
++// Inline operations for class CORBA_WStringSeq_var
  // *************************************************************
  
  ACE_INLINE
--CORBA::WStringSeq_var::WStringSeq_var (void) // default constructor
+-WStringSeq_var::WStringSeq_var (void) // default constructor
 +CORBA_WStringSeq_var::CORBA_WStringSeq_var (void) // default constructor
    : ptr_ (0)
  {}
  
  ACE_INLINE
--CORBA::WStringSeq_var::WStringSeq_var (WStringSeq *p)
+-WStringSeq_var::WStringSeq_var (WStringSeq *p)
 +CORBA_WStringSeq_var::CORBA_WStringSeq_var (CORBA_WStringSeq *p)
    : ptr_ (p)
  {}
  
  ACE_INLINE
--CORBA::WStringSeq_var::WStringSeq_var (const ::CORBA::WStringSeq_var &p) // copy constructor
+-WStringSeq_var::WStringSeq_var (const ::WStringSeq_var &p) // copy constructor
 +CORBA_WStringSeq_var::CORBA_WStringSeq_var (const ::CORBA_WStringSeq_var &p) // copy constructor
  {
    if (p.ptr_)
--    ACE_NEW (this->ptr_, ::CORBA::WStringSeq (*p.ptr_));
+-    ACE_NEW (this->ptr_, ::WStringSeq (*p.ptr_));
 +    ACE_NEW (this->ptr_, ::CORBA_WStringSeq (*p.ptr_));
    else
      this->ptr_ = 0;
  }
  
  ACE_INLINE
--CORBA::WStringSeq_var::~WStringSeq_var (void) // destructor
+-WStringSeq_var::~WStringSeq_var (void) // destructor
 +CORBA_WStringSeq_var::~CORBA_WStringSeq_var (void) // destructor
  {
    delete this->ptr_;
  }
  
--ACE_INLINE CORBA::WStringSeq_var &
--CORBA::WStringSeq_var::operator= (WStringSeq *p)
+-ACE_INLINE WStringSeq_var &
+-WStringSeq_var::operator= (WStringSeq *p)
 +ACE_INLINE CORBA_WStringSeq_var &
 +CORBA_WStringSeq_var::operator= (CORBA_WStringSeq *p)
  {
@@ -653,43 +738,30 @@
    return *this;
  }
  
--ACE_INLINE ::CORBA::WStringSeq_var &
--CORBA::WStringSeq_var::operator= (const ::CORBA::WStringSeq_var &p)
-+ACE_INLINE ::CORBA_WStringSeq_var &
-+CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p)
+-ACE_INLINE WStringSeq_var &
+-WStringSeq_var::operator= (const ::WStringSeq_var &p) // deep copy
++ACE_INLINE CORBA_WStringSeq_var &
++CORBA_WStringSeq_var::operator= (const ::CORBA_WStringSeq_var &p) // deep copy
  {
    if (this != &p)
-     {
-@@ -284,12 +284,12 @@
-         }
-       else
-         {
--          WStringSeq *deep_copy =
--            new WStringSeq (*p.ptr_);
-+          CORBA_WStringSeq *deep_copy =
-+            new CORBA_WStringSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              WStringSeq *tmp = deep_copy;
-+              CORBA_WStringSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -300,80 +300,80 @@
+   {
+     delete this->ptr_;
+-    ACE_NEW_RETURN (this->ptr_, ::WStringSeq (*p.ptr_), *this);
++    ACE_NEW_RETURN (this->ptr_, ::CORBA_WStringSeq (*p.ptr_), *this);
+   }
    return *this;
  }
  
--ACE_INLINE const ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::operator-> (void) const
+-ACE_INLINE const ::WStringSeq *
+-WStringSeq_var::operator-> (void) const
 +ACE_INLINE const ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::operator-> (void) const
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::operator-> (void)
+-ACE_INLINE ::WStringSeq *
+-WStringSeq_var::operator-> (void)
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::operator-> (void)
  {
@@ -697,21 +769,21 @@
  }
  
  ACE_INLINE 
--CORBA::WStringSeq_var::operator const ::CORBA::WStringSeq &() const // cast
+-WStringSeq_var::operator const ::WStringSeq &() const // cast
 +CORBA_WStringSeq_var::operator const ::CORBA_WStringSeq &() const // cast
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() // cast 
+-WStringSeq_var::operator ::WStringSeq &() // cast 
 +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() // cast 
  {
    return *this->ptr_;
  }
  
  ACE_INLINE 
--CORBA::WStringSeq_var::operator ::CORBA::WStringSeq &() const // cast 
+-WStringSeq_var::operator ::WStringSeq &() const // cast 
 +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq &() const // cast 
  {
    return *this->ptr_;
@@ -719,29 +791,29 @@
  
  // variable-size types only
  ACE_INLINE
--CORBA::WStringSeq_var::operator ::CORBA::WStringSeq *&() // cast 
+-WStringSeq_var::operator ::WStringSeq *&() // cast 
 +CORBA_WStringSeq_var::operator ::CORBA_WStringSeq *&() // cast 
  {
    return this->ptr_;
  }
  
  ACE_INLINE TAO_SeqElem_WString_Manager
--CORBA::WStringSeq_var::operator[] (CORBA::ULong index)
+-WStringSeq_var::operator[] (CORBA::ULong index)
 +CORBA_WStringSeq_var::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
  
--ACE_INLINE const ::CORBA::WStringSeq &
--CORBA::WStringSeq_var::in (void) const
+-ACE_INLINE const ::WStringSeq &
+-WStringSeq_var::in (void) const
 +ACE_INLINE const ::CORBA_WStringSeq &
 +CORBA_WStringSeq_var::in (void) const
  {
    return *this->ptr_;
  }
  
--ACE_INLINE ::CORBA::WStringSeq &
--CORBA::WStringSeq_var::inout (void)
+-ACE_INLINE ::WStringSeq &
+-WStringSeq_var::inout (void)
 +ACE_INLINE ::CORBA_WStringSeq &
 +CORBA_WStringSeq_var::inout (void)
  {
@@ -749,8 +821,8 @@
  }
  
  // mapping for variable size 
--ACE_INLINE ::CORBA::WStringSeq *&
--CORBA::WStringSeq_var::out (void)
+-ACE_INLINE ::WStringSeq *&
+-WStringSeq_var::out (void)
 +ACE_INLINE ::CORBA_WStringSeq *&
 +CORBA_WStringSeq_var::out (void)
  {
@@ -759,29 +831,32 @@
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::_retn (void)
+-ACE_INLINE ::WStringSeq *
+-WStringSeq_var::_retn (void)
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::_retn (void)
  {
--  ::CORBA::WStringSeq *tmp = this->ptr_;
+-  ::WStringSeq *tmp = this->ptr_;
 +  ::CORBA_WStringSeq *tmp = this->ptr_;
    this->ptr_ = 0;
    return tmp;
  }
  
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_var::ptr (void) const
+-ACE_INLINE ::WStringSeq *
+-WStringSeq_var::ptr (void) const
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_var::ptr (void) const
  {
    return this->ptr_;
  }
-@@ -383,14 +383,14 @@
+ 
+ // *************************************************************
+-// Inline operations for class WStringSeq_out
++// Inline operations for class CORBA_WStringSeq_out
  // *************************************************************
  
  ACE_INLINE
--CORBA::WStringSeq_out::WStringSeq_out (WStringSeq *&p)
+-WStringSeq_out::WStringSeq_out (WStringSeq *&p)
 +CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq *&p)
    : ptr_ (p)
  {
@@ -789,23 +864,23 @@
  }
  
  ACE_INLINE
--CORBA::WStringSeq_out::WStringSeq_out (WStringSeq_var &p) // constructor from _var
+-WStringSeq_out::WStringSeq_out (WStringSeq_var &p) // constructor from _var
 +CORBA_WStringSeq_out::CORBA_WStringSeq_out (CORBA_WStringSeq_var &p) // constructor from _var
    : ptr_ (p.out ())
  {
    delete this->ptr_;
-@@ -398,44 +398,44 @@
+@@ -364,44 +364,44 @@
  }
  
  ACE_INLINE
--CORBA::WStringSeq_out::WStringSeq_out (const ::CORBA::WStringSeq_out &p) // copy constructor
+-WStringSeq_out::WStringSeq_out (const ::WStringSeq_out &p) // copy constructor
 -  : ptr_ (ACE_const_cast (WStringSeq_out&, p).ptr_)
 +CORBA_WStringSeq_out::CORBA_WStringSeq_out (const ::CORBA_WStringSeq_out &p) // copy constructor
 +  : ptr_ (ACE_const_cast (CORBA_WStringSeq_out&, p).ptr_)
  {}
  
--ACE_INLINE ::CORBA::WStringSeq_out &
--CORBA::WStringSeq_out::operator= (const ::CORBA::WStringSeq_out &p)
+-ACE_INLINE ::WStringSeq_out &
+-WStringSeq_out::operator= (const ::WStringSeq_out &p)
 +ACE_INLINE ::CORBA_WStringSeq_out &
 +CORBA_WStringSeq_out::operator= (const ::CORBA_WStringSeq_out &p)
  {
@@ -814,8 +889,8 @@
    return *this;
  }
  
--ACE_INLINE ::CORBA::WStringSeq_out &
--CORBA::WStringSeq_out::operator= (WStringSeq *p)
+-ACE_INLINE ::WStringSeq_out &
+-WStringSeq_out::operator= (WStringSeq *p)
 +ACE_INLINE ::CORBA_WStringSeq_out &
 +CORBA_WStringSeq_out::operator= (CORBA_WStringSeq *p)
  {
@@ -824,22 +899,22 @@
  }
  
  ACE_INLINE 
--CORBA::WStringSeq_out::operator ::CORBA::WStringSeq *&() // cast
+-WStringSeq_out::operator ::WStringSeq *&() // cast
 +CORBA_WStringSeq_out::operator ::CORBA_WStringSeq *&() // cast
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::WStringSeq *&
--CORBA::WStringSeq_out::ptr (void) // ptr
+-ACE_INLINE ::WStringSeq *&
+-WStringSeq_out::ptr (void) // ptr
 +ACE_INLINE ::CORBA_WStringSeq *&
 +CORBA_WStringSeq_out::ptr (void) // ptr
  {
    return this->ptr_;
  }
  
--ACE_INLINE ::CORBA::WStringSeq *
--CORBA::WStringSeq_out::operator-> (void)
+-ACE_INLINE ::WStringSeq *
+-WStringSeq_out::operator-> (void)
 +ACE_INLINE ::CORBA_WStringSeq *
 +CORBA_WStringSeq_out::operator-> (void)
  {
@@ -847,27 +922,64 @@
  }
  
  ACE_INLINE TAO_SeqElem_WString_Manager
--CORBA::WStringSeq_out::operator[] (CORBA::ULong index)
+-WStringSeq_out::operator[] (CORBA::ULong index)
 +CORBA_WStringSeq_out::operator[] (CORBA::ULong index)
  {
    return this->ptr_->operator[] (index);
  }
-@@ -464,11 +464,11 @@
+@@ -410,32 +410,32 @@
+ #endif /* end #if !defined */
+ 
+ 
+-#if !defined _TAO_CDR_OP_StringSeq_I_
+-#define _TAO_CDR_OP_StringSeq_I_
++#if !defined TAO_TAO_CDR_OP_CORBA_StringSeq_I
++#define TAO_TAO_CDR_OP_CORBA_StringSeq_I
+ 
+ CORBA::Boolean TAO_Export operator<< (
+     TAO_OutputCDR &,
+-    const StringSeq &
++    const CORBA_StringSeq &
+   );
+ CORBA::Boolean TAO_Export operator>> (
+     TAO_InputCDR &,
+-    StringSeq &
++    CORBA_StringSeq &
+   );
+ 
+-#endif /* _TAO_CDR_OP_StringSeq_I_ */
++#endif /* TAO_TAO_CDR_OP_CORBA_StringSeq_I */
+ 
+ 
+-#if !defined _TAO_CDR_OP_WStringSeq_I_
+-#define _TAO_CDR_OP_WStringSeq_I_
++#if !defined TAO_TAO_CDR_OP_CORBA_WStringSeq_I
++#define TAO_TAO_CDR_OP_CORBA_WStringSeq_I
  
  CORBA::Boolean TAO_Export operator<< (
      TAO_OutputCDR &,
--    const CORBA::WStringSeq &
+-    const WStringSeq &
 +    const CORBA_WStringSeq &
    );
  CORBA::Boolean TAO_Export operator>> (
      TAO_InputCDR &,
--    CORBA::WStringSeq &
+-    WStringSeq &
 +    CORBA_WStringSeq &
    );
  
- #endif /* _TAO_CDR_OP_CORBA_WStringSeq_I_ */
---- StringSeqC.cpp.old	Fri Mar  2 23:51:36 2001
-+++ StringSeqC.cpp	Sat Mar  3 11:28:29 2001
+-#endif /* _TAO_CDR_OP_WStringSeq_I_ */
++#endif /* TAO_TAO_CDR_OP_CORBA_WStringSeq_I */
+ 
+--- StringSeqC.cpp.old	Tue Jan 16 17:48:05 2001
++++ StringSeqC.cpp	Tue Jan 16 18:01:46 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -21,10 +21,6 @@
  
  #include "StringSeqC.h"
@@ -879,63 +991,56 @@
  #if defined (__BORLANDC__)
  #pragma option -w-rvl -w-rch -w-ccc -w-aus
  #endif /* __BORLANDC__ */
-@@ -33,6 +29,9 @@
+@@ -33,17 +29,18 @@
  #include "StringSeqC.i"
  #endif /* !defined INLINE */
  
-+#include "Any.h"
-+#include "CDR.h"
-+#include "Typecode.h"
++#include "tao/Any.h"
+ 
+-#if !defined (_STRINGSEQ_CS_)
+-#define _STRINGSEQ_CS_
++#if !defined (TAO_STRINGSEQ_CS)
++#define TAO_STRINGSEQ_CS
  
- #if !defined (_CORBA_STRINGSEQ_CS_)
- #define _CORBA_STRINGSEQ_CS_
-@@ -41,40 +40,40 @@
- // CORBA::StringSeq
+ // *************************************************************
+-// StringSeq
++// CORBA_StringSeq
  // *************************************************************
  
--CORBA::StringSeq::StringSeq (void)
+-StringSeq::StringSeq (void)
 +CORBA_StringSeq::CORBA_StringSeq (void)
  {}
--CORBA::StringSeq::StringSeq (CORBA::ULong max) // uses max size
--  : 
+-StringSeq::StringSeq (CORBA::ULong max) // uses max size
 +CORBA_StringSeq::CORBA_StringSeq (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 */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -52,7 +49,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max)
  {}
--CORBA::StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
--  : 
+-StringSeq::StringSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
 +CORBA_StringSeq::CORBA_StringSeq (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 */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -61,7 +58,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max, length, buffer, release)
  {}
--CORBA::StringSeq::StringSeq (const StringSeq &seq) // copy ctor
--  : 
+-StringSeq::StringSeq (const StringSeq &seq) // copy ctor
 +CORBA_StringSeq::CORBA_StringSeq (const CORBA_StringSeq &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 */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -70,22 +67,22 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (seq)
  {}
--CORBA::StringSeq::~StringSeq (void) // dtor
+-StringSeq::~StringSeq (void) // dtor
 +CORBA_StringSeq::~CORBA_StringSeq (void) // dtor
  {}
--void CORBA::StringSeq::_tao_any_destructor (void *x)
+-void StringSeq::_tao_any_destructor (void *x)
 +void CORBA_StringSeq::_tao_any_destructor (void *x)
  {
 -  StringSeq *tmp = ACE_static_cast (StringSeq*,x);
@@ -943,68 +1048,74 @@
    delete tmp;
  }
  
-@@ -89,12 +88,12 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_StringSeq[] =
++static const CORBA::Long _oc_CORBA_StringSeq[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+-  18, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:StringSeq:1.0
+-  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = StringSeq
++  18, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:CORBA_StringSeq:1.0
++  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e675365), ACE_NTOHL (0x71000000),  // name = CORBA_StringSeq
    CORBA::tk_sequence, // typecode kind
    16, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_string, 
-+    CORBA::tk_string,
-     0U, // string length
+@@ -94,20 +91,20 @@
      0U,
  
  };
--static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA::StringSeq));
+-static CORBA::TypeCode _tc_TAO_tc_StringSeq (CORBA::tk_alias, sizeof (_oc_StringSeq), (char *) &_oc_StringSeq, 0, sizeof (StringSeq));
+-CORBA::TypeCode_ptr _tc_StringSeq = &_tc_TAO_tc_StringSeq;
 +static CORBA::TypeCode _tc_TAO_tc_CORBA_StringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_StringSeq), (char *) &_oc_CORBA_StringSeq, 0, sizeof (CORBA_StringSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (CORBA)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringSeq, &_tc_TAO_tc_CORBA_StringSeq)
-@@ -107,40 +106,40 @@
- // CORBA::WStringSeq
++CORBA::TypeCode_ptr _tc_CORBA_StringSeq = &_tc_TAO_tc_CORBA_StringSeq;
+ 
+ 
+-#if !defined (_WSTRINGSEQ_CS_)
+-#define _WSTRINGSEQ_CS_
++#if !defined (TAO_WSTRINGSEQ_CS)
++#define TAO_WSTRINGSEQ_CS
+ 
+ // *************************************************************
+-// WStringSeq
++// CORBA_WStringSeq
  // *************************************************************
  
--CORBA::WStringSeq::WStringSeq (void)
+-WStringSeq::WStringSeq (void)
 +CORBA_WStringSeq::CORBA_WStringSeq (void)
  {}
--CORBA::WStringSeq::WStringSeq (CORBA::ULong max) // uses max size
--  : 
+-WStringSeq::WStringSeq (CORBA::ULong max) // uses max size
 +CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max) // uses max size
-+  :
+   : 
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_WString_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_WString_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -116,7 +113,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max)
  {}
--CORBA::WStringSeq::WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
--  : 
+-WStringSeq::WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
 +CORBA_WStringSeq::CORBA_WStringSeq (CORBA::ULong max, CORBA::ULong length, CORBA::WChar * *buffer, CORBA::Boolean release)
-+  :
+   : 
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_WString_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_WString_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -125,7 +122,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (max, length, buffer, release)
  {}
--CORBA::WStringSeq::WStringSeq (const WStringSeq &seq) // copy ctor
--  : 
+-WStringSeq::WStringSeq (const WStringSeq &seq) // copy ctor
 +CORBA_WStringSeq::CORBA_WStringSeq (const CORBA_WStringSeq &seq) // copy ctor
-+  :
+   : 
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    TAO_Unbounded_WString_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_WString_Sequence
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+@@ -134,22 +131,22 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   (seq)
  {}
--CORBA::WStringSeq::~WStringSeq (void) // dtor
+-WStringSeq::~WStringSeq (void) // dtor
 +CORBA_WStringSeq::~CORBA_WStringSeq (void) // dtor
  {}
--void CORBA::WStringSeq::_tao_any_destructor (void *x)
+-void WStringSeq::_tao_any_destructor (void *x)
 +void CORBA_WStringSeq::_tao_any_destructor (void *x)
  {
 -  WStringSeq *tmp = ACE_static_cast (WStringSeq*,x);
@@ -1012,68 +1123,91 @@
    delete tmp;
  }
  
-@@ -155,19 +154,20 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_WStringSeq[] =
++static const CORBA::Long _oc_CORBA_WStringSeq[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+-  19, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:WStringSeq:1.0
+-  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = WStringSeq
++  19, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:CORBA_WStringSeq:1.0
++  11, ACE_NTOHL (0x57537472), ACE_NTOHL (0x696e6753), ACE_NTOHL (0x65710000),  // name = CORBA_WStringSeq
    CORBA::tk_sequence, // typecode kind
    16, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_wstring, 
-+    CORBA::tk_wstring,
-     0U, // string length
+@@ -158,54 +155,54 @@
      0U,
  
  };
--static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA::WStringSeq));
+-static CORBA::TypeCode _tc_TAO_tc_WStringSeq (CORBA::tk_alias, sizeof (_oc_WStringSeq), (char *) &_oc_WStringSeq, 0, sizeof (WStringSeq));
+-CORBA::TypeCode_ptr _tc_WStringSeq = &_tc_TAO_tc_WStringSeq;
 +static CORBA::TypeCode _tc_TAO_tc_CORBA_WStringSeq (CORBA::tk_alias, sizeof (_oc_CORBA_WStringSeq), (char *) &_oc_CORBA_WStringSeq, 0, sizeof (CORBA_WStringSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (CORBA)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WStringSeq, &_tc_TAO_tc_CORBA_WStringSeq)
- TAO_NAMESPACE_END
-+
++CORBA::TypeCode_ptr _tc_CORBA_WStringSeq = &_tc_TAO_tc_CORBA_WStringSeq;
+ 
  void operator<<= (
      CORBA::Any &_tao_any,
--    const CORBA::StringSeq &_tao_elem
+-    const StringSeq &_tao_elem
 +    const CORBA_StringSeq &_tao_elem
    ) // copying
  {
    TAO_OutputCDR stream;
-@@ -181,7 +181,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_StringSeq,
++        _tc_CORBA_StringSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
    }
  }
  
--void operator<<= (CORBA::Any &_tao_any, CORBA::StringSeq *_tao_elem) // non copying
+-void operator<<= (CORBA::Any &_tao_any, StringSeq *_tao_elem) // non copying
 +void operator<<= (CORBA::Any &_tao_any, CORBA_StringSeq *_tao_elem) // non copying
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
-@@ -191,19 +191,19 @@
+   _tao_any._tao_replace (
+-      _tc_StringSeq,
++      _tc_CORBA_StringSeq,
+       TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
        _tao_elem,
--      CORBA::StringSeq::_tao_any_destructor
+-      StringSeq::_tao_any_destructor
 +      CORBA_StringSeq::_tao_any_destructor
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, StringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringSeq *&_tao_elem)
  {
    return _tao_any >>= ACE_const_cast(
--      const CORBA::StringSeq*&,
+-      const StringSeq*&,
 +      const CORBA_StringSeq*&,
        _tao_elem
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const StringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StringSeq *&_tao_elem)
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
-@@ -217,15 +217,15 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    if (!type->equivalent (_tc_StringSeq, ACE_TRY_ENV)) // not equal
++    if (!type->equivalent (_tc_CORBA_StringSeq, ACE_TRY_ENV)) // not equal
+       {
+         return 0;
+       }
+@@ -213,15 +210,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
--          const CORBA::StringSeq*,
+-          const StringSeq*,
 +          const CORBA_StringSeq*,
            _tao_any.value ()
          );
@@ -1081,69 +1215,90 @@
      }
      else
      {
--      CORBA::StringSeq *tmp;
--      ACE_NEW_RETURN (tmp, CORBA::StringSeq, 0);
+-      StringSeq *tmp;
+-      ACE_NEW_RETURN (tmp, StringSeq, 0);
 +      CORBA_StringSeq *tmp;
 +      ACE_NEW_RETURN (tmp, CORBA_StringSeq, 0);
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -236,7 +236,7 @@
-             CORBA::_tc_StringSeq,
+@@ -229,10 +226,10 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_StringSeq,
++            _tc_CORBA_StringSeq,
              1,
              ACE_static_cast (void *, tmp),
--            CORBA::StringSeq::_tao_any_destructor
+-            StringSeq::_tao_any_destructor
 +            CORBA_StringSeq::_tao_any_destructor
            );
          _tao_elem = tmp;
          return 1;
-@@ -256,7 +256,7 @@
+@@ -252,49 +249,49 @@
  
  void operator<<= (
      CORBA::Any &_tao_any,
--    const CORBA::WStringSeq &_tao_elem
+-    const WStringSeq &_tao_elem
 +    const CORBA_WStringSeq &_tao_elem
    ) // copying
  {
    TAO_OutputCDR stream;
-@@ -270,7 +270,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_WStringSeq,
++        _tc_CORBA_WStringSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
    }
  }
  
--void operator<<= (CORBA::Any &_tao_any, CORBA::WStringSeq *_tao_elem) // non copying
+-void operator<<= (CORBA::Any &_tao_any, WStringSeq *_tao_elem) // non copying
 +void operator<<= (CORBA::Any &_tao_any, CORBA_WStringSeq *_tao_elem) // non copying
  {
    TAO_OutputCDR stream;
    stream << *_tao_elem;
-@@ -280,19 +280,19 @@
+   _tao_any._tao_replace (
+-      _tc_WStringSeq,
++      _tc_CORBA_WStringSeq,
+       TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
        _tao_elem,
--      CORBA::WStringSeq::_tao_any_destructor
+-      WStringSeq::_tao_any_destructor
 +      CORBA_WStringSeq::_tao_any_destructor
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WStringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, WStringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WStringSeq *&_tao_elem)
  {
    return _tao_any >>= ACE_const_cast(
--      const CORBA::WStringSeq*&,
+-      const WStringSeq*&,
 +      const CORBA_WStringSeq*&,
        _tao_elem
      );
  }
  
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::WStringSeq *&_tao_elem)
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const WStringSeq *&_tao_elem)
 +CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_WStringSeq *&_tao_elem)
  {
    _tao_elem = 0;
    ACE_TRY_NEW_ENV
-@@ -306,15 +306,15 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    if (!type->equivalent (_tc_WStringSeq, ACE_TRY_ENV)) // not equal
++    if (!type->equivalent (_tc_CORBA_WStringSeq, ACE_TRY_ENV)) // not equal
+       {
+         return 0;
+       }
+@@ -302,15 +299,15 @@
      if (_tao_any.any_owns_data ())
      {
        _tao_elem = ACE_static_cast(
--          const CORBA::WStringSeq*,
+-          const WStringSeq*,
 +          const CORBA_WStringSeq*,
            _tao_any.value ()
          );
@@ -1151,78 +1306,59 @@
      }
      else
      {
--      CORBA::WStringSeq *tmp;
--      ACE_NEW_RETURN (tmp, CORBA::WStringSeq, 0);
+-      WStringSeq *tmp;
+-      ACE_NEW_RETURN (tmp, WStringSeq, 0);
 +      CORBA_WStringSeq *tmp;
 +      ACE_NEW_RETURN (tmp, CORBA_WStringSeq, 0);
        TAO_InputCDR stream (
            _tao_any._tao_get_cdr (),
            _tao_any._tao_byte_order ()
-@@ -325,7 +325,7 @@
-             CORBA::_tc_WStringSeq,
+@@ -318,10 +315,10 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_WStringSeq,
++            _tc_CORBA_WStringSeq,
              1,
              ACE_static_cast (void *, tmp),
--            CORBA::WStringSeq::_tao_any_destructor
+-            WStringSeq::_tao_any_destructor
 +            CORBA_WStringSeq::_tao_any_destructor
            );
          _tao_elem = tmp;
          return 1;
-@@ -345,7 +345,7 @@
+@@ -341,7 +338,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
--    const CORBA::StringSeq &_tao_sequence
+-    const StringSeq &_tao_sequence
 +    const CORBA_StringSeq &_tao_sequence
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -363,7 +363,7 @@
+@@ -359,7 +356,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
--    CORBA::StringSeq &_tao_sequence
+-    StringSeq &_tao_sequence
 +    CORBA_StringSeq &_tao_sequence
    )
  {
    CORBA::ULong _tao_seq_len;
-@@ -372,7 +372,7 @@
-     // set the length of the sequence
-     _tao_sequence.length (_tao_seq_len);
-     // If length is 0 we return true.
--    if (0 >= _tao_seq_len) 
-+    if (0 >= _tao_seq_len)
-       return 1;
-     // retrieve all the elements
-     CORBA::Boolean _tao_marshal_flag = 1;
-@@ -387,7 +387,7 @@
+@@ -383,7 +380,7 @@
  
  CORBA::Boolean operator<< (
      TAO_OutputCDR &strm,
--    const CORBA::WStringSeq &_tao_sequence
+-    const WStringSeq &_tao_sequence
 +    const CORBA_WStringSeq &_tao_sequence
    )
  {
    if (strm << _tao_sequence.length ())
-@@ -405,7 +405,7 @@
+@@ -401,7 +398,7 @@
  
  CORBA::Boolean operator>> (
      TAO_InputCDR &strm,
--    CORBA::WStringSeq &_tao_sequence
+-    WStringSeq &_tao_sequence
 +    CORBA_WStringSeq &_tao_sequence
    )
  {
    CORBA::ULong _tao_seq_len;
-@@ -414,7 +414,7 @@
-     // set the length of the sequence
-     _tao_sequence.length (_tao_seq_len);
-     // If length is 0 we return true.
--    if (0 >= _tao_seq_len) 
-+    if (0 >= _tao_seq_len)
-       return 1;
-     // retrieve all the elements
-     CORBA::Boolean _tao_marshal_flag = 1;
-@@ -426,4 +426,3 @@
-   }
-   return 0; // error
- }
--
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index b30aeef2d08..9810ac00a10 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -341,10 +341,9 @@
 // default can be changed, but then the application developer is
 // responsible for instantiating the templates.
 //
-#if defined (AIX) || \
-    (!defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-     (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
-      (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS))))
+#if !defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
+    (defined (ACE_HAS_TEMPLATE_SPECIALIZATION) || \
+     (defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) && defined (_UNICOS)))
 #define TAO_USE_SEQUENCE_TEMPLATES
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
@@ -368,13 +367,6 @@
 #define TAO_OBJID_PRIORITYMAPPINGMANAGER  "PriorityMappingManager"
 #define TAO_OBJID_SECURITYCURRENT     "SecurityCurrent"
 #define TAO_OBJID_TRANSACTIONCURRENT  "TransactionCurrent"
-#define TAO_OBJID_NOTIFICATIONSERVICE "NotificationService"
-#define TAO_OBJID_TYPEDNOTIFICATIONSERVICE "TypedNotificationService"
-#define TAO_OBJID_COMPONENTHOMEFINDER "ComponentHomeFinder"
-#define TAO_OBJID_PSS "PSS"
-#define TAO_OBJID_CODECFACTORY "CodecFactory"
-#define TAO_OBJID_PICurrent "PICurrent"
-
 
 // Comma separated list of the above ObjectIDs.
 // DO NOT include unimplemented services!
@@ -394,12 +386,8 @@
         TAO_OBJID_DYNANYFACTORY, \
         TAO_OBJID_TYPECODEFACTORY, \
         TAO_OBJID_RTORB, \
-        TAO_OBJID_RTCURRENT
-// @@ Some initial references are added via other means, such as
-//    ORBInitInfo::register_initial_references().  Those should not be
-//    placed in the above list.  Ideally, we should no longer need the
-//    above list once the above services register their references
-//    dynamically.
+        TAO_OBJID_RTCURRENT, \
+        TAO_OBJID_PRIORITYMAPPINGMANAGER
 
 // Service IDs for the services that are located through Multicast.
 enum MCAST_SERVICEID
@@ -461,17 +449,9 @@ enum MCAST_SERVICEID
 #  endif  /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
 #endif  /* !TAO_HAS_UIOP */
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-# if !defined (TAO_HAS_SHMIOP)
-#   define TAO_HAS_SHMIOP 1
-# endif /* TAO_HAS_SHMIOP */
-#else
-# if defined (TAO_HAS_SHMIOP)
-#   undef TAO_HAS_SHMIOP
-# endif /* TAO_HAS_SHMIOP */
-# define TAO_HAS_SHMIOP 0
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
+#if !defined (TAO_HAS_SHMIOP)
+#  define TAO_HAS_SHMIOP 1
+#endif /* TAO_HAS_SHMIOP */
 
 // RT_CORBA support is enabled by default if TAO is not configured for
 // minimum CORBA.  If TAO is configured for minimum CORBA, then
@@ -490,22 +470,6 @@ enum MCAST_SERVICEID
 #  endif  /* TAO_HAS_MINIMUM_CORBA */
 #endif  /* !TAO_HAS_RT_CORBA */
 
-
-// NAMED_RT_MUTEX support is disabled by default.
-// To explicitly enable NAMED_RT_MUTEX support uncomment the following
-// #define TAO_HAS_NAMED_RT_MUTEXES 1
-// To explicitly disable NAMED_RT_MUTEX support uncomment the following
-// #define TAO_HAS_NAMED_RT_MUTEXES 0
-
-// Default NAMED_RT_MUTEX settings
-#if !defined (TAO_HAS_NAMED_RT_MUTEXES)
-#  define TAO_HAS_NAMED_RT_MUTEXES 0
-#else
-#  if (TAO_HAS_RT_CORBA == 1)
-#  error "tao/orbconf.h: You need RT_CORBA for NAMED_RT_MUTEX support"
-#  endif /* TAO_HAS_RT_CORBA == 1 */
-#endif  /* !TAO_HAS_NAMED_RT_MUTEXES */
-
 // MINIMUM_POA support is disabled by default if TAO is not
 // configured for minimum CORBA.  If TAO is configured for minimum
 // CORBA, then MINIMUM_POA will be enabled by default.
@@ -557,13 +521,6 @@ enum MCAST_SERVICEID
 #  endif  /* TAO_HAS_MINIMUM_CORBA */
 #endif  /* !TAO_HAS_CORBA_MESSAGING */
 
-// Additional settings for RT CORBA
-#  if (TAO_HAS_RT_CORBA == 1) && \
-      (TAO_HAS_CORBA_MESSAGING == 0)
-#  error "tao/orbconf.h: You need CORBA_MESSAGING for RT CORBA support"
-#  endif /* TAO_HAS_RT_CORBA == 1 &&
-            TAO_HAS_CORBA_MESSAGING == 0 */
-
 // For all the policies, support is enabled by default if TAO is
 // configured for CORBA Messaging.  If TAO is not configured for CORBA
 // Messaging, then policies cannot be enabled.  Default support can be
@@ -897,11 +854,10 @@ enum MCAST_SERVICEID
 #define TAO_MESSAGING_QUEUE_ORDER_POLICY_TYPE 35
 
 // Control the default version of GIOP used by TAO.
-// The ORB is always able to communicate with 1.0, 1.1 and 1.2
-// servers, and it creates 1.2 endpoints (and profiles).  If you need
-// to talk to old clients that only understand 1.0 or 1.1 (and do not
-// attempt to use 1.0 or 1.1 with 1.2 servers), then change the values
-// below.
+// The ORB is always able to communicate with 1.0 and 1.1 servers, and
+// it creates 1.1 endpoints (and profiles).  If you need to talk to
+// old clients that only understand 1.0 (and do not attempt to use 1.0
+// with 1.1 servers), then change the values below.
 #if !defined (TAO_DEF_GIOP_MAJOR)
 #define TAO_DEF_GIOP_MAJOR 1
 #endif /* TAO_DEF_GIOP_MAJOR */
diff --git a/TAO/tests/AMI/AMI_Test_Client.dsp b/TAO/tests/AMI/AMI_Test_Client.dsp
index 53110d039c3..d94b2937117 100644
--- a/TAO/tests/AMI/AMI_Test_Client.dsp
+++ b/TAO/tests/AMI/AMI_Test_Client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Release\client.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "AMI_Test_Client - Win32 Debug"

 

diff --git a/TAO/tests/AMI/AMI_Test_Server.dsp b/TAO/tests/AMI/AMI_Test_Server.dsp
index e2220e0b1c6..5eb7f0ed88a 100644
--- a/TAO/tests/AMI/AMI_Test_Server.dsp
+++ b/TAO/tests/AMI/AMI_Test_Server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Release\server.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "AMI_Test_Server - Win32 Debug"

 

diff --git a/TAO/tests/AMI/AMI_Test_Simple_Client.dsp b/TAO/tests/AMI/AMI_Test_Simple_Client.dsp
index 19a96e825c8..9847d51cafc 100644
--- a/TAO/tests/AMI/AMI_Test_Simple_Client.dsp
+++ b/TAO/tests/AMI/AMI_Test_Simple_Client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Release\simple_client.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"simple_client.exe" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "AMI_Test_Simple_Client - Win32 Debug"

 

diff --git a/TAO/tests/AMI/README b/TAO/tests/AMI/README
index d9bca25e039..77296b8998c 100644
--- a/TAO/tests/AMI/README
+++ b/TAO/tests/AMI/README
@@ -36,6 +36,7 @@ replies will arrive in order.
 
 But in the Exclusive Transport, the synchronous request might now
 collect all the AMI replies. It might return as soon as its reply
-arrives.
+arrives. 
+
 
 
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp
index 68d94269454..dce4ec273af 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -132,7 +132,6 @@ public:
                                "Catched exception:");
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     };
 
   void get_yadda (CORBA::Long result, 
@@ -210,9 +209,7 @@ main (int argc, char *argv[])
       // Activate POA to handle the call back.
       
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -248,14 +245,10 @@ main (int argc, char *argv[])
         }
       
       // ORB loop.
-      while (orb->work_pending (ACE_TRY_ENV) && number_of_replies > 0)
+      while (orb->work_pending () && number_of_replies > 0)
         {
-          ACE_TRY_CHECK;
-
-          orb->perform_work (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          orb->perform_work ();
         }
-      ACE_TRY_CHECK;
 
       if (debug)
         {
@@ -278,7 +271,6 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index e1f43afa343..05f46bc9ea3 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -5,54 +5,63 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$client_conf = PerlACE::LocalFile ("muxed.conf");
-
-$debug_level = '0';
-$iterations = '1';
+$cwd = getcwd();
+$client_conf="$DIR_SEPARATOR" . "muxed.conf";
+$client_process="simple_client";
+$debug_level='0';
+$threads='2';
+$iterations='1';
 
+ACE::checkForTarget($cwd);
 foreach $i (@ARGV) {
-    if ($i eq '-mux') {
-        $client_conf = PerlACE::LocalFile ("muxed.conf");
-    } 
-    elsif ($i eq '-debug') {
-        $debug_level = '1';
-    } 
-    elsif ($i eq '-exclusive') {
-        $client_conf = PerlACE::LocalFile ('exclusive.conf');
-    }
+  if ($i eq '-mux') {
+    $client_conf = "muxed.conf";
+  } elsif ($i eq '-debug') {
+    $debug_level = '1';
+  } elsif ($i eq '-exclusive') {
+    $client_conf = 'exclusive.conf';
+  }
 }
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfile = "server.ior";
 
 unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
+			  " -ORBdebuglevel $debug_level"
+			  . "-d -o $iorfile");
 
-$SV = new PerlACE::Process ("server", 
-                            "-ORBdebuglevel $debug_level -d -o $iorfile");
-
-$SV->Spawn ();
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
+$CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT",
+			  " -ORBsvcconf $client_conf "
+			  . "-ORBdebuglevel $debug_level"
+			  . " -k file://$iorfile "
+			  . " -i $iterations -x -d");
 
-$CL = new PerlACE::Process ("simple_client",
-                            "-ORBsvcconf $client_conf "
-                            . "-ORBdebuglevel $debug_level"
-                            . " -k file://$iorfile "
-                            . " -i $iterations -x -d");
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-$client = $CL->SpawnWaitKill (60);
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
 if ($server != 0 || $client != 0) {
-    exit 1;
+   exit 1;
 }
  
 exit 0;
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index 01d3adf7961..397d1f70232 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -62,9 +62,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -108,9 +106,9 @@ main (int argc, char *argv[])
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
@@ -121,7 +119,6 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index cbb36087457..c372e0b2c00 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -122,7 +122,6 @@ public:
                       "... caught the wrong exception -> ERROR\n"));
         }
       ACE_ENDTRY;
-      ACE_CHECK;
     };
 
   
@@ -294,11 +293,7 @@ main (int argc, char *argv[])
         }
       
       if (shutdown_flag)
-        {
-          ami_test_var->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
+        ami_test_var->shutdown ();
     }
   ACE_CATCHANY
     {
@@ -307,7 +302,6 @@ main (int argc, char *argv[])
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
   
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.dsw b/TAO/tests/AMI_Timeouts/AMI_Timeouts.dsw
index 4e2b390f9f2..e099b6fa0a8 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.dsw
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.dsw
@@ -3,18 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "AMI Timeout Client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "AMI Timeout Server"=.\server.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/tests/AMI_Timeouts/Makefile b/TAO/tests/AMI_Timeouts/Makefile
index a8071d1b282..98773822c7f 100644
--- a/TAO/tests/AMI_Timeouts/Makefile
+++ b/TAO/tests/AMI_Timeouts/Makefile
@@ -19,13 +19,11 @@ IDL_SRC   = \
 	$(addsuffix C.cpp, $(IDL_FILES)) \
 	$(addsuffix S.cpp, $(IDL_FILES))
 
-BIN_UNCHECKED =  server client
+BIN_UNCHECKED =  server
 
-CLIENT_OBJS = client.o timeout_i.o timeout_client.o $(IDL_SRC:.cpp=.o)
+SERVER_OBJS = server.o timeout_i.o timeout_client.o$(IDL_SRC:.cpp=.o)
 
-SERVER_OBJS = server.o timeout_i.o timeout_client.o $(IDL_SRC:.cpp=.o)
-
-SRC= $(addsuffix .cpp, $(BIN) timeout_i timeout_client) $(IDL_SRC)
+SRC= $(addsuffix .cpp, $(BIN) timeout_i) $(IDL_SRC)
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -48,9 +46,9 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-override TAO_IDLFLAGS += -Ge 1 -GC -Gv
+override TAO_IDLFLAGS += -Ge 1 -GC
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), timeout$(ext))
+.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
 
 server: $(addprefix $(VDIR),$(SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
@@ -58,8 +56,11 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS))
 client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
 
+simple_client: $(addprefix $(VDIR),$(SIMPLE_CLIENT_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_SRVR_LIBS) $(POSTLINK)
+
 realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), timeout$(ext))
+	-$(RM) $(foreach ext, $(IDL_EXT), ami_test$(ext))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -104,7 +105,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/corba.h \
+ ami_test_i.h ami_testS.h \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -160,13 +164,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
@@ -180,6 +181,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -200,50 +203,19 @@ realclean: clean
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -262,8 +234,11 @@ realclean: clean
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
@@ -346,11 +321,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
@@ -361,18 +364,38 @@ realclean: clean
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ ami_testC.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/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -382,92 +405,13 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
  $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/PortableServer/POA.h \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(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/PortableServer/Key_Adapters.i \
- $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
+ ami_testC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/POAManager.h \
- $(TAO_ROOT)/tao/PortableServer/POAManager.i \
- $(TAO_ROOT)/tao/PortableServer/POA.i \
- timeout_i.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- timeoutS.h \
- $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \
- $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \
- $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/PortableServer/MessagingS.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.h \
- $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- timeoutC.h timeoutC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- timeoutS_T.h timeoutS_T.i timeoutS_T.cpp timeoutS.i timeout_client.h \
- $(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/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp
+ ami_testS_T.h ami_testS_T.i ami_testS_T.cpp ami_testS.i
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+.obj/simple_client.o .obj/simple_client.so .shobj/simple_client.o .shobj/simple_client.so: simple_client.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -628,7 +572,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
- timeoutC.h \
+ ami_testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -820,10 +764,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
- timeoutC.i timeout_i.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- timeoutS.h \
+ ami_testC.i ami_testS.h \
  $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
@@ -843,10 +784,10 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- timeoutS_T.h timeoutS_T.i timeoutS_T.cpp timeoutS.i timeout_client.h
+ ami_testS_T.h ami_testS_T.i ami_testS_T.cpp ami_testS.i
 
-.obj/timeout_i.o .obj/timeout_i.so .shobj/timeout_i.o .shobj/timeout_i.so: timeout_i.cpp timeout_i.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -883,34 +824,43 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.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_Adapter.h \
  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
  $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/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_Allocator.h \
  $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -918,14 +868,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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 \
@@ -934,10 +877,80 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Task.i \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ ami_testC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -949,8 +962,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -1020,10 +1031,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -1032,11 +1039,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -1057,21 +1059,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1079,14 +1066,6 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
  $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Endpoint.h \
@@ -1119,12 +1098,6 @@ realclean: clean
  $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -1162,7 +1135,11 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
  $(TAO_ROOT)/tao/BiDirPolicyC.i \
- timeoutS.h \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ ami_testC.i ami_testS.h \
  $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
@@ -1179,22 +1156,15 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \
  $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \
  $(TAO_ROOT)/tao/PortableServer/MessagingS.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.h \
- $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- timeoutC.h timeoutC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- timeoutS_T.h timeoutS_T.i timeoutS_T.cpp timeoutS.i
+ ami_testS_T.h ami_testS_T.i ami_testS_T.cpp ami_testS.i
 
-.obj/timeout_client.o .obj/timeout_client.so .shobj/timeout_client.o .shobj/timeout_client.so: timeout_client.cpp timeout_client.h \
- $(ACE_ROOT)/ace/Task.h \
+.obj/ami_test_i.o .obj/ami_test_i.so .shobj/ami_test_i.o .shobj/ami_test_i.so: ami_test_i.cpp ami_test_i.h ami_testS.h \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -1218,6 +1188,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/Flag_Manip.h \
  $(ACE_ROOT)/ace/Flag_Manip.i \
  $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1229,39 +1204,29 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/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_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1269,7 +1234,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
  $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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 \
@@ -1278,90 +1250,20 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_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_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/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(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.cpp \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/CDR_Base.inl \
  $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
@@ -1371,6 +1273,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
@@ -1391,46 +1295,19 @@ realclean: clean
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -1439,13 +1316,21 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
@@ -1459,6 +1344,21 @@ realclean: clean
  $(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_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1466,6 +1366,14 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
  $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Endpoint.h \
@@ -1498,12 +1406,46 @@ realclean: clean
  $(TAO_ROOT)/tao/RTCORBAS.i \
  $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/PortableServer/MessagingS.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.h \
  $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
@@ -1514,18 +1456,38 @@ realclean: clean
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Asynch_Invocation.i \
+ ami_testC.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/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
  $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
@@ -1535,37 +1497,13 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
  $(TAO_ROOT)/tao/BiDirPolicyC.i \
- timeoutC.h \
- $(TAO_ROOT)/tao/Asynch_Invocation.h \
- $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/Asynch_Invocation.i \
- timeoutC.i timeout_i.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- timeoutS.h \
- $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- $(TAO_ROOT)/tao/PortableServer/MessagingS_T.h \
- $(TAO_ROOT)/tao/PortableServer/MessagingS_T.i \
- $(TAO_ROOT)/tao/PortableServer/MessagingS_T.cpp \
- $(TAO_ROOT)/tao/PortableServer/MessagingS.i \
+ ami_testC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- timeoutS_T.h timeoutS_T.i timeoutS_T.cpp timeoutS.i
+ ami_testS_T.h ami_testS_T.i ami_testS_T.cpp ami_testS.i
 
-.obj/timeoutC.o .obj/timeoutC.so .shobj/timeoutC.o .shobj/timeoutC.so: timeoutC.cpp timeoutC.h \
+.obj/ami_testC.o .obj/ami_testC.so .shobj/ami_testC.o .shobj/ami_testC.so: ami_testC.cpp ami_testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
@@ -1884,10 +1822,10 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
- timeoutC.i \
+ ami_testC.i \
  $(TAO_ROOT)/tao/RequestInfo_Util.h
 
-.obj/timeoutS.o .obj/timeoutS.so .shobj/timeoutS.o .shobj/timeoutS.so: timeoutS.cpp timeoutS.h \
+.obj/ami_testS.o .obj/ami_testS.so .shobj/ami_testS.o .shobj/ami_testS.so: ami_testS.cpp ami_testS.h \
  $(TAO_ROOT)/tao/PortableServer/MessagingS.h \
  $(ACE_ROOT)/ace/pre.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -2032,8 +1970,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -2054,6 +1990,8 @@ realclean: clean
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
@@ -2195,7 +2133,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Asynch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/Asynch_Invocation.i \
- timeoutC.h \
+ ami_testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -2223,11 +2161,11 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
  $(TAO_ROOT)/tao/BiDirPolicyC.i \
- timeoutC.i \
+ ami_testC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- timeoutS_T.h timeoutS_T.i timeoutS_T.cpp timeoutS.i \
+ ami_testS_T.h ami_testS_T.i ami_testS_T.cpp ami_testS.i \
  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
diff --git a/TAO/tests/AMI_Timeouts/Makefile.bor b/TAO/tests/AMI_Timeouts/Makefile.bor
index bcc560d1359..b891b969552 100644
--- a/TAO/tests/AMI_Timeouts/Makefile.bor
+++ b/TAO/tests/AMI_Timeouts/Makefile.bor
@@ -1,7 +1,7 @@
 #
-# Makefile for building the AMI timeout test executables
+# Makefile for building the AMI test executables
 #
 
-MAKEFILES = server.bor client.bor
+MAKEFILES = server.bor client.bor simple_client.bor
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/AMI_Timeouts/README b/TAO/tests/AMI_Timeouts/README
index e7759a0d5f7..c17bfebcfac 100644
--- a/TAO/tests/AMI_Timeouts/README
+++ b/TAO/tests/AMI_Timeouts/README
@@ -13,8 +13,8 @@ Use -GC on the TAO IDL compiler to generate code for AMI callbacks.
 
 Usage:
 =====
-$ server -o ior
-$ client -k file://ior
-
+$ server
 
+This is a server and a client in the same process space, but using
+the local loop-back interface instead of collocation.
 
diff --git a/TAO/tests/AMI_Timeouts/client.bor b/TAO/tests/AMI_Timeouts/client.bor
deleted file mode 100644
index f42d4efc2c8..00000000000
--- a/TAO/tests/AMI_Timeouts/client.bor
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Makefile for building the AMI timeout client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC -Gv
-
-OBJFILES = \
-	$(OBJDIR)\timeoutS.obj \
-	$(OBJDIR)\timeoutC.obj \
-	$(OBJDIR)\timeout_i.obj \
-	$(OBJDIR)\timeout_client.obj \
-	$(OBJDIR)\client.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
-
-CPPDIR = .
-
-IDLDIR = .
-
-IDLFILES = \
-        $(IDLDIR)\timeout.idl
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\timeoutS.cpp $(IDLDIR)\timeoutC.cpp: $(IDLDIR)\timeout.idl
-	$(TAO_IDL) $**
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 42a13159b78..eb1a3f8ba28 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -1,17 +1,21 @@
-
-//=============================================================================
-/**
- *  @file    client.cpp
- *
- *  $Id$
- *
- *  A client, which uses the AMI callback model and timeouts.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/AMI
+//
+// = FILENAME
+//    server.cpp
+//
+// = DESCRIPTION
+//    A client, which uses the AMI callback model.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>,
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
@@ -21,30 +25,34 @@
 #include "timeout_i.h"
 #include "timeout_client.h"
 
-ACE_RCSID (AMI,
-           client,
-           "$Id$")
+ACE_RCSID(AMI, client, "$Id$")
 
 const char *ior = "file://test.ior";
-unsigned int msec = 50;
+int nthreads = 5;
+int niterations = 5;
+int debug = 0;
+int number_of_replies = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:t:");
+  ACE_Get_Opt get_opts (argc, argv, "dk:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
       case 'd':
-        TAO_debug_level++;
+        debug = 1;
         break;
       case 'k':
         ior = get_opts.optarg;
         break;
-      case 't':
-        msec = ACE_OS::atoi (get_opts.optarg);
+      case 'n':
+        nthreads = ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 'i':
+        niterations = ACE_OS::atoi (get_opts.optarg);
         break;
       case '?':
       default:
@@ -52,7 +60,8 @@ parse_args (int argc, char *argv[])
                            "usage:  %s "
                            "-d "
                            "-k <ior> "
-                           "-t <timeout in ms> "
+                           "-n <nthreads> "
+                           "-i <niterations> "
                            "\n",
                            argv [0]),
                           -1);
@@ -64,8 +73,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
@@ -91,16 +99,14 @@ main (int argc, char *argv[])
         }
 
       // Activate POA to handle the call back.
-
+      
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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;
@@ -120,28 +126,35 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Instantiate client
-      TimeoutClient* client = new TimeoutClient (orb.in (),
+      TimeoutClient* client = new TimeoutClient (orb,
                                                  timeout_var.in (),
-                                                 timeoutHandler_var.in (),
-                                                 &timeoutHandler_i,
-                                                 msec);
+                                                 timeoutHandler_var.in ());
 
       client->activate ();
-
+      
       // ORB loop.
-      orb->run ();  // Fetch responses
+      ACE_Time_Value time (1,0); // 1 s
+      orb->run (time);  // Fetch responses
+
+      if (debug)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) : Exited perform_work loop Received <%d> replies\n",
+                      (nthreads*niterations) - number_of_replies));
+        }
+
+
 
-      ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
+      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
 
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+                           "Catched exception:");
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/client.dsp b/TAO/tests/AMI_Timeouts/client.dsp
index 0ef04fc3dd7..e27b743d846 100644
--- a/TAO/tests/AMI_Timeouts/client.dsp
+++ b/TAO/tests/AMI_Timeouts/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

@@ -66,8 +66,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 /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD  /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -140,92 +140,5 @@ SOURCE=.\timeoutC.i
 SOURCE=.\timeoutS.i

 # End Source File

 # End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\timeout.idl

-

-!IF  "$(CFG)" == "AMI Timeout Client - Win32 Release"

-

-USERDEP__TIMEO="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\timeout.idl

-InputName=timeout

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GC $(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)" == "AMI Timeout Client - Win32 Debug"

-

-USERDEP__TIMEO="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\timeout.idl

-InputName=timeout

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

 # End Target

 # End Project

diff --git a/TAO/tests/AMI_Timeouts/run_test.pl b/TAO/tests/AMI_Timeouts/run_test.pl
index e6596d067a3..05f46bc9ea3 100755
--- a/TAO/tests/AMI_Timeouts/run_test.pl
+++ b/TAO/tests/AMI_Timeouts/run_test.pl
@@ -5,38 +5,64 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("server.ior");
+$cwd = getcwd();
+$client_conf="$DIR_SEPARATOR" . "muxed.conf";
+$client_process="simple_client";
+$debug_level='0';
+$threads='2';
+$iterations='1';
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
+foreach $i (@ARGV) {
+  if ($i eq '-mux') {
+    $client_conf = "muxed.conf";
+  } elsif ($i eq '-debug') {
+    $debug_level = '1';
+  } elsif ($i eq '-exclusive') {
+    $client_conf = 'exclusive.conf';
+  }
+}
 
-$SV = new PerlACE::Process ("server", "-d -o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile");
+$iorfile = "server.ior";
 
-$SV->Spawn ();
+unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
+			  " -ORBdebuglevel $debug_level"
+			  . "-d -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 20) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
-$server = $SV->TerminateWaitKill (5);
-
-unlink $iorfile;
+$CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT",
+			  " -ORBsvcconf $client_conf "
+			  . "-ORBdebuglevel $debug_level"
+			  . " -k file://$iorfile "
+			  . " -i $iterations -x -d");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-exit $status;
+unlink $iorfile;
+
+if ($server != 0 || $client != 0) {
+   exit 1;
+}
+ 
+exit 0;
+ 
diff --git a/TAO/tests/AMI_Timeouts/server.bor b/TAO/tests/AMI_Timeouts/server.bor
index 83850491c49..48729fb3aa5 100644
--- a/TAO/tests/AMI_Timeouts/server.bor
+++ b/TAO/tests/AMI_Timeouts/server.bor
@@ -1,16 +1,15 @@
 #
-# Makefile for building the AMI timeout server
+# Makefile for building the AMI server
 #
 
 NAME = server
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC -Gv
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 -GC
 
 OBJFILES = \
-	$(OBJDIR)\timeoutS.obj \
-	$(OBJDIR)\timeoutC.obj \
-	$(OBJDIR)\timeout_i.obj \
-	$(OBJDIR)\timeout_client.obj \
+	$(OBJDIR)\ami_testS.obj \
+	$(OBJDIR)\ami_testC.obj \
+	$(OBJDIR)\ami_test_i.obj \
 	$(OBJDIR)\server.obj
 
 CFLAGS = \
@@ -28,7 +27,7 @@ CPPDIR = .
 IDLDIR = .
 
 IDLFILES = \
-        $(IDLDIR)\timeout.idl
+        $(IDLDIR)\ami_test.idl
 
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
 
@@ -36,5 +35,5 @@ IDLFILES = \
 # IDL Build rules
 #
 
-$(IDLDIR)\timeoutS.cpp $(IDLDIR)\timeoutC.cpp: $(IDLDIR)\timeout.idl
+$(IDLDIR)\ami_testS.cpp $(IDLDIR)\ami_testC.cpp: $(IDLDIR)\ami_test.idl
 	$(TAO_IDL) $**
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index 7132332a666..34ab77b97b0 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -1,17 +1,20 @@
-
-//=============================================================================
-/**
- *  @file    server.cpp
- *
- *  $Id$
- *
- *  Implementation of the server running the Timeout object.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/AMI_Timeouts
+//
+// = FILENAME
+//    server.cpp
+//
+// = DESCRIPTION
+//    Implementation of the server running the Timeout object.
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
 #include "ace/Get_Opt.h"
 #include "tao/corba.h"
@@ -19,9 +22,7 @@
 #include "timeout_i.h"
 #include "timeout_client.h"
 
-ACE_RCSID (AMI,
-           server,
-           "$Id$")
+ACE_RCSID(AMI, server, "$Id$")
 
 const char *ior_output_file = 0;
 
@@ -56,17 +57,14 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -119,30 +117,26 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Instantiate client
-      /*
       TimeoutClient* client = new TimeoutClient (orb,
                                                  timeout_var.in (),
-                                                 timeoutHandler_var.in (),
-                                                 &timeoutHandler_i);
+                                                 timeoutHandler_var.in ());
 
       client->activate ();
-      */
       
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
-      //delete client;
+      delete client;
     }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+                           "Catched exception:");
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/tests/AMI_Timeouts/server.dsp b/TAO/tests/AMI_Timeouts/server.dsp
index 2a1f8d1c205..5b61c87d81d 100644
--- a/TAO/tests/AMI_Timeouts/server.dsp
+++ b/TAO/tests/AMI_Timeouts/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

@@ -66,8 +66,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 /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /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 /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD  /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -137,51 +137,14 @@ SOURCE=.\timeout.idl
 

 !IF  "$(CFG)" == "AMI Timeout Server - Win32 Release"

 

-USERDEP__TIMEO="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\timeout.idl

-InputName=timeout

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GC $(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)" == "AMI Timeout Server - Win32 Debug"

 

-USERDEP__TIMEO="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\timeout.idl

 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -Gv -GC -Sp -Sd $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI_Timeouts/svc.conf b/TAO/tests/AMI_Timeouts/svc.conf
index fa783cf178c..32712730486 100644
--- a/TAO/tests/AMI_Timeouts/svc.conf
+++ b/TAO/tests/AMI_Timeouts/svc.conf
@@ -1,3 +1,3 @@
 
-static Client_Strategy_Factory "-ORBTransportMuxStrategy EXCLUSIVE -ORBclientconnectionhandler MT"
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED -ORBclientconnectionhandler MT"
 static Resource_Factory "-ORBReactorType TP"
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index bbeda7053b8..27010961a10 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -1,31 +1,32 @@
-//=============================================================================
-/**
- *  @file    timeout_client.cpp
- *
- *  $Id$
- *
- *  Tests for proper handling of timeouts with AMI
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/AMI_Timeouts
+//
+// = FILENAME
+//    timeout_client.cpp
+//
+// = DESCRIPTION
+//    Tests for proper handling of timeouts with AMI
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
+
 
 #include "timeout_client.h"
 
 TimeoutClient::TimeoutClient (CORBA::ORB_ptr orb,
                               Timeout_ptr timeoutObject,
-                              AMI_TimeoutHandler_ptr replyHandlerObject,
-                              TimeoutHandler_i *timeoutHandler_i,
-                              unsigned long timeToWait)
+                              AMI_TimeoutHandler_ptr replyHandlerObject)
 : orb_(CORBA::ORB::_duplicate (orb))
-  , timeoutObject_(Timeout::_duplicate (timeoutObject))
-  , replyHandlerObject_(AMI_TimeoutHandler::_duplicate (replyHandlerObject))
-  , timeoutHandler_i_(timeoutHandler_i)
-  , local_reply_excep_counter_ (0)
-  , INVOKE_SYNCH(false)
-  , INVOKE_ASYNCH(true)
-  , timeToWait_ (timeToWait)
+, timeoutObject_(Timeout::_duplicate (timeoutObject))
+, replyHandlerObject_(AMI_TimeoutHandler::_duplicate (replyHandlerObject))
+, INVOKE_SYNCH(false)
+, INVOKE_ASYNCH(true)
 {
 
 }
@@ -37,59 +38,10 @@ TimeoutClient::~TimeoutClient ()
 }
 
 
-
 int
-TimeoutClient::svc ()
+TimeoutClient::init ()
 {
-  this->initialize ();
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      
-      // Tests timeouts for synchronous
-      this->synch_test ();
-
-      // Tests AMI timeouts for influences on non-timeout calls
-      this->none_test ();
-
-      // Tests AMI timeouts for accuracy
-      this->accuracy_test ();
-
-      // Tests AMI timeouts for influences on non-timeout calls
-      this->none_test ();
-
-      // shut down remote ORB 
-      timeoutObject_->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_Time_Value tv (0, 20); // wait for the ORB to deliver the shutdonw
-      ACE_OS::sleep (tv);
-
-      // shut down local ORB
-      orb_->shutdown (false, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "TimeoutClient::svc: Done\n\n"));
-
-  return 0;
-};
-
-
-int
-TimeoutClient::initialize ()
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object =
         orb_->resolve_initial_references ("ORBPolicyManager",
@@ -102,11 +54,10 @@ TimeoutClient::initialize ()
     }
   ACE_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught exception:");
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:");
       return 1;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
@@ -114,225 +65,110 @@ TimeoutClient::initialize ()
 
 void
 TimeoutClient::send (bool async,
-                     unsigned long local_timeout,
-                     unsigned long remote_sleep)
+                     unsigned long msec)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Invoking "));
-  if (async)
-    ACE_DEBUG ((LM_DEBUG,
-                "asynch "));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "synch "));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "local: %dms remote: %dms  ... ",
-              local_timeout,
-              remote_sleep));
-     
-  CORBA::PolicyList policy_list (1);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (normal)
+  ACE_TRY_NEW_ENV
     {
-      if (local_timeout != 0)
-        {
-          TimeBase::TimeT timeout = 10000 * local_timeout; 
-
-          CORBA::Any any_orb;
-          any_orb <<= timeout;
-
-          policy_list.length (1);
-          policy_list[0] =
-            orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-                                 any_orb,
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (normal);
-
-          policy_manager_->set_policy_overrides (policy_list,
-                                                 CORBA::SET_OVERRIDE,
-                                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (normal);
-        }
-      else
-        {
-          policy_list.length (0);
-          policy_manager_->set_policy_overrides (policy_list,
-                                                 CORBA::SET_OVERRIDE,
-                                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (normal);
-        }
-
-
-      // Start time measurement at the reply handler
-      timeoutHandler_i_->start ();
-
       if (async)
         {
-          timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_.in (),
-                                                remote_sleep, 
+          timeoutObject_->sendc_sendTimeToWait (replyHandlerObject_,
+                                                msec, 
                                                 ACE_TRY_ENV);
         }
       else // synch
         {
-          timeoutObject_->sendTimeToWait (remote_sleep, 
+          timeoutObject_->sendTimeToWait (msec, 
                                           ACE_TRY_ENV);
         }
-      ACE_TRY_CHECK_EX (normal);
+
+      ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::TIMEOUT, timeout)
     {
-      local_reply_excep_counter_++;
-
       // Trap this exception and continue...
       ACE_DEBUG ((LM_DEBUG,
-                  "\n==> Trapped a TIMEOUT exception (expected)\n"));
+                  "==> Trapped a TIMEOUT exception (expected)\n\n"));
 
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+      // @@Michael: I took over these comments from the timeout example..
+      // Sleep so the server can send the reply...
+      //ACE_Time_Value tv (0, (msec + 1)  * 1000);
+      //orb_->run (tv);
 
-  // get rid of the policy, you created before.
-  ACE_TRY_EX (cleanup)
-    {
-      if (local_timeout != 0)
-        {
-          policy_list[0]->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (cleanup);
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unexpected exception\n\n"));
     }
   ACE_ENDTRY;
-  ACE_CHECK;
-
-  // wait for responses
-  ACE_Time_Value tv (0, (local_timeout + remote_sleep)*2000); 
-  ACE_OS::sleep (tv);
-
-  ACE_Time_Value &elapsed_time = timeoutHandler_i_->elapsed_time ();
-
-  if (async)
-    ACE_DEBUG ((LM_DEBUG,
-                " .. needed %dms\n",
-                elapsed_time.msec()));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                " .. done\n"));
 }
 
 
 int
-TimeoutClient::synch_test ()
+TimeoutClient::svc ()
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "TimeoutClient::synch_test - Begin\n"));
-  timeoutHandler_i_->reset_reply_counter ();
-  timeoutHandler_i_->reset_reply_excep_counter ();
-  local_reply_excep_counter_ = 0;
-
-  this->send (INVOKE_SYNCH,
-              0,    // local
-              0);   // remote
-
-  this->send (INVOKE_SYNCH,
-              timeToWait_,    // local
-              timeToWait_*2); // remote
-  // @@ Michael: In the collocated, but using the loopback interface, and 
-  //             if the reply to this request times out the replies to the
-  //             asynch invocations do not get dispatched 
-  //             to the reply handler. Why?
-  this->send (INVOKE_SYNCH,
-              0,    // local
-              0);   // remote
-
-  if (timeoutHandler_i_->reply_counter () != 0
-   || timeoutHandler_i_->reply_excep_counter () != 0
-   || local_reply_excep_counter_ != 1)
-    ACE_DEBUG ((LM_DEBUG,
-                "**** Failure in replies %d %d %d.\n\n",
-                timeoutHandler_i_->reply_counter (),
-                timeoutHandler_i_->reply_excep_counter (),
-                local_reply_excep_counter_));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "TimeoutClient::synch_test - End\n\n"));
+  this->init ();
 
-  return 0;
-};
+  ACE_TRY_NEW_ENV
+    {
+      unsigned long msec = 10;
+      
+      TimeBase::TimeT timeout = 10000 * msec; 
 
+      CORBA::Any any_orb;
+      any_orb <<= timeout;
 
-int
-TimeoutClient::accuracy_test ()
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "TimeoutClient::accuracy_test - Begin\n\n"));
+      CORBA::PolicyList policy_list (1);
+      policy_list.length (1);
+      policy_list[0] =
+        orb_->create_policy (Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
+                            any_orb,
+                            ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  timeoutHandler_i_->reset_reply_counter ();
-  timeoutHandler_i_->reset_reply_excep_counter ();
-  local_reply_excep_counter_ = 0;
+      policy_manager_->set_policy_overrides (policy_list,
+                                             CORBA::SET_OVERRIDE,
+                                             ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  this->send (INVOKE_ASYNCH,
-              timeToWait_,
-              (unsigned long)(timeToWait_*1.5));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TimeoutClient::svc : Invoking sendTimeToWait synchronously with server delay\n\n"));
 
-  this->send (INVOKE_ASYNCH,
-              timeToWait_,
-              (unsigned long)(timeToWait_*0.5));
+      this->send (INVOKE_SYNCH,
+                  msec);
+      // @@ Michael: If the reply to this request times out the replies to the asynch invocations
+      //             do not get dispatched to the reply handler. Why?
 
-  if (timeoutHandler_i_->reply_counter () != 1
-   || timeoutHandler_i_->reply_excep_counter () != 1
-   || local_reply_excep_counter_ != 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "**** Failure in replies %d %d %d.\n\n",
-                timeoutHandler_i_->reply_counter (),
-                timeoutHandler_i_->reply_excep_counter (),
-                local_reply_excep_counter_));
 
-  ACE_DEBUG ((LM_DEBUG,
-              "TimeoutClient::accuracy_test - End\n\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TimeoutClient::svc : Invoking sendTimeToWait asynchronously without server delay\n\n"));
 
-  return 0;
-};
+      this->send (INVOKE_ASYNCH,
+                  0);
 
 
-int
-TimeoutClient::none_test ()
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "TimeoutClient::none_test - Begin\n\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TimeoutClient::svc : Invoking sendTimeToWait asynchronously with server delay\n\n"));
 
-  timeoutHandler_i_->reset_reply_counter ();
-  timeoutHandler_i_->reset_reply_excep_counter ();
-  local_reply_excep_counter_ = 0;
+      this->send (INVOKE_ASYNCH,
+                  msec);
 
-  this->send (INVOKE_ASYNCH,
-              0,
-              0);
+      ACE_Time_Value tv (1, 0); // wait 1s to give the responses enough time.
+      ACE_OS::sleep (tv);
 
-  this->send (INVOKE_ASYNCH,
-              timeToWait_,
-              timeToWait_+10);  // trigger a timeout
+      // shut down ORB 
+      //timeoutObject_->shutdown (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  this->send (INVOKE_ASYNCH,
-              timeToWait_,
-              0);
+      policy_list[0]->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
 
-  if (timeoutHandler_i_->reply_counter () != 2
-   || timeoutHandler_i_->reply_excep_counter () != 1
-   || local_reply_excep_counter_ != 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "**** Failure in replies %d %d %d.\n\n",
-                timeoutHandler_i_->reply_counter (),
-                timeoutHandler_i_->reply_excep_counter (),
-                local_reply_excep_counter_));
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:");
+      return 1;
+    }
+  ACE_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
-              "TimeoutClient::none_test - End\n\n"));
+              "TimeoutClient::svc: Done\n\n"));
 
   return 0;
 };
+
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.h b/TAO/tests/AMI_Timeouts/timeout_client.h
index a3d22d1f51e..58e4191eb71 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.h
+++ b/TAO/tests/AMI_Timeouts/timeout_client.h
@@ -21,7 +21,6 @@
 #include "tao/corba.h"
 
 #include "timeoutC.h"
-#include "timeout_i.h"
 
 class TimeoutClient 
 : public ACE_Task_Base
@@ -29,55 +28,27 @@ class TimeoutClient
 public:
   TimeoutClient (CORBA::ORB_ptr orb,
                  Timeout_ptr timeoutObject,
-                 AMI_TimeoutHandler_ptr replyHandlerObject,
-                 TimeoutHandler_i *timeoutHandler_i,
-                 unsigned long timeToWait);
+                 AMI_TimeoutHandler_ptr replyHandlerObject);
 
   ~TimeoutClient ();
 
-
-private:
-  // Initialize the context of this class.
-  int initialize ();
-
-  // Run in a separate thread.
   virtual int svc (void );
 
-  // Wrapps complex invocations logic.
-  void send (bool async,
-             unsigned long local_timeout,
-             unsigned long remote_sleep);
-
-  // Test if the synchronous timeouts still work.
-  int synch_test ();
-
-  // Test the accuracy of the timeouts.
-  int accuracy_test ();
+private:
+  int init ();
 
-  // Test if the timeout functionaltiy disturbs non-timeout invocations
-  int none_test ();
+  void send (bool async, unsigned long msec);
 
 private:
   CORBA::ORB_var orb_;
 
-  // A CORBA object reference to the target object.
   Timeout_var timeoutObject_;
 
-  // A CORBA object reference to the reply handler
   AMI_TimeoutHandler_var replyHandlerObject_;
 
-  // A pointer to the actual C++ reply handler implementation
-  TimeoutHandler_i *timeoutHandler_i_;
-
-  // Remember the policy manager.
   CORBA::PolicyManager_var policy_manager_;
 
-  // Count test local exceptions
-  unsigned short local_reply_excep_counter_;
-
   const bool INVOKE_SYNCH;
 
   const bool INVOKE_ASYNCH;
-
-  unsigned int timeToWait_;
 };
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index a088bc08b5e..33b3ec50590 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -9,7 +9,7 @@
 //    server.cpp
 //
 // = DESCRIPTION
-//    Implements the timeout CORBA Object and its reply handler.
+//    Implements the CORBA object
 //
 // = AUTHOR
 //    Michael Kircher <Michael.Kircher@mchp.siemens.de>
@@ -31,8 +31,7 @@ Timeout_i::~Timeout_i ()
 
 void
 Timeout_i::sendTimeToWait (CORBA::Long msec,
-                           CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+                           CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, 
               "Timeout_i::sendTimeToWait: invoked with msec = %d\n\n",
@@ -43,14 +42,13 @@ Timeout_i::sendTimeToWait (CORBA::Long msec,
       ACE_DEBUG ((LM_DEBUG,
                   "Timeout_i::sendTimeToWait: sleeping\n\n"));
 
-      ACE_Time_Value tv (0, msec * 1000);
+      ACE_Time_Value tv (0, (msec * 2) * 1000);
 	    ACE_OS::sleep (tv);
     }
 };
 
 void
-Timeout_i::shutdown (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+Timeout_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
 {
   orb_->shutdown (false);
   ACE_DEBUG ((LM_DEBUG,
@@ -62,12 +60,8 @@ Timeout_i::shutdown (CORBA::Environment &)
 // Reply Handler implementation
 
 TimeoutHandler_i::TimeoutHandler_i ()
-: reply_counter_ (0)
-, reply_excep_counter_ (0)
 {
-  timer_.reset ();
-  timer_.start ();
-  timer_.stop ();
+
 };
 
 TimeoutHandler_i::~TimeoutHandler_i ()
@@ -76,60 +70,18 @@ TimeoutHandler_i::~TimeoutHandler_i ()
 };
 
 void
-TimeoutHandler_i::sendTimeToWait (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+TimeoutHandler_i::sendTimeToWait (CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "reply"));
-  reply_counter_++;
-  timer_.stop ();
-};
+              "TimeoutHandler_i::sendTimeToWait: invoked\n\n"));
 
-void
-TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutExceptionHolder *,
-                                        CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "excep"));
-  reply_excep_counter_++;
-  timer_.stop ();
 };
 
 void
-TimeoutHandler_i::reset_reply_counter ()
-{
-  reply_counter_ = 0;
-}
-
-void
-TimeoutHandler_i::reset_reply_excep_counter ()
-{
-  reply_excep_counter_ = 0;
-}
-
-unsigned short
-TimeoutHandler_i::reply_counter ()
-{
-  return reply_counter_;
-}
-
-unsigned short
-TimeoutHandler_i::reply_excep_counter ()
-{
-  return reply_excep_counter_;
-}
-
-void
-TimeoutHandler_i::start ()
+TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutExceptionHolder * excep_holder,
+                                        CORBA::Environment &ACE_TRY_ENV)
 {
-  timer_.reset ();
-  timer_.start ();
-}
+  ACE_DEBUG ((LM_DEBUG,
+              "TimeoutHandler_i::sendTimeToWait_excep: invoked\n\n"));
 
-ACE_Time_Value &
-TimeoutHandler_i::elapsed_time ()
-{
-  timer_.elapsed_time (elapsed_time_);
-  return elapsed_time_;
-}
+};
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index 88251b1fc1b..e7d31ad0245 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -16,10 +16,7 @@
 //
 // ============================================================================
 
-#ifndef TIMEOUT_I_H
-#define TIMEOUT_I_H
 
-#include "ace/High_Res_Timer.h"
 #include "tao/corba.h"
 
 #include "timeoutS.h"
@@ -60,28 +57,4 @@ public:
       CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void reset_reply_counter ();
-
-  void reset_reply_excep_counter ();
-
-  unsigned short reply_counter ();
-
-  unsigned short reply_excep_counter ();
-
-  /// Start the time measurement
-  void start ();
-
-  /// Return the elapsed time
-  ACE_Time_Value &elapsed_time ();
-
-private:
-  unsigned short reply_counter_;
-
-  unsigned short reply_excep_counter_;
-
-  ACE_High_Res_Timer timer_;
-
-  ACE_Time_Value elapsed_time_;
 };
-
-#endif /* TIMEOUT_I_H */
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index 6fa6aa221e4..50acc019605 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -47,9 +47,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -140,8 +138,7 @@ main (int argc, char *argv[])
                       r));
         }
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+       orb->run ();
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/BiDirectional/run_test.pl b/TAO/tests/BiDirectional/run_test.pl
index d448613167e..3d55511281a 100755
--- a/TAO/tests/BiDirectional/run_test.pl
+++ b/TAO/tests/BiDirectional/run_test.pl
@@ -5,37 +5,34 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
 
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile -i 100");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile");
-
-$SV->Spawn ();
+ACE::checkForTarget($cwd);
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (20);
+unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile -i 100");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$server = $SV->WaitKill (20);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile");
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$client = $CL->TimedWait (20);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index 9c1683a589a..fbd143f8e42 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -47,9 +47,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
diff --git a/TAO/tests/BiDirectional_NestedUpcall/Makefile.bor b/TAO/tests/BiDirectional_NestedUpcall/Makefile.bor
index 4c5d5a991ee..055ab0452c9 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/Makefile.bor
+++ b/TAO/tests/BiDirectional_NestedUpcall/Makefile.bor
@@ -1,7 +1,7 @@
 #
-# Makefile for building the BiDirectional_NestedUpcall test executables
+# Makefile for building the Faults test executables
 #
 
-MAKEFILES = server.bor client.bor
+MAKEFILES = server.bor client.bor 
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.bor b/TAO/tests/BiDirectional_NestedUpcall/client.bor
deleted file mode 100644
index 9f49d299093..00000000000
--- a/TAO/tests/BiDirectional_NestedUpcall/client.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Makefile for building the BiDirectional_NestedUpcall client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\test_i.obj \
-	$(OBJDIR)\client.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) $**
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 2593a3d71d9..c9365e9a235 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -48,9 +48,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
diff --git a/TAO/tests/BiDirectional_NestedUpcall/run_test.pl b/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
index ef75660138f..3d55511281a 100755
--- a/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
+++ b/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
@@ -5,37 +5,34 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 $status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
 
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile -i 100");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
-}
+ACE::checkForTarget($cwd);
 
-$client = $CL->TimedWait (20);
+unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile -i 100");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$server = $SV->WaitKill (10);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile");
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$client = $CL->TimedWait (20);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.bor b/TAO/tests/BiDirectional_NestedUpcall/server.bor
deleted file mode 100644
index dd2323f748e..00000000000
--- a/TAO/tests/BiDirectional_NestedUpcall/server.bor
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Makefile for building the BiDirectional_NestedUpCall server
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\test_i.obj \
-	$(OBJDIR)\server.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) $**
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index b20bd53bcec..2fd7095f1d5 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -47,9 +47,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -136,9 +134,7 @@ main (int argc, char *argv[])
         }
 
       // Run the event loop
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      orb->run ();
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/CDR/CDR.dsw b/TAO/tests/CDR/CDR.dsw
index 6b32ad7f51e..2758787f3a4 100644
--- a/TAO/tests/CDR/CDR.dsw
+++ b/TAO/tests/CDR/CDR.dsw
@@ -3,30 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "CDR Alignment"=.\alignment.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "CDR Allocator"=.\allocator.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "CDR Basic Types"=.\basic_types.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/tests/CDR/alignment.dsp b/TAO/tests/CDR/alignment.dsp
deleted file mode 100644
index 6808bcb3dbe..00000000000
--- a/TAO/tests/CDR/alignment.dsp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Microsoft Developer Studio Project File - Name="CDR Alignment" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=CDR Alignment - 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 "alignment.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 "alignment.mak" CFG="CDR Alignment - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "CDR Alignment - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR Alignment - 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)" == "CDR Alignment - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao"

-

-!ELSEIF  "$(CFG)" == "CDR Alignment - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "CDR Alignment - Win32 Release"

-# Name "CDR Alignment - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\alignment.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/tests/CDR/run_test.pl b/TAO/tests/CDR/run_test.pl
index eeaf6f75224..0e5ff81a79c 100755
--- a/TAO/tests/CDR/run_test.pl
+++ b/TAO/tests/CDR/run_test.pl
@@ -6,31 +6,44 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+use Cwd;
 
 $brace="\#\#\#\#\#";
 %tests = ("basic_types" => "-n 256 -l 10",
-          "tc" => "",
-          "growth" => "-l 64 -h 256 -s 4 -n 10 -q",
-          "alignment" => "",
-          "allocator" => "-q");
+	  "tc" => "",
+	  "growth" => "-l 64 -h 256 -s 4 -n 10 -q",
+	  "alignment" => "",
+	  "allocator" => "-q");
 $test = "";
 $args = "";
-$status = 0;
+$| = 1;
 print STDERR "\n";
 
-while (($test,$args) = each %tests) {
+ACE::checkForTarget(getcwd());
+
+sub run_test
+{
+    #my $test = shift (@tests);
+    #my $args = shift (@argslist);
+
     print STDERR "\n$brace $test $args test BEGUN\n";
-    $TST = new PerlACE::Process ($test, $args);
-    print STDERR "\tRUNNING $test\n";
-    
-    $retval = $TST->SpawnWaitKill (90);
-
-    if ($retval != 0) { 
-        print STDERR "ERROR $brace $test $args, exit value $retval\n";
-        $status = 1;
+    $TST = Process::Create  ($EXEPREFIX."$test".$EXE_EXT,
+                             "$args");
+    print STDERR "\t$test RUNNING\n";
+    $retval = $TST->TimedWait (90);
+    if ($retval == -1) {
+      print STDERR "ERROR $brace $test $args TIMEOUT\n";
+      $TST->Kill (); $TST->TimedWait (5);
+    } elsif ($retval != 0) { 
+      print STDERR "ERROR $brace $test $args, exit value $retval\n";
     }
     print STDERR "$brace $test FINISHED successfully\n";
 }
 
-exit $status;
+while (($test,$args) = each %tests)
+{
+    run_test ($test, $args);
+}
+
+exit 0;
diff --git a/TAO/tests/Codec/Makefile b/TAO/tests/Codec/Makefile
deleted file mode 100644
index 55bc018ea1d..00000000000
--- a/TAO/tests/Codec/Makefile
+++ /dev/null
@@ -1,690 +0,0 @@
-#----------------------------------------------------------------------------
-# $Id$
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_FILES = test
-IDL_SRC = testC
-BIN = client
-
-SRC = $(addsuffix .cpp, $(BIN) $(IDL_SRC))
-
-CLIENT_OBJS = \
-  client.o \
-  testC.o
-
-TAO_IDLFLAGS += -Ge 1
-
-#----------------------------------------------------------------------------
-#	Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-.PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext))
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
-# 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 \
- $(TAO_ROOT)/tao/IOPC.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.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/IOPC.i testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- 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/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Codec/Makefile.bor b/TAO/tests/Codec/Makefile.bor
deleted file mode 100644
index 6023060755a..00000000000
--- a/TAO/tests/Codec/Makefile.bor
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for building the Codec test executables
-#
-
-MAKEFILES = client.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tests/Codec/README b/TAO/tests/Codec/README
deleted file mode 100644
index b0a66a30062..00000000000
--- a/TAO/tests/Codec/README
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id$
-
-This test verifies that CodecFactory and CDR encapsulation Codec
-support is working properly. 
-
-It does so by encoding a structure into an octet sequence, decoding
-into a new instance of the structure from the octet sequence, and then
-comparing the contents of the two structures.
-
-Run the test as follows:
-
-	$ perl run_test.pl
-
-Expected output follows:
-
-==== Running Codec test
-Testing CDR encapsulation Codec encode()/decode()
-=================================================
-Original
---------
-I want a standing ovation!
--3427
-I'm Batman.
-
-Extracted
----------
-I want a standing ovation!
--3427
-I'm Batman.
-
-Testing CDR encapsulation Codec encode_value()/decode_value()
-=============================================================
-Original
---------
-I want a standing ovation!
--3427
-I'm Batman.
-
-Extracted
----------
-I want a standing ovation!
--3427
-I'm Batman.
-
-Codec test passed.
diff --git a/TAO/tests/Codec/client.bor b/TAO/tests/Codec/client.bor
deleted file mode 100644
index f5762c05e4d..00000000000
--- a/TAO/tests/Codec/client.bor
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Makefile for building the Codec test client
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -I../.. -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\client.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB)
-
-IDLFILES = \
-	$(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) $**
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
deleted file mode 100644
index d70e9172f54..00000000000
--- a/TAO/tests/Codec/client.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/IOPC.h"
-#include "testC.h"
-
-ACE_RCSID (Codec,
-           client,
-           "$Id$")
-
-int
-verify_data (Foo::Bar *original, Foo::Bar *extracted)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Original\n"
-              "--------\n"
-              "%s\n"
-              "%d\n"
-              "%s\n\n"
-              "Extracted\n"
-              "---------\n"
-              "%s\n"
-              "%d\n"
-              "%s\n\n",
-              original->A.in (),
-              original->B,
-              original->C.in (),
-              extracted->A.in (),
-              extracted->B,
-              extracted->C.in ()));
-
-  if (ACE_OS_String::strcmp (original->A, extracted->A) != 0
-      || original->B != extracted->B
-      || ACE_OS_String::strcmp (original->C, extracted->C) != 0)
-    return -1;
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "my_orb", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Obtain a reference to the CodecFactory.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("CodecFactory",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      IOP::CodecFactory_var codec_factory =
-        IOP::CodecFactory::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // ----------------------------------------------------------
-
-      // Set up a structure that contains information necessary to
-      // create a GIOP 1.1 CDR encapsulation Codec.
-      IOP::Encoding encoding;
-      encoding.format = IOP::ENCODING_CDR_ENCAPS;
-      encoding.major_version = 1;
-      encoding.minor_version = 1;
-
-      // Obtain the CDR encapsulation Codec.
-      IOP::Codec_var codec =
-        codec_factory->create_codec (encoding, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // ----------------------------------------------------------
-
-      // Test values to be placed in the test structure.
-      const char A[] = "I want a standing ovation!";
-      CORBA::Long B = -3427;
-      const char C[] = "I'm Batman.";
-
-      // Create the structure to be encoded.
-      Foo::Bar value;
-      value.A = CORBA::string_dup (A);
-      value.B = B;
-      value.C = CORBA::string_dup (C);
-
-      CORBA::Any data;
-      data <<= value;
-
-      // ----------------------------------------------------------
-
-      CORBA::OctetSeq_var encoded_data;
-      CORBA::Any_var decoded_data;
-      Foo::Bar *extracted_value;
-
-      // Encode the structure into an octet sequence using the CDR
-      // enscapsulation Codec.
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Testing CDR encapsulation Codec encode()/decode()\n"
-                  "=================================================\n"));
-
-      // Start out with the encode() method, i.e. the one that
-      // includes the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode (data, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Extract the data from the octet sequence.
-      decoded_data = codec->decode (encoded_data.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      decoded_data.in() >>= extracted_value;
-
-      // Verify that the extracted data matches the data that was
-      // originally encoded into the octet sequence.
-      if (::verify_data (&value, extracted_value) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Data extracted using "
-                           "IOP::Codec::decode() does not match "
-                           "original data.\n"),
-                          -1);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Testing CDR encapsulation Codec "
-                  "encode_value()/decode_value()\n"
-                  "================================"
-                  "=============================\n"));
-
-      // Now use the encode_value() method, i.e. the one that does
-      // *not* include the TypeCode in the CDR encapsulation.
-      encoded_data = codec->encode_value (data, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Extract the data from the octet sequence.
-      decoded_data = codec->decode_value (encoded_data.in (),
-                                          Foo::_tc_Bar,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      decoded_data.in() >>= extracted_value;
-
-      // Verify that the extracted data matches the data that was
-      // originally encoded into the octet sequence.
-      if (::verify_data (&value, extracted_value) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Data extracted using "
-                           "IOP::Codec::decode_value() does not match "
-                           "original data.\n"),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Codec test:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, "Codec test passed.\n"));
-
-  return 0;
-}
diff --git a/TAO/tests/Codec/run_test.pl b/TAO/tests/Codec/run_test.pl
deleted file mode 100755
index 16c1b3ddd8f..00000000000
--- a/TAO/tests/Codec/run_test.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# -*- perl -*-
-# $Id$
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-print STDERR "\n\n==== Running Codec test\n";
-
-$T = new PerlACE::Process ("client");
-
-$test = $T->SpawnWaitKill (15);
-
-if ($test != 0) {
-    print STDERR "ERROR: Codec test returned $test\n";
-    exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/Codec/test.idl b/TAO/tests/Codec/test.idl
deleted file mode 100644
index e9cca6b0397..00000000000
--- a/TAO/tests/Codec/test.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- * @file test.idl
- *
- * $Id$
- *
- * "test" IDL interface for the Codec test.
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-module Foo
-{
-
-  struct Bar
-  {
-    string A;
-    long B;
-    string C;
-  };
-
-};
diff --git a/TAO/tests/Collocation/Coll_Tester.cpp b/TAO/tests/Collocation/Coll_Tester.cpp
index 27ec77cf8fd..9993a1e771c 100644
--- a/TAO/tests/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Collocation/Coll_Tester.cpp
@@ -89,8 +89,7 @@ Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Collocation_Test::parse_args (int /*argc*/,
-                              char *[] /*argv*/)
+Collocation_Test::parse_args (int argc, char *argv[])
 {
   return 0;
 }
@@ -99,19 +98,19 @@ int
 Collocation_Test::test_narrow (CORBA::Environment &ACE_TRY_ENV)
 {
   Diamond::Top_var top =
-    Diamond::Top::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Top::_narrow (this->diamond_obj_, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Left_var left =
-    Diamond::Left::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Left::_narrow (this->diamond_obj_, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Right_var right =
-    Diamond::Right::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Right::_narrow (this->diamond_obj_, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   Diamond::Buttom_var buttom =
-    Diamond::Buttom::_narrow (this->diamond_obj_.in (), ACE_TRY_ENV);
+    Diamond::Buttom::_narrow (this->diamond_obj_, ACE_TRY_ENV);
   ACE_CHECK_RETURN (-1);
 
   CORBA::String_var str = top->shape (ACE_TRY_ENV);
diff --git a/TAO/tests/Collocation/Coll_Tester.h b/TAO/tests/Collocation/Coll_Tester.h
index 0912feb048f..110712c0122 100644
--- a/TAO/tests/Collocation/Coll_Tester.h
+++ b/TAO/tests/Collocation/Coll_Tester.h
@@ -2,13 +2,13 @@
 
 //============================================================================
 //
-//  = FILENAME
+//  =FILENAME
 //     Collocation_Test.h
 //
-//  = DESCRIPTION
+//  =DESCRIPTION
 //     Server class to perform testing of TAO's collocation mechanism.
 //
-//  = AUTHOR
+//  =AUTHOR
 //     Nanbor Wang
 //
 //=============================================================================
@@ -16,13 +16,11 @@
 #if !defined (TAO_COLLOCATION_TEST_H)
 #define TAO_COLLOCATION_TEST_H
 
-#include "Diamond_i.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
+#include "Diamond_i.h"
 
 class Collocation_Test
 {
diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp
index 204f22da198..4eca173bdfe 100644
--- a/TAO/tests/Collocation/Diamond_i.cpp
+++ b/TAO/tests/Collocation/Diamond_i.cpp
@@ -47,7 +47,7 @@ Left_i::color (CORBA::Environment &)
   ))
 {
   return CORBA::string_dup ("black");
-}
+};
 
 Right_i::Right_i ()
 {
diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h
index 6aaecc464f3..0f9637bfd50 100644
--- a/TAO/tests/Collocation/Diamond_i.h
+++ b/TAO/tests/Collocation/Diamond_i.h
@@ -3,12 +3,11 @@
 #if !defined (TAO_DIAMOND_I_H)
 #define TAO_DIAMOND_I_H
 
-#include "DiamondS.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "DiamondS.h"
 
 class Diamond_Export Top_i : public POA_Diamond::Top
 {
diff --git a/TAO/tests/Collocation/Makefile b/TAO/tests/Collocation/Makefile
deleted file mode 100644
index f7b93ef95aa..00000000000
--- a/TAO/tests/Collocation/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-MAKEFILE = Makefile
-
-#----------------------------------------------------------------------------
-#       Include macros
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-MKLIST = \
-	Makefile.stub \
-	Makefile.impl \
-	Makefile.test
-
-all debug profile optimize install deinstall clean realclean clobber depend:
-ifeq (Windows,$(findstring Windows,$(OS)))
-	@cmd /c "FOR /D %m IN ($(MKLIST)) DO $(MAKE) -f %m MAKEFILE=$$m $(@:.nested=)"
-else  # ! Windows
-	@for m in $(MKLIST); do \
-	echo $$m; \
-        $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \
-        done
-endif # ! Windows
diff --git a/TAO/tests/Collocation/Makefile.impl b/TAO/tests/Collocation/Makefile.impl
deleted file mode 100644
index 3e0d96f384c..00000000000
--- a/TAO/tests/Collocation/Makefile.impl
+++ /dev/null
@@ -1,756 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-MAKEFILE = Makefile.impl
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-TAO_IDLFLAGS += -Wb,skel_export_macro=Diamond_Export \
-                -Wb,stub_export_macro=MY_Stub_Export \
-                -Wb,skel_export_include=diamond_export.h \
-                -Wb,stub_export_include=stub_export.h \
-                -Ge 1 -Gd
-
-LDLIBS = -lCollocation_Test_Stub -lTAO
-
-SHLIB = libCollocation_Diamond.$(SOEXT)
-LIB = libCollocation_Diamond.a
-
-FILES = Diamond_i
-
-IDL_FILES = Diamond
-IDL_SRC = DiamondS
-
-SHLIB_SRC = $(IDL_SRC) $(FILES)
-
-LSRC = $(addsuffix .cpp,$(SHLIB_SRC))
-LOBJ = $(addsuffix .o,$(SHLIB_SRC))
-PSRC = $(addsuffix .cpp,$(BIN))
-
-#----------------------------------------------------------------------------
-#       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
-include $(TAO_ROOT)/taoconfig.mk
-
-
-.PRECIOUS: DiamondC.h DiamondC.i DiamondC.cpp DiamondS.h DiamondS.i DiamondS.cpp
-
-realclean: clean
-	-$(RM) DiamondC.* DiamondS.* DiamondS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/DiamondS.o .obj/DiamondS.so .shobj/DiamondS.o .shobj/DiamondS.so: DiamondS.cpp DiamondS.h DiamondC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.7.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- stub_export.h DiamondC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(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/PortableServer/Key_Adapters.i \
- $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
-
-.obj/Diamond_i.o .obj/Diamond_i.so .shobj/Diamond_i.o .shobj/Diamond_i.so: Diamond_i.cpp Diamond_i.h DiamondS.h DiamondC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.7.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- stub_export.h DiamondC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Collocation/Makefile.stub b/TAO/tests/Collocation/Makefile.stub
deleted file mode 100644
index d836e81e0c9..00000000000
--- a/TAO/tests/Collocation/Makefile.stub
+++ /dev/null
@@ -1,383 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-MAKEFILE = Makefile.stub
-
-# On non-Windows environment, we should at least define
-# the export_include IDL flag.
-TAO_IDLFLAGS += -Wb,skel_export_macro=Diamond_Export \
-                -Wb,stub_export_macro=MY_Stub_Export \
-                -Wb,skel_export_include=diamond_export.h \
-                -Wb,stub_export_include=stub_export.h \
-                -Ge 1 -Gd
-
-LDLIBS = -lTAO
-
-SHLIB = libCollocation_Test_Stub.$(SOEXT)
-LIB = libCollocation_Test_Stub.a
-
-IDL_FILES = Diamond
-IDL_SRC = DiamondC
-
-SHLIB_SRC = $(IDL_SRC)
-
-LSRC = $(addsuffix .cpp,$(SHLIB_SRC))
-LOBJ = $(addsuffix .o,$(SHLIB_SRC))
-PSRC = $(addsuffix .cpp,$(BIN))
-
-#----------------------------------------------------------------------------
-#       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
-include $(TAO_ROOT)/taoconfig.mk
-
-
-.PRECIOUS: DiamondC.h DiamondC.i DiamondC.cpp DiamondS.h DiamondS.i DiamondS.cpp
-
-realclean: clean
-	-$(RM) DiamondC.* DiamondS.* DiamondS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/DiamondC.o .obj/DiamondC.so .shobj/DiamondC.o .shobj/DiamondC.so: DiamondC.cpp DiamondC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.7.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- stub_export.h DiamondC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Collocation/Makefile.test b/TAO/tests/Collocation/Makefile.test
deleted file mode 100644
index 8108e1410e0..00000000000
--- a/TAO/tests/Collocation/Makefile.test
+++ /dev/null
@@ -1,382 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-MAKEFILE = Makefile.test
-
-LDLIBS = -lCollocation_Test_Stub \
-         -lCollocation_Diamond \
-         -lTAO_PortableServer \
-         -lTAO
-
-SRC = Coll_Tester.cpp
-
-BIN = main
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/Coll_Tester.o .obj/Coll_Tester.so .shobj/Coll_Tester.o .shobj/Coll_Tester.so: Coll_Tester.cpp Coll_Tester.h Diamond_i.h DiamondS.h \
- DiamondC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.7.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- stub_export.h DiamondC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- diamond_export.h DiamondS_T.h DiamondS_T.i DiamondS_T.cpp DiamondS.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Collocation/README b/TAO/tests/Collocation/README
index 62fe5832311..653c748f365 100644
--- a/TAO/tests/Collocation/README
+++ b/TAO/tests/Collocation/README
@@ -1,6 +1,4 @@
-This program performs a series of sanity check on the collocation support
-in TAO.  It also serves as an example of how to separate stub and skeleton
-+ implementation from the main program.
+This program performs a series of sanity check on the collocation support in TAO.
 
 After building the example, you'll get:
 
diff --git a/TAO/tests/Collocation/svc.conf b/TAO/tests/Collocation/svc.conf
index 16f01bef61e..c278301c9bf 100644
--- a/TAO/tests/Collocation/svc.conf
+++ b/TAO/tests/Collocation/svc.conf
@@ -4,11 +4,11 @@
 #
 
 # This is a single threaded "server."
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
 
 # Make sure we use RW client handler so if something goes wrong, the program will bloc,
 # i.e., won't work.
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
 
 # Not absolutely necessary for this test, but we add it for fun.
 static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
diff --git a/TAO/tests/Connection_Purging/run_test.pl b/TAO/tests/Connection_Purging/run_test.pl
index 6eeb1cdd5ab..6917af2b8d3 100755
--- a/TAO/tests/Connection_Purging/run_test.pl
+++ b/TAO/tests/Connection_Purging/run_test.pl
@@ -5,15 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("Connection_Purging", "-ORBCollocation no");
+ACE::checkForTarget(getcwd());
 
-$client = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."Connection_Purging".$EXE_EXT." -ORBCollocation no");
 
+$client = $T->TimedWait (60);
 if ($client == -1) {
-    exit 1;
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
+
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 439e3700fa5..db4dcfd39aa 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -62,8 +62,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        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"),
@@ -131,8 +130,7 @@ main (int argc, char *argv[])
 	  ACE_OS::fclose (output_file);
 	}
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
diff --git a/TAO/tests/DSI_Gateway/run_test.pl b/TAO/tests/DSI_Gateway/run_test.pl
index a455f66c991..8f23c17c497 100755
--- a/TAO/tests/DSI_Gateway/run_test.pl
+++ b/TAO/tests/DSI_Gateway/run_test.pl
@@ -5,60 +5,66 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$svfile = PerlACE::LocalFile ("server.ior");
-$gwfile = PerlACE::LocalFile ("gateway.ior");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
+$svfile = "$cwd$DIR_SEPARATOR" . "server.ior";
 unlink $svfile;
-unlink $gwfile;
-
-$status = 0;
-
-$SV = new PerlACE::Process ("server", "-o $svfile");
-$GW = new PerlACE::Process ("gateway", "-k file://$svfile -o $gwfile");
-$CL = new PerlACE::Process ("client", "-k file://$gwfile -x -i 100");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $svfile");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($svfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$svfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($svfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$svfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$GW->Spawn ();
-
-if (PerlACE::waitforfile_timed ($gwfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$gwfile>\n";
-    $SV->Kill ();
-    $GW->Kill (); 
-    exit 1;
+$gwfile = "$cwd$DIR_SEPARATOR" . "gateway.ior";
+unlink $gwfile;
+$GW = Process::Create ($EXEPREFIX."gateway$EXE_EXT ",
+                       " -k file://$svfile"
+		       . " -o $gwfile");
+
+if (ACE::waitforfile_timed ($gwfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$gwfile>\n";
+  $GW->Kill (); $GW->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+		       " -k file://$gwfile -x"
+		       . " -i 100");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-$gateway = $GW->WaitKill (5);
-
-if ($gateway != 0) {
-    print STDERR "ERROR: gateway returned $gateway\n";
-    $status = 1;
+$gateway = $GW->TimedWait (5);
+if ($gateway == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $GW->Kill (); $GW->TimedWait (1);
 }
 
 unlink $svfile;
 unlink $gwfile;
 
-exit $status;
+if ($server != 0
+    || $gateway != 0
+    || $client != 0) {
+  print STDERR "ERROR: test failed <$server,$gateway,$client>\n";
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index fbc51b0d72b..ea1fb4cc732 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -50,8 +50,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        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"),
@@ -96,8 +95,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp
index cc796516824..cd9d1596a06 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.cpp
+++ b/TAO/tests/DSI_Gateway/test_dsi.cpp
@@ -43,15 +43,8 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request,
 
   target_request->_tao_lazy_evaluation (1);
 
-  // Outgoing request must have the same byte order as the incoming one.
-  target_request->_tao_byte_order (request->_tao_incoming_byte_order ());
-
-  // Updates the byte order state, if necessary.
   target_request->invoke (ACE_TRY_ENV);
   ACE_CHECK;
-  
-  // Outgoing reply must have the same byte order as the incoming one.
-  request->_tao_reply_byte_order (target_request->_tao_byte_order ());
 }
 
 CORBA::RepositoryId
diff --git a/TAO/tests/DynAny_Test/basic_test.dsp b/TAO/tests/DynAny_Test/basic_test.dsp
index 49242184dda..435bb922381 100644
--- a/TAO/tests/DynAny_Test/basic_test.dsp
+++ b/TAO/tests/DynAny_Test/basic_test.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl
index cb372010f44..0b19dde15c1 100755
--- a/TAO/tests/DynAny_Test/run_test.pl
+++ b/TAO/tests/DynAny_Test/run_test.pl
@@ -6,50 +6,66 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+require Process;
+use Cwd;
 
-$status = 0;
 $type = "";
 
 sub run_test
 {
-    my $type = shift(@_);
-
-    $BT = new PerlACE::Process ("basic_test", "-t $type");
-    my $basictest = $BT->SpawnWaitKill (10);
-    
-    if ($basictest != 0) {
-        print STDERR "ERROR: basic test for ($type) returned $basictest\n";
-        $status = 1;
-    }
+  my $type = shift(@_);
+
+  $BT = Process::Create ($EXEPREFIX."basic_test".$EXE_EXT,
+			 " -t $type");
+
+  $test = $BT->TimedWait (10);
+  if ($test == -1) {
+    print STDERR "ERROR: test timedout\n";
+    $BT->Kill (); $BT->TimedWait (1);
+  }
+
 }
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-        print "Run_Test Perl script for TAO DynAny Test\n\n";
-        print "run_test [-chorus <target>] [-t type]\n";
-        print "\n";
-        print "-t type             -- runs only one type of dynany test\n";
-        exit;
+# Parse the arguments
+ACE::checkForTarget(getcwd());
+
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
+      print "Run_Test Perl script for TAO DynAny Test\n\n";
+      print "run_test [-chorus <target>] [-t type]\n";
+      print "\n";
+      print "-t type             -- runs only one type of dynany test\n";
+      exit;
     }
-    elsif ($ARGV[$i] eq "-t") {
-        $type = $ARGV[$i + 1];
-        $i++;
+    if ($ARGV[$i] eq "-t")
+    {
+      $type = $ARGV[$i + 1];
+      $i++;
+      last SWITCH;
     }
+  }
 }
 
 @types = ("dynany", "dynarray", "dynenum", "dynsequence", "dynstruct",
           "dynunion");
 
 
-if ($type ne "") {
-    run_test ($type);
+
+if ($type ne "")
+{
+  run_test ($type);
 }
-else {
-    foreach $type (@types) {
-        run_test ($type);
-    }
+else
+{
+  foreach $type (@types)
+  {
+    run_test ($type);
+  }
 }
 
-exit $status;
 
diff --git a/TAO/tests/Endpoint_Per_Priority/client.cpp b/TAO/tests/Endpoint_Per_Priority/client.cpp
index f2403586cf1..cb4e1bfbc90 100644
--- a/TAO/tests/Endpoint_Per_Priority/client.cpp
+++ b/TAO/tests/Endpoint_Per_Priority/client.cpp
@@ -270,8 +270,7 @@ Client::svc (void)
 
       // Obtain PolicyCurrent.
       CORBA::Object_var policy_current_object =
-        orb_->resolve_initial_references ("PolicyCurrent", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb_->resolve_initial_references ("PolicyCurrent");
 
       CORBA::PolicyCurrent_var policy_current =
         CORBA::PolicyCurrent::_narrow (policy_current_object.in (),
diff --git a/TAO/tests/Endpoint_Per_Priority/run_test.pl b/TAO/tests/Endpoint_Per_Priority/run_test.pl
index 55e25503fb7..32243503eb3 100755
--- a/TAO/tests/Endpoint_Per_Priority/run_test.pl
+++ b/TAO/tests/Endpoint_Per_Priority/run_test.pl
@@ -5,57 +5,58 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$client_conf = PerlACE::LocalFile ("client.conf");
-$server_conf = PerlACE::LocalFile ("server.conf");
-$iorfile = PerlACE::LocalFile ("test.ior");
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
+$client_conf="$cwd$DIR_SEPARATOR" . "client.conf";
+$server_conf="$cwd$DIR_SEPARATOR" . "server.conf";
 $threads='2';
-$status = 0;
-
-unlink $iorfile;
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-$SV = new PerlACE::Process ("server",
-                            "-ORBSvcConf $server_conf"
-                            . " -ORBEndPoint iiop://localhost:0/priority=0 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=1 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=2 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=3 "
-                            . " -ORBEndPoint iiop://localhost:0/priority=4 "
-                            . " -o $iorfile -n $threads");
-
-$CL = new PerlACE::Process ("client",
-                            "-ORBSvcConf $client_conf "
-                            . " -k file://$iorfile "
-                            . " -t 0 -t 1 -i 1000");
+ACE::checkForTarget($cwd);
 
 print STDERR "================ Multi-threaded test\n";
 
-$SV->Spawn ();
+unlink $iorfile;
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBSvcConf $server_conf"
+		       . " -ORBEndPoint iiop://$TARGETHOSTNAME:0/priority=0 "
+		       . " -ORBEndPoint iiop://$TARGETHOSTNAME:0/priority=1 "
+		       . " -ORBEndPoint iiop://$TARGETHOSTNAME:0/priority=2 "
+                       . " -ORBEndPoint iiop://$TARGETHOSTNAME:0/priority=3 "
+                       . " -ORBEndPoint iiop://$TARGETHOSTNAME:0/priority=4 "
+                       . " -o $iorfile -n $threads");
+
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -ORBSvcConf $client_conf "
+                       . " -k file://$iorfile "
+                       . " -t 0 -t 1 -i 1000");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (60);
-
+$server = $SV->TimedWait (60);
 if ($server == -1) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/Endpoint_Per_Priority/server.cpp b/TAO/tests/Endpoint_Per_Priority/server.cpp
index 240e3bed138..8056dd92a48 100644
--- a/TAO/tests/Endpoint_Per_Priority/server.cpp
+++ b/TAO/tests/Endpoint_Per_Priority/server.cpp
@@ -89,9 +89,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
diff --git a/TAO/tests/Endpoint_Per_Priority/test.idl b/TAO/tests/Endpoint_Per_Priority/test.idl
index 31a560b004b..add9a06a336 100644
--- a/TAO/tests/Endpoint_Per_Priority/test.idl
+++ b/TAO/tests/Endpoint_Per_Priority/test.idl
@@ -1,4 +1,6 @@
+//
 // $Id$
+//
 
 interface Test
 {
diff --git a/TAO/tests/Exposed_Policies/Object.cfg b/TAO/tests/Exposed_Policies/Object.cfg
index abe16f67324..fb8b54def2c 100644
--- a/TAO/tests/Exposed_Policies/Object.cfg
+++ b/TAO/tests/Exposed_Policies/Object.cfg
@@ -1,3 +1,12 @@
 IOR_Source overridden.ior
 
-Priority 15
+Priority 20
+
+
+
+
+
+
+
+
+
diff --git a/TAO/tests/Exposed_Policies/POA.cfg b/TAO/tests/Exposed_Policies/POA.cfg
index 86ad4cc7a8e..99270fa15af 100644
--- a/TAO/tests/Exposed_Policies/POA.cfg
+++ b/TAO/tests/Exposed_Policies/POA.cfg
@@ -1,7 +1,17 @@
 IOR_Source default.ior
 
-Priority 5
+Priority 10
+
+Priority_Bands 5
+Priority_Range 3 5 
+Priority_Range 7 11
+Priority_Range 5 9
+Priority_Range 1 5
+Priority_Range 10 15
+
+
+
+
+
+
 
-Priority_Bands 2
-Priority_Range 1 10
-Priority_Range 11 20
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 8bf90a6a318..b6a0a525607 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -5,7 +5,6 @@ ACE_RCSID (tao, Policy_Verifier, "$Id$")
 #if (TAO_HAS_RT_CORBA == 1)
 
 Policy_Verifier::Policy_Verifier (void)
-  : priority_bands_ (0)
 {
   ACE_OS_String::strcpy (this->base_object_ref_,
                          "file://");
@@ -43,9 +42,6 @@ Policy_Verifier::init (int argc,
 
               ACE_OS_String::strcat (this->base_object_ref_,
                                      this->rt_poa_properties_->ior_source ());
-
-              this->priority_bands_ = this->rt_poa_properties_->priority_bands ().length ();
-
             }
           else if ((arg = arg_shifter.get_the_parameter ("-ObjectConfigFile")))
             {
@@ -183,7 +179,7 @@ Policy_Verifier::verify_reference (Counter_ptr object,
               RTCORBA::PriorityBands_var pb =
                 priority_banded_policy->priority_bands ();
               unsigned int band_num = pb->length ();
-              if (band_num != this->priority_bands_)
+              if (band_num != rt_properties->priority_bands ().length ())
                 ACE_DEBUG ((LM_DEBUG,
                             ACE_TEXT ("Mismatching Number of Priority Bands!\n")));
 
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h
index 76e0c2c8f33..9100f37ab57 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.h
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h
@@ -64,7 +64,7 @@ private:
 
   RT_Properties *rt_object_properties_;
   RT_Properties *rt_poa_properties_;
-  unsigned int priority_bands_;
+
   Counter_var base_object_;
   Counter_var overridden_object_;
 
diff --git a/TAO/tests/Exposed_Policies/README b/TAO/tests/Exposed_Policies/README
index ad737b918e0..b33abbff283 100644
--- a/TAO/tests/Exposed_Policies/README
+++ b/TAO/tests/Exposed_Policies/README
@@ -22,7 +22,7 @@ File: POA.cfg
         Priority 10
 
         Priority_Bands 5
-        Priority_Range 3 5
+        Priority_Range 3 5 
         Priority_Range 7 11
         Priority_Range 5 9
         Priority_Range 1 5
@@ -33,7 +33,7 @@ The tag used to decribe the information have the following meaning:
 
     - IOR_Source: Defines the name of the file that has to be used to
                   store the IOR of the object created.
-
+    
     - Priority: Defines a CORBA::Priority value.
 
     - Priority_Bands: Defines the number of priority bands.
@@ -64,8 +64,9 @@ embedded in the IOR is correct.
 
 USAGE:
 
-   server -ORBSvcConf server.conf -ORBendpoint iiop://<hostaddr>:0/priority=<priority> -ORBendpoint iiop://<hostaddr>:0/priority=<priority> -POAConfigFile <config_file_name> -ObjectConfigFile <config_file_name>
-
+   server -POAConfigFile <config_file_name>
+          -ObjectConfigFile <config_file_name>
+ 
    client -POAConfigFile <config_file_name>
           -ObjectConfigFile <config_file_name>
 
@@ -73,7 +74,9 @@ USAGE:
 EXAMPLE:
 
       $ server -POAConfigFile POA.cfg -ObjectConfigFile Object.cfg
+      
+      $ client -POAConfigFile POA.cfg -ObjectConfigFile Object.cfg  
 
       $ client -POAConfigFile POA.cfg -ObjectConfigFile Object.cfg
 
-      $ client -POAConfigFile POA.cfg -ObjectConfigFile Object.cfg
+
diff --git a/TAO/tests/Exposed_Policies/run_test.pl b/TAO/tests/Exposed_Policies/run_test.pl
index 3f4a6a204c0..9f5060c17b8 100755
--- a/TAO/tests/Exposed_Policies/run_test.pl
+++ b/TAO/tests/Exposed_Policies/run_test.pl
@@ -6,38 +6,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-require PerlACE::Run_Test;
-
-$poa_file = PerlACE::LocalFile ("POA.cfg");
-$obj_file = PerlACE::LocalFile ("Object.cfg");
-$server_conf = PerlACE::LocalFile ("server.conf");
-
-$SV = new PerlACE::Process ("server", "-ORBSvcConf $server_conf"
-                                      . " -ORBendpoint iiop://localhost:0/priority=5"
-                                      . " -ORBendpoint iiop://localhost:0/priority=15"
-                                      . " -POAConfigFile $poa_file"
-                                      . " -ObjectConfigFile $obj_file");
-
-$CL = new PerlACE::Process ("client", "-POAConfigFile $poa_file -ObjectConfigFile $obj_file");
+require Process;
 
 $status = 0;
+$POAConfigFile = "POA.cfg";
+$ObjectConfigFile = "Object.cfg";
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-POAConfigFile $POAConfigFile -ObjectConfigFile $ObjectConfigFile");
 
-sleep (5);
 
-$client = $CL->SpawnWaitKill (60);
+$client = Process::Create($EXEPREFIX."client$EXE_EXT", "-POAConfigFile $POAConfigFile -ObjectConfigFile $ObjectConfigFile");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if ($client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $client->Kill (); $client->TimedWait (1);
 }
 
-$server = $SV->TerminateWaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+$SV->Kill ();
 
 exit $status;
diff --git a/TAO/tests/Exposed_Policies/server.conf b/TAO/tests/Exposed_Policies/server.conf
deleted file mode 100644
index ffb323a0a67..00000000000
--- a/TAO/tests/Exposed_Policies/server.conf
+++ /dev/null
@@ -1 +0,0 @@
-static Resource_Factory "-ORBReactorType tp -ORBReactorRegistry per-priority"
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index 5e33978d02f..c5f4433df76 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -72,9 +72,7 @@ main (int argc, char *argv[])
       sw.show ();
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 9a4ee0a775e..33c4757a0c6 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -75,9 +75,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 6f88904ccef..a14b828bd65 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -55,9 +55,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -119,9 +117,8 @@ main (int argc, char *argv[])
 	  ACE_OS::fclose (output_file);
 	}
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index cc21f45d8cd..b3dfb51e622 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -112,9 +112,8 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       persistent_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/Faults/ping.idl b/TAO/tests/Faults/ping.idl
index e52c5776d28..924e04b4ad7 100644
--- a/TAO/tests/Faults/ping.idl
+++ b/TAO/tests/Faults/ping.idl
@@ -1,4 +1,6 @@
+//
 // $Id$
+//
 
 interface PingObject
 {
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index a7e374e5501..6dbe4d624ba 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -71,8 +71,7 @@ run_client (CORBA::ORB_ptr orb,
           ACE_TRY_CHECK;
 
           // Run for <period> milliseconds, to receive the reply
-          orb->run (tv, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          orb->run (tv);
 
           // Terminate the client if:
           //   - This is the last iteration
diff --git a/TAO/tests/Faults/run_test.pl b/TAO/tests/Faults/run_test.pl
index bb2b1df1e61..b5af007f907 100755
--- a/TAO/tests/Faults/run_test.pl
+++ b/TAO/tests/Faults/run_test.pl
@@ -5,185 +5,214 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("test.ior");
-$middlefile = PerlACE::LocalFile ("middle.ior");
-$dum_core = PerlACE::LocalFile ("core");
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
+$middlefile = "$cwd$DIR_SEPARATOR" . "middle.ior";
+$dum_core = "$cwd$DIR_SEPARATOR" . "core";
 $status = 0;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "");
-$MD = new PerlACE::Process ("middle", "-o $middlefile -k file://$iorfile");
-$PI = new PerlACE::Process ("ping", "-o $iorfile");
-$PO = new PerlACE::Process ("pong", "-k file://$iorfile -p 100 -i 60 -t 30");
+ACE::checkForTarget($cwd);
 
-###############################################################################
 print STDERR "===== Base test, no crashes\n";
-
 unlink $iorfile;
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("-k file://$iorfile -i 100");
-
-$client = $CL->SpawnWaitKill (20);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile"
+                       . " -i 100");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (20);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-###############################################################################
 print STDERR "===== Client crash (abort) during upcall\n";
 
-$CL->Arguments ("-k file://$iorfile -i 100 -s");
-
-$client = $CL->SpawnWaitKill (20);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile"
+                       . " -i 100 -s");
 
-# since the client crashes, skip check for $client != 0
+$client = $CL->TimedWait (20);
 if ($client == -1) {
-    $status = 1;
+  print STDERR "ERROR: client (-s) timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-###############################################################################
 print STDERR "===== Client crash during upcall\n";
 
-$CL->Arguments ("-k file://$iorfile -i 100 -z");
-
-$client = $CL->SpawnWaitKill (20);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile"
+                       . " -i 100 -z");
 
-# since the client crashes, skip check for $client != 0
+$client = $CL->TimedWait (20);
 if ($client == -1) {
-    $status = 1;
+  print STDERR "ERROR: client (-z) timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-###############################################################################
 print STDERR "===== Server crash (abort) during upcall\n";
 
-$CL->Arguments ("-k file://$iorfile -i 100 -a");
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile"
+                       . " -i 100 -a");
 
-$client = $CL->SpawnWaitKill (20);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (20);
+if ($client == -1) {
+  print STDERR "ERROR: client (-a) timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$server = $SV->WaitKill (20);
-
-# since the server crashes, skip check for $server != 0
+$server = $SV->TimedWait (20);
 if ($server == -1) {
-    $status = 1;
+  print STDERR "ERROR: server (-a) timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
-###############################################################################
 print STDERR "===== Server crash during upcall\n";
 
 unlink $iorfile;
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("-k file://$iorfile -i 100 -c");
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile"
+                       . " -i 100 -c");
 
-$client = $CL->SpawnWaitKill (20);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (20);
+if ($client == -1) {
+  print STDERR "ERROR: client (-c) timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$server = $SV->WaitKill (20);
-
-# since the server crashes, skip check for $server != 0
+$server = $SV->TimedWait (20);
 if ($server == -1) {
-    $status = 1;
+  print STDERR "ERROR: server (-c) timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
-###############################################################################
 print STDERR "===== Three-way test, client crashes and server detects\n";
 
 unlink $iorfile;
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
+
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
 unlink $middlefile;
-$MD->Spawn ();
+$MD = Process::Create ($EXEPREFIX."middle$EXE_EXT ",
+                       " -o $middlefile -k file://$iorfile");
 
-if (PerlACE::waitforfile_timed ($middlefile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$middlefile>\n";
-    $MD->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($middlefile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$middlefile>\n";
+  $MD->Kill (); $MD->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("-k file://$middlefile -i 100 -s");
-
-$client = $CL->SpawnWaitKill (100);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$middlefile"
+                       . " -i 100 -s");
 
-# since the client crashes, skip check for $client != 0
-if ($client != -1) {
-    $status = 1;
+$client = $CL->TimedWait (100);
+if ($client == -1) {
+  print STDERR "ERROR: client (middle/-s) timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$CL->Arguments (" -k file://$middlefile -i 10 -x");
-
-$client = $CL->SpawnWaitKill (100);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$middlefile"
+                       . " -i 10 -x");
 
-# since the client crashes, skip check for $client != 0
+$client = $CL->TimedWait (100);
 if ($client == -1) {
-    $status = 1;
+  print STDERR "ERROR: client (middle/-x) timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$server = $SV->WaitKill (20);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (20);
+if ($server == -1) {
+  print STDERR "ERROR: server (middle/-x) timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
-$middle = $MD->WaitKill (20);
+$middle = $MD->TimedWait (20);
+if ($middle == -1) {
+  print STDERR "ERROR: middle (-x) timedout\n";
+  $MD->Kill (); $MD->TimedWait (1);
+  $status = 1;
+}
 
 if ($middle != 0) {
-    print STDERR "ERROR: the middle test failed, middle returned $middle\n";
-    $status = 1;
+  print STDERR "ERROR: the middle test failed\n";
+  $status = 1;
 }
 
-###############################################################################
 print STDERR "===== Ping-pong test, server crashes but client continues\n";
 
 unlink $iorfile;
-$PI->Spawn ();
+$SV = Process::Create ($EXEPREFIX."ping$EXE_EXT ",
+                       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-if ($PO->SpawnWaitKill (60) == -1) {
-    $status = 1;
-}
+$CL = Process::Create ($EXEPREFIX."pong$EXE_EXT ",
+                       " -k file://$iorfile"
+                       . " -p 100 -i 60 -t 30");
 
-if ($PI->WaitKill (60) == -1) {
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: pong timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: ping timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
+}
 unlink $dum_core;
 
 exit $status;
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 6097ac4b810..5410582b955 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -43,9 +43,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -90,9 +88,8 @@ main (int argc, char *argv[])
 	  ACE_OS::fclose (output_file);
 	}
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/Forwarding/Makefile.bor b/TAO/tests/Forwarding/Makefile.bor
deleted file mode 100644
index 7d5fd4e9ac0..00000000000
--- a/TAO/tests/Forwarding/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the forwarding example
-#
-
-MAKEFILES = \
-	client.bor \
-	server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Forwarding/client.bor b/TAO/tests/Forwarding/client.bor
deleted file mode 100644
index ab554549763..00000000000
--- a/TAO/tests/Forwarding/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#
-# Makefile for building the forwarding example
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\test_i.obj \
-	$(OBJDIR)\client.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/tests/Forwarding/run_test.pl b/TAO/tests/Forwarding/run_test.pl
index eb80a33fb00..d6b4a312b91 100755
--- a/TAO/tests/Forwarding/run_test.pl
+++ b/TAO/tests/Forwarding/run_test.pl
@@ -5,54 +5,72 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
+$port = ACE::uniqueid () + 10001;  # This can't be 10000 for Chorus 4.0
 
-unlink $iorfile;
-
-$port = PerlACE::uniqueid () + 10001;  # This can't be 10000 for Chorus 4.0
-$status = 0;
-
-$SV  = new PerlACE::Process ("server", "-ORBEndpoint iiop://localhost:$port -o $iorfile");
-$CL1 = new PerlACE::Process ("client", "-i 100 -k file://$iorfile");
-$CL2 = new PerlACE::Process ("client", "-x -i 100 -k corbaloc::localhost:$port/Simple_Server");
+ACE::checkForTarget($cwd);
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+		       "-ORBEndpoint iiop://localhost:".$port
+		       . " -o $iorfile");
+
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
 print STDERR "==== Running first test, using full IORs\n";
 
-$client = $CL1->SpawnWaitKill (60);
+$CL1 = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			"-i 100 -k file://$iorfile");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 1 returned $client\n";
-    $status = 1;
+$client1 = $CL1->TimedWait (60);
+if ($client1 == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL1->Kill (); $CL1->TimedWait (1);
 }
 
-print STDERR "==== Running second test, using corbaloc IORs ($port)\n";
+if ($client2 != 0) {
+  print STDERR "ERROR running client (file://)\n";
+}
 
+print STDERR "==== Running second test, using corbaloc IORs ($port)\n";
 
-$client = $CL2->SpawnWaitKill (60);
+$CL2 = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			"-x -i 100 "
+			. "-k corbaloc::localhost:"
+			.$port
+			."/Simple_Server");
 
-if ($client != 0) {
-    print STDERR "ERROR: client 2 returned $client\n";
-    $status = 1;
+$client2 = $CL2->TimedWait (60);
+if ($client2 == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL2->Kill (); $CL2->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+if ($client2 != 0) {
+  print STDERR "ERROR running client (iioploc://)\n";
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0
+    || $client1 != 0
+    || $client2 != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/Forwarding/server.bor b/TAO/tests/Forwarding/server.bor
deleted file mode 100644
index 5c41e26293b..00000000000
--- a/TAO/tests/Forwarding/server.bor
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#
-# Makefile for building the Forwarding example
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
-
-OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\test_i.obj \
-	$(OBJDIR)\server.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
-        $(TAO_IORTABLE_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_IORTABLE_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index acd0a523c8a..d8c5a0e6d90 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -99,7 +99,7 @@ main (int argc, char *argv[])
 
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/IDL_Test/Makefile b/TAO/tests/IDL_Test/Makefile
index eefaffbbd64..56896c01a36 100644
--- a/TAO/tests/IDL_Test/Makefile
+++ b/TAO/tests/IDL_Test/Makefile
@@ -24,6 +24,8 @@ IDL_ALWAYS =	anonymous		\
 		including		\
 		interface		\
 		keywords		\
+		nested_scope		\
+		params			\
 		pragma			\
 		sequence		\
 		typedef			\
@@ -31,9 +33,7 @@ IDL_ALWAYS =	anonymous		\
 
 IDL_MAYBE = 	reopened_modules \
 		reopen_include1  \
-		reopen_include2  \
-                params           \
-                nested_scope
+		reopen_include2
 
 IDL_FILES = $(IDL_ALWAYS) $(IDL_MAYBE)
 
@@ -51,12 +51,7 @@ SRC = $(IDL_SRC) \
 	reopen_include1S.cpp \
 	reopen_include2C.cpp \
 	reopen_include2S.cpp \
-        paramsC.cpp \
-        paramsS.cpp \
-        nested_scopeC.cpp \
-        nested_scopeS.cpp \
-	main.cpp \
-        namespace_check.cpp
+	main.cpp namespace_check.cpp
 
 TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
@@ -71,9 +66,7 @@ include $(TAO_ROOT)/rules.tao.GNU
 BUILD += 	namespace_check.cpp   \
 		reopened_modulesC.cpp \
 		reopen_include1C.cpp  \
-		reopen_include2C.cpp  \
-                paramsC.cpp           \
-                nested_scopeC.cpp
+		reopen_include2C.cpp
 
 BIN = main
 
@@ -86,8 +79,7 @@ CPPFLAGS += -I$(TAO_ROOT)
 
 .PRECIOUS: $(foreach file, $(IDL_SRC), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 
-namespace_check.cpp: reopened_modulesC.h reopen_include1C.h reopen_include2C.h \
-                     paramsC.h nested_scopeC.h
+namespace_check.cpp: reopened_modulesC.h reopen_include1C.h reopen_include2C.h
 
 reopened_modulesC.h: reopened_modules.idl $(TAO_IDL)
 	$(TAO_IDL) -w $(TAO_IDLFLAGS) reopened_modules.idl
@@ -98,12 +90,6 @@ reopen_include1C.h: reopen_include1.idl $(TAO_IDL)
 reopen_include2C.h: reopen_include2.idl $(TAO_IDL)
 	$(TAO_IDL) -w $(TAO_IDLFLAGS) reopen_include2.idl
 
-paramsC.h: params.idl $(TAO_IDL)
-	$(TAO_IDL) -w $(TAO_IDLFLAGS) params.idl
-
-nested_scopeC.h: nested_scope.idl $(TAO_IDL)
-	$(TAO_IDL) -w $(TAO_IDLFLAGS) nested_scope.idl
-
 main:	$(addprefix $(VDIR),$(TEST_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
diff --git a/TAO/tests/IDL_Test/Makefile.bor b/TAO/tests/IDL_Test/Makefile.bor
index e761b844876..a9b67fd801e 100644
--- a/TAO/tests/IDL_Test/Makefile.bor
+++ b/TAO/tests/IDL_Test/Makefile.bor
@@ -25,8 +25,6 @@ OBJFILES = \
 	$(OBJDIR)\interfaceS.obj \
 	$(OBJDIR)\keywordsC.obj \
 	$(OBJDIR)\keywordsS.obj \
-        $(OBJDIR)\paramsC.obj \
-        $(OBJDIR)\paramsS.obj \
 	$(OBJDIR)\pragmaC.obj \
 	$(OBJDIR)\pragmaS.obj \
 	$(OBJDIR)\reopen_include1C.obj \
@@ -66,7 +64,6 @@ IDLFILES = \
         $(IDLDIR)\including.idl \
         $(IDLDIR)\interface.idl \
         $(IDLDIR)\keywords.idl \
-        $(IDLDIR)\params.idl \
         $(IDLDIR)\pragma.idl \
         $(IDLDIR)\sequence.idl \
         $(IDLDIR)\typedef.idl \
@@ -112,9 +109,6 @@ $(IDLDIR)\interfaceC.cpp $(IDLDIR)\interfaceS.cpp: $(IDLDIR)\interface.idl
 $(IDLDIR)\keywordsC.cpp $(IDLDIR)\keywordsS.cpp: $(IDLDIR)\keywords.idl
 	$(TAO_IDL) $**
 
-$(IDLDIR)\paramsC.cpp $(IDLDIR)\paramsS.cpp: $(IDLDIR)\params.idl
-	$(TAO_IDL) $**
-
 $(IDLDIR)\pragmaC.cpp $(IDLDIR)\pragmaS.cpp: $(IDLDIR)\pragma.idl
 	$(TAO_IDL) $**
 
diff --git a/TAO/tests/IDL_Test/interface.idl b/TAO/tests/IDL_Test/interface.idl
index a44dce519fb..3c8e64bbf8a 100644
--- a/TAO/tests/IDL_Test/interface.idl
+++ b/TAO/tests/IDL_Test/interface.idl
@@ -106,27 +106,3 @@ struct later_holder
 
 interface later {};
 
-// Previously, we could have found v if it
-// was inherited into Client, but not in
-// the case below, where it is inherited into
-// somewhere other than the scope where the
-// lookup starts.
-
-interface Begin 
-{
-  typedef long Value;
-};
-
-interface Middle : Begin
-{
-};
-
-interface End : Middle 
-{
-};
-
-interface Client 
-{
-  attribute End::Value v;
-};
-
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index a5aa746de5a..d3e20a587c1 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -47,16 +47,12 @@ main (int argc , char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                            argv, 
-                                            "", 
-                                            ACE_TRY_ENV);
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", 
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references ("RootPOA");
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in (), 
diff --git a/TAO/tests/IDL_Test/namespace_check.cpp b/TAO/tests/IDL_Test/namespace_check.cpp
index da50d69a727..60b776dbdbf 100644
--- a/TAO/tests/IDL_Test/namespace_check.cpp
+++ b/TAO/tests/IDL_Test/namespace_check.cpp
@@ -9,12 +9,12 @@
 //    namespace_check.cpp
 //
 // = DESCRIPTION
-//    Contains conditional include of generated code which contains
-//    reopened and/or nested modules, for platforms without
+//    Contains conditional include of reopened_modulesC.cpp
+//    and reopened_modulesS.cpp, for platforms without
 //    namespaces.
 //
 // = AUTHORS
-//    Jeff Parsons <parsons@cs.wustl.edu>.
+//    Jeff Parsons <parsons@cs.wustl.edu> and TAO users.
 //
 // ============================================================================
 
@@ -29,9 +29,5 @@
 #include "reopen_include1S.cpp"
 #include "reopen_include2C.cpp"
 #include "reopen_include2S.cpp"
-#include "paramsC.cpp"
-#include "paramsS.cpp"
-#include "nested_scopeC.cpp"
-#include "nested_scopeS.cpp"
 
 #endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tests/IDL_Test/nested_scope.idl b/TAO/tests/IDL_Test/nested_scope.idl
index 582f7a9d341..4617025ec5c 100644
--- a/TAO/tests/IDL_Test/nested_scope.idl
+++ b/TAO/tests/IDL_Test/nested_scope.idl
@@ -105,13 +105,13 @@ module wstr_b_skip
   };
 };
 
-interface bloo {};
+interface foo {};
 
 module obj_u_skip
 {
   module obj_u_hump
   {
-    typedef sequence<bloo> obj_u_skip;
+    typedef sequence<foo> obj_u_skip;
   };
 };
 
@@ -119,7 +119,7 @@ module obj_b_skip
 {
   module obj_b_hump
   {
-    typedef sequence<bloo> obj_b_skip;
+    typedef sequence<foo> obj_b_skip;
   };
 };
 
diff --git a/TAO/tests/IDL_Test/run_test.pl b/TAO/tests/IDL_Test/run_test.pl
index 5f74f1ef6c2..dc67cc4a602 100755
--- a/TAO/tests/IDL_Test/run_test.pl
+++ b/TAO/tests/IDL_Test/run_test.pl
@@ -6,15 +6,15 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-use PerlACE::Run_Test;
+require ACEutils;
+require Process;
 
-$T = new PerlACE::Process ("main");
+$M = Process::Create ($EXEPREFIX."main".$EXE_EXT);
 
-$test = $T->SpawnWaitKill (60);
+$test = $M->TimedWait (10);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+if ($test == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $M->Kill (); $M->TimedWait (1);
 }
 
-exit 0;
diff --git a/TAO/tests/IORManipulation/run_test.pl b/TAO/tests/IORManipulation/run_test.pl
index 6bb5b782e49..5134dea8b1d 100755
--- a/TAO/tests/IORManipulation/run_test.pl
+++ b/TAO/tests/IORManipulation/run_test.pl
@@ -5,16 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("IORTest");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."IORTest".$EXE_EXT);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
+
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index aa6c9b360d5..48f1a9c6374 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -79,7 +79,7 @@ Server_i::add_IOR_to_table (CORBA::String_var ior)
             "IORTable",
             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       IORTable::Table_var adapter =
         IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/InterOp-Naming/run_test.pl b/TAO/tests/InterOp-Naming/run_test.pl
index c40891efdef..f364abf05be 100755
--- a/TAO/tests/InterOp-Naming/run_test.pl
+++ b/TAO/tests/InterOp-Naming/run_test.pl
@@ -5,67 +5,74 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$file = PerlACE::LocalFile ("test.ior");
-$port = PerlACE::uniqueid () + 10001;  # This can't be 10000 for Chorus 4.0
+$cwd  = getcwd();
+$file = "$cwd$DIR_SEPARATOR" . "test.ior";
+$port = ACE::uniqueid () + 10001;  # This can't be 10000 for Chorus 4.0
 
-$status = 0;
+ACE::checkForTarget($cwd);
 
 print STDERR "\n\n==== InitRef test\n";
 
 unlink $file;
-$SV = new PerlACE::Process ("INS_test_server",
-                       "-ORBEndpoint iiop://1.0@"."$TARGETHOSTNAME:$port "
-                       . " -i object_name -o $file -ORBDottedDecimalAddresses 1");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill (); 
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."INS_test_server".$EXE_EXT,
+                       "-ORBEndpoint iiop://$TARGETHOSTNAME:$port "
+                       . " -i object_name -o $file");
+
+if (ACE::waitforfile_timed ($file, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
                        " random_service "
                        ."-ORBInitRef random_service="
-                       ."corbaloc::1.1@"."$TARGETHOSTNAME:$port/object_name");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+                       ."corbaloc:iiop:$TARGETHOSTNAME:$port/object_name");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
 print STDERR "\n\n==== InvalidName test\n";
 
-$CL = new PerlACE::Process ("INS_test_client",
-                     " not_a_service "
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
+                       " not_a_service "
                        ."-ORBInitRef random_service="
-                       ."corbaloc:iiop:1.0@"."$TARGETHOSTNAME:$port/object_name");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+                       ."corbaloc:iiop:$TARGETHOSTNAME:$port/object_name");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
 print STDERR "\n\n==== DefaultInitRef test\n";
 
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
                        " object_name "
                        . "-ORBDefaultInitRef"
-                       ." corbaloc:iiop:1.0@"."$TARGETHOSTNAME:$port/");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+                       ." corbaloc:iiop:$TARGETHOSTNAME:$port/");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
 print STDERR "\n\n==== Multi endpoint test\n";
@@ -73,83 +80,92 @@ print STDERR "\n\n==== Multi endpoint test\n";
 $port1 = $port + 1;
 $port2 = $port + 2;
 
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
                        " random_service "
                        . "-ORBInitRef random_service="
                        ."corbaloc:"
-                       ."iiop:1.0@"."$TARGETHOSTNAME:$port1,"
-                       .":1.0@"."$TARGETHOSTNAME:$port2,"
-                       ."iiop:1.0@"."$TARGETHOSTNAME:$port"
+                       ."iiop:$TARGETHOSTNAME:$port1,"
+                       ."iiop:$TARGETHOSTNAME:$port2,"
+                       ."iiop:$TARGETHOSTNAME:$port"
                        ."/object_name");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
-print STDERR "\n\n==== Multi endpoint test with CORBA::ORB::list_initial_services ()\n";
+print STDERR "\n\n==== Multi endpoint test with "
+  . "CORBA::ORB::list_initial_services ()\n";
 
 $port1 = $port + 1;
 $port2 = $port + 2;
 
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
                        " random_service "
                        . " -l "
                        . "-ORBInitRef random_service="
                        . "corbaloc:"
-                       . "iiop:1.0@"."$TARGETHOSTNAME:$port1,"
-                       . "iiop:1.0@"."$TARGETHOSTNAME:$port2,"
-                       . "iiop:1.0@"."$TARGETHOSTNAME:$port"
+                       . "iiop:$TARGETHOSTNAME:$port1,"
+                       . "iiop:$TARGETHOSTNAME:$port2,"
+                       . "iiop:$TARGETHOSTNAME:$port"
                        . "/object_name");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
 print STDERR "\n\n==== Multi endpoint default ref test\n";
 
-$CL = new PerlACE::Process ("INS_test_client",
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
                        " object_name "
                        . "-ORBDefaultInitRef "
                        ."corbaloc:"
-                       ."iiop:1.0@"."$TARGETHOSTNAME:$port1,"
-                       ."iiop:1.0@"."$TARGETHOSTNAME:$port2,"
-                       ."iiop:1.0@"."$TARGETHOSTNAME:$port/");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+                       ."iiop:$TARGETHOSTNAME:$port1,"
+                       ."iiop:$TARGETHOSTNAME:$port2,"
+                       ."iiop:$TARGETHOSTNAME:$port/");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
 print STDERR "\n\n==== Default ref with final '/'\n";
 
-$CL = new PerlACE::Process ("INS_test_client",
-                         " object_name "
+$CL = Process::Create ($EXEPREFIX."INS_test_client".$EXE_EXT,
+                       " object_name "
                        . "-ORBDefaultInitRef "
                        ."corbaloc:"
-                       ."iiop:1.0@"."$TARGETHOSTNAME:$port/");
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+                       ."iiop:$TARGETHOSTNAME:$port/");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
-$server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$SV->Terminate (); $server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  unlink $file;
+  exit 1;
 }
 
 unlink $file;
-
-exit $status;
+exit 0;
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index dc53a97fae9..d712fbff103 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -205,7 +205,9 @@ public:
           ACE_Time_Value timeout (0,
                                   event_loop_timeout_for_this_thread * 1000);
 
-          this->orb_->run (timeout, ACE_TRY_ENV);
+          if (this->orb_->run (timeout,
+                               ACE_TRY_ENV) == -1)
+            ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Client: Event loop finished for thread %t @ %T\n"));
diff --git a/TAO/tests/Leader_Followers/run_test.pl b/TAO/tests/Leader_Followers/run_test.pl
index 8f62289f149..193f4f2a836 100755
--- a/TAO/tests/Leader_Followers/run_test.pl
+++ b/TAO/tests/Leader_Followers/run_test.pl
@@ -5,161 +5,139 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("lb.ior");
-$mt_conffile = PerlACE::LocalFile ("multi_threaded_event_loop.conf");
-$st_conffile = PerlACE::LocalFile ("single_threaded_event_loop.conf");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "ior";
 
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
+ACE::checkForTarget($cwd);
 
-sub run_client ($)
+sub run_client
 {
-    my $args = shift;
+  my $args = shift;
 
-    $CL->Arguments ("-k file://$iorfile " . $args);
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                         "-k file://$iorfile " . $args);
 
-    my $client = $CL->SpawnWaitKill (200);
-    
-    if ($client != 0) {
-        $time = localtime;
-        print STDERR "ERROR: client returned $client at $time\n";
-        $status = 1;
-    }
+  $client = $CL->TimedWait (200);
+  if ($client == -1) {
+      $time = localtime;
+      print STDERR "ERROR: client timedout at $time\n";
+      $CL->Kill (); $CL->TimedWait (1);
+  }
 }
 
-sub run_clients ()
+sub run_clients
 {
-    print STDERR "\n\n*** No event loop threads ***\n\n\n";
+  print STDERR "\n\n*** No event loop threads ***\n\n\n";
 
-    print STDERR "\nSelect Reactor\n\n";
+  print STDERR "\nSelect Reactor\n\n";
 
-    run_client ("-ORBsvcconf $st_conffile -e 0");
+  run_client ("-ORBsvcconf single_threaded_event_loop.conf -e 0");
 
-    print STDERR "\nTP Reactor\n\n";
+  print STDERR "\nTP Reactor\n\n";
 
-    run_client ("-ORBsvcconf $mt_conffile -e 0");
+  run_client ("-ORBsvcconf multi_threaded_event_loop.conf -e 0");
 
-    print STDERR "\n\n*** Single-threaded client event loop: Select Reactor ***\n\n\n";
+  print STDERR "\n\n*** Single-threaded client event loop: Select Reactor ***\n\n\n";
 
-    print STDERR "\nSingle-threaded client running event loop for 3 seconds\n\n";
+  print STDERR "\nSingle-threaded client running event loop for 3 seconds\n\n";
 
-    run_client ("-ORBsvcconf $st_conffile -e 1 -t 3000");
+  run_client ("-ORBsvcconf single_threaded_event_loop.conf -e 1 -t 3000");
 
-    print STDERR "\nSingle-threaded client running event loop for 10 seconds\n\n";
+  print STDERR "\nSingle-threaded client running event loop for 10 seconds\n\n";
 
-    run_client ("-ORBsvcconf $st_conffile -e 1 -t 10000");
+  run_client ("-ORBsvcconf single_threaded_event_loop.conf -e 1 -t 10000");
 
-    print STDERR "\nSingle-threaded client running event loop for 20 seconds\n\n";
+  print STDERR "\nSingle-threaded client running event loop for 20 seconds\n\n";
 
-    run_client ("-ORBsvcconf $st_conffile -e 1 -t 20000");
+  run_client ("-ORBsvcconf single_threaded_event_loop.conf -e 1 -t 20000");
 
-    print STDERR "\n\n*** Single-threaded client event loop: TP Reactor ***\n\n\n";
+  print STDERR "\n\n*** Single-threaded client event loop: TP Reactor ***\n\n\n";
 
-    print STDERR "\nSingle-threaded client running event loop for 3 seconds\n\n";
+  print STDERR "\nSingle-threaded client running event loop for 3 seconds\n\n";
 
-    run_client ("-ORBsvcconf $mt_conffile -e 1 -t 3000");
+  run_client ("-ORBsvcconf multi_threaded_event_loop.conf -e 1 -t 3000");
 
-    print STDERR "\nSingle-threaded client running event loop for 10 seconds\n\n";
+  print STDERR "\nSingle-threaded client running event loop for 10 seconds\n\n";
 
-    run_client ("-ORBsvcconf $mt_conffile -e 1 -t 10000");
+  run_client ("-ORBsvcconf multi_threaded_event_loop.conf -e 1 -t 10000");
 
-    print STDERR "\nSingle-threaded client running event loop for 20 seconds\n\n";
+  print STDERR "\nSingle-threaded client running event loop for 20 seconds\n\n";
 
-    run_client ("-ORBsvcconf $mt_conffile -e 1 -t 20000");
+  run_client ("-ORBsvcconf multi_threaded_event_loop.conf -e 1 -t 20000");
 
-    print STDERR "\n\n*** Multi-threaded client event loop: TP Reactor ***\n\n\n";
+  print STDERR "\n\n*** Multi-threaded client event loop: TP Reactor ***\n\n\n";
 
-    print STDERR "\nMulti-threaded client running event loop for 3 seconds\n\n";
+  print STDERR "\nMulti-threaded client running event loop for 3 seconds\n\n";
 
-    run_client ("-ORBsvcconf $mt_conffile -e 5 -t 3000");
+  run_client ("-ORBsvcconf multi_threaded_event_loop.conf -e 5 -t 3000");
 
-    print STDERR "\nMulti-threaded client running event loop for 10 seconds\n\n";
+  print STDERR "\nMulti-threaded client running event loop for 10 seconds\n\n";
 
-    run_client ("-ORBsvcconf $mt_conffile -e 5 -t 10000");
+  run_client ("-ORBsvcconf multi_threaded_event_loop.conf -e 5 -t 10000");
 
-    print STDERR "\nMulti-threaded client running event loop for 20 seconds\n\n";
+  print STDERR "\nMulti-threaded client running event loop for 20 seconds\n\n";
 
-    run_client ("-ORBsvcconf $mt_conffile -e 5 -t 20000 -x");
+  run_client ("-ORBsvcconf multi_threaded_event_loop.conf -e 5 -t 20000 -x");
 }
 
-$single = 1;
-$multi = 0;
-
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
-      print "run_test [-m] -[a]\n";
-      print "\n";
-      print "-m  -- tests the multithreaded server (default is single)\n";
-      print "-a  -- tests both multi and single threaded servers\n";
-      exit 0;
-    }
-    elsif ($ARGV[$i] eq "-m") {
-      $multi = 1;
-      $single = 0;
-    }
-    elsif ($ARGV[$i] eq "-a") {
-      $multi = 1;
-      $single = 1;
-    }
-}
-
-if ($single == 1) {
-    unlink $iorfile;
+unlink $iorfile;
 
-    print STDERR "\n\n*** Single threaded server ***\n\n\n";
+print STDERR "\n\n*** Single threaded server ***\n\n\n";
 
-    $SV->Arguments ("-o $iorfile");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile");
 
-    $SV->Spawn ();
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-    if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-        print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill (); 
-        exit 1;
-    }
+run_clients ();
 
-    run_clients ();
+$server = $SV->TimedWait (100);
+if ($server == -1) {
+  $time = localtime;
+  print STDERR "ERROR: server timedout at $time\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-    $server = $SV->WaitKill (100);
-    if ($server != 0) {
-        $time = localtime;
-        print STDERR "ERROR: server returned $server at $time\n";
-        $status = 1;
-    }
+unlink $iorfile;
 
-    unlink $iorfile;
+if ($server != 0 || $client != 0) {
+  print STDERR "ERROR: server exit value = $server and client exit value = $client\n";
+  exit 1;
 }
 
-if ($multi == 1) {
-    unlink $iorfile;
-    
-    print STDERR "\n\n*** Thread-Pool server ***\n\n\n";
+print STDERR "\n\n*** Thread-Pool server ***\n\n\n";
 
-    $SV->Arguments ("-o $iorfile -e 5 -ORBSvcConf $mt_conffile");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
+                       " -o $iorfile -e 5" .
+                       " -ORBSvcConf $cwd$DIR_SEPARATOR" .
+                       "multi_threaded_event_loop.conf");
 
-    $SV->Spawn ();
-
-    if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-        print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill (); 
-        exit 1;
-    }
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
+}
 
-    run_clients ();
+run_clients ();
 
-    $server = $SV->WaitKill (10);
+$server = $SV->TimedWait (100);
+if ($server == -1) {
+  $time = localtime;
+  print STDERR "ERROR: server timedout at $time\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-    if ($server != 0) {
-        $time = localtime;
-        print STDERR "ERROR: server returned $server at $time\n";
-        $SV->Kill (); 
-    }
+unlink $iorfile;
 
-    unlink $iorfile;
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 15c7f9ee652..0bd163e7081 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -58,7 +58,8 @@ public:
 
       ACE_TRY
         {
-          this->orb_->run (ACE_TRY_ENV);
+          if (this->orb_->run (ACE_TRY_ENV) == -1)
+            ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index b3a92ab9689..9d7ed3b8390 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -90,8 +90,7 @@ Worker::svc (void)
       for (;;)
         {
           ACE_Time_Value tv (0, 1000 * this->milliseconds_);
-          this->orb_->run (tv, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->orb_->run (tv);
 
           ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1);
           if (pending_requests == 0)
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index f2517bedf7f..f532c652979 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -1,4 +1,6 @@
+//
 // $Id$
+//
 
 #ifndef LONGUPCALLS_AMI_MANAGER_H
 #define LONGUPCALLS_AMI_MANAGER_H
@@ -14,8 +16,8 @@
 #endif /* _MSC_VER */
 
 class AMI_Manager
-  : public virtual POA_Test::Manager,
-    public virtual PortableServer::RefCountServantBase
+  :  public virtual POA_Test::Manager
+  ,  public virtual PortableServer::RefCountServantBase
 {
 public:
   AMI_Manager (CORBA::ORB_ptr orb);
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index aaefd878e41..f2378a291b4 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -1,4 +1,6 @@
+//
 // $Id$
+//
 
 #ifndef LONGUPCALLS_CONTROLLER_H
 #define LONGUPCALLS_CONTROLLER_H
@@ -13,8 +15,8 @@
 #endif /* _MSC_VER */
 
 class Controller
-  : public virtual POA_Test::Controller,
-    public virtual PortableServer::RefCountServantBase
+  :  public virtual POA_Test::Controller
+  , public virtual PortableServer::RefCountServantBase
 {
 public:
   Controller (void);
diff --git a/TAO/tests/LongUpcalls/Test.idl b/TAO/tests/LongUpcalls/Test.idl
index 047bd3bde5f..e5723301a09 100644
--- a/TAO/tests/LongUpcalls/Test.idl
+++ b/TAO/tests/LongUpcalls/Test.idl
@@ -1,4 +1,6 @@
+//
 // $Id$
+//
 
 module Test
 {
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index 4cb612e5fb8..7e9b3c9e7dc 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -43,9 +43,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        orb->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
@@ -98,8 +96,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       ACE_Time_Value tv (30, 0);
-      orb->run (tv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run (tv);
 
       controller_impl.dump_results ();
 
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index 1f52149de14..75f4a46e045 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -42,9 +42,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -84,8 +82,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index 870496069e3..729e6eefea7 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -42,9 +42,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        orb->resolve_initial_references("RootPOA");
       if (CORBA::is_nil (object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index 05af445eb9f..f2bd16c1d44 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -42,9 +42,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -84,8 +82,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
diff --git a/TAO/tests/LongUpcalls/run_test.pl b/TAO/tests/LongUpcalls/run_test.pl
index 25bf98607cf..d9b46b3bd7d 100755
--- a/TAO/tests/LongUpcalls/run_test.pl
+++ b/TAO/tests/LongUpcalls/run_test.pl
@@ -5,67 +5,78 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
-$svcfile = PerlACE::LocalFile ("svc.conf");
+ACE::checkForTarget($cwd);
 
-$BSV = new PerlACE::Process ("blocking_server", "-ORBSvcConf $svcfile -o $iorfile");
-$ASV = new PerlACE::Process ("ami_server", "-ORBSvcConf $svcfile -o $iorfile");
-$BCL = new PerlACE::Process ("blocking_client", "-ORBSvcConf $svcfile -k file://$iorfile");
+$iorfile = "$cwd$DIR_SEPARATOR" ."test.ior";
+$svcfile = $cwd . $DIR_SEPARATOR . "svc.conf";
 
 print STDERR "==== Server upcall waits for operations on other threads\n";
 
 unlink $iorfile;
-
-$BSV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 30) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $BSV->Kill ();
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."blocking_server$EXE_EXT",
+                       " -ORBSvcConf " . $svcfile
+                       . " -o $iorfile");
+
+if (ACE::waitforfile_timed ($iorfile, 30) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $BCL->SpawnWaitKill (240);
+$CL = Process::Create ($EXEPREFIX."blocking_client$EXE_EXT",
+                       " -ORBSvcConf " . $svcfile
+                       . " -k file://$iorfile ");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (240);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$server = $BSV->WaitKill (30);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (30);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
 print STDERR "==== Server upcall waits for AMI operations on other threads\n";
 
 unlink $iorfile;
-$ASV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 30) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $ASV->Kill ();
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."ami_server$EXE_EXT",
+                       " -ORBSvcConf " . $svcfile
+                       . " -o $iorfile");
+
+if (ACE::waitforfile_timed ($iorfile, 30) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $BCL->SpawnWaitKill (240);
+$CL = Process::Create ($EXEPREFIX."blocking_client$EXE_EXT",
+                       " -ORBSvcConf " . $svcfile
+                       . " -k file://$iorfile ");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (240);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$server = $ASV->WaitKill (30);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (30);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/tests/LongWrites/Coordinator.cpp b/TAO/tests/LongWrites/Coordinator.cpp
index 8520ae19963..d9e382e42d0 100644
--- a/TAO/tests/LongWrites/Coordinator.cpp
+++ b/TAO/tests/LongWrites/Coordinator.cpp
@@ -5,8 +5,11 @@
 
 ACE_RCSID(LongWrites, Coordinator, "$Id$")
 
-Coordinator::Coordinator (void)
-  : shutdown_called_ (0)
+Coordinator::Coordinator (CORBA::ULong initial_payload_size,
+                          CORBA::Long test_iterations)
+  : initial_payload_size_ (initial_payload_size)
+  , test_iterations_ (test_iterations)
+  , shutdown_called_ (0)
   , pairs_count_ (0)
   , pairs_length_ (16)
 {
@@ -59,12 +62,13 @@ Coordinator::start (CORBA::Environment &ACE_TRY_ENV)
         }
     }
 
-  CORBA::ULong event_size = 256 * 1024;
+  CORBA::ULong event_size = this->initial_payload_size_;
   ACE_DEBUG ((LM_DEBUG, "Running with payload = %d\n",
               event_size));
   for (size_t j = 0; j != this->pairs_count_; ++j)
     {
-      this->pairs_[j].sender->send_events (100, event_size,
+      this->pairs_[j].sender->send_events (this->test_iterations_,
+                                           event_size,
                                            ACE_TRY_ENV);
       ACE_CHECK;
     }
diff --git a/TAO/tests/LongWrites/Coordinator.h b/TAO/tests/LongWrites/Coordinator.h
index db00336489a..9fe37a8e699 100644
--- a/TAO/tests/LongWrites/Coordinator.h
+++ b/TAO/tests/LongWrites/Coordinator.h
@@ -22,7 +22,8 @@ class Coordinator
 {
 public:
   /// Constructor
-  Coordinator (void);
+  Coordinator (CORBA::ULong initial_payload_size,
+               CORBA::Long test_iterations);
 
   /// Destructor
   virtual ~Coordinator (void);
@@ -46,13 +47,27 @@ public:
   };
 
 private:
+  /// Initial payload size
+  CORBA::ULong initial_payload_size_;
+
+  /// Number of iterations performed by each server.
+  CORBA::Long test_iterations_;
+
+  /// Synchronize internal data structure
   ACE_SYNCH_MUTEX mutex_;
 
+  /// Set to 1 once the test has shutdown
   int shutdown_called_;
 
+  /** @name List of pairs
+   *
+   * Implement a simple list of pairs
+   */
+  //@{
   size_t pairs_count_;
   size_t pairs_length_;
   Pair* pairs_;
+  //@}
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/examples/Notify/Notify_Examples.dsw b/TAO/tests/LongWrites/LongWrites.dsw
index 37d9df62466..458572a4ad5 100644
--- a/TAO/orbsvcs/examples/Notify/Notify_Examples.dsw
+++ b/TAO/tests/LongWrites/LongWrites.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "Filter"=.\Filter\Filter.dsp - Package Owner=<4>

+Project: "LongWrites client"=.\client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Subscribe"=.\Subscribe\Subscribe.dsp - Package Owner=<4>

+Project: "LongWrites server"=.\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tests/LongWrites/Makefile b/TAO/tests/LongWrites/Makefile
index a2b9cfda745..17effc1e90e 100644
--- a/TAO/tests/LongWrites/Makefile
+++ b/TAO/tests/LongWrites/Makefile
@@ -18,9 +18,9 @@ IDL_FILES = Test
 IDL_SRC = TestC.cpp TestS.cpp
 BIN = server client
 
-SRC = $(addsuffix .cpp, $(BIN) Receiver Sender Coordinator) $(IDL_SRC)
+SRC = $(addsuffix .cpp, $(BIN) Receiver Sender Sender_Task Coordinator) $(IDL_SRC)
 
-CLIENT_OBJS = client.o TestC.o TestS.o Receiver.o Sender.o
+CLIENT_OBJS = client.o TestC.o TestS.o Receiver.o Sender.o Sender_Task.o
 SERVER_OBJS = server.o TestC.o TestS.o Coordinator.o
 
 TAO_IDLFLAGS += -Ge 1
@@ -1385,6 +1385,401 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
+ TestS_T.h TestS_T.i TestS_T.cpp TestS.i Sender_Task.h \
+ $(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/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp
+
+.obj/Sender_Task.o .obj/Sender_Task.so .shobj/Sender_Task.o .shobj/Sender_Task.so: Sender_Task.cpp Sender_Task.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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/Service_Config.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(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.cpp \
+ Sender.h TestS.h TestC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/CORBA_String.h \
+ $(TAO_ROOT)/tao/CORBA_String.inl \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/OctetSeqC.h \
+ $(TAO_ROOT)/tao/OctetSeqC.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAO_Server_Request.h \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.i \
+ $(TAO_ROOT)/tao/Service_Context.h \
+ $(TAO_ROOT)/tao/Service_Context.inl \
+ $(TAO_ROOT)/tao/TAO_Server_Request.i \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/Adapter.h \
+ $(TAO_ROOT)/tao/Adapter.i \
+ $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/Parser_Registry.h \
+ $(TAO_ROOT)/tao/Parser_Registry.i \
+ $(TAO_ROOT)/tao/Service_Callbacks.h \
+ $(TAO_ROOT)/tao/Service_Callbacks.i \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
+ $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
+ $(TAO_ROOT)/tao/Cache_Entries.h \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Endpoint.h \
+ $(TAO_ROOT)/tao/Endpoint.i \
+ $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Cache_Entries.inl \
+ $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
+ $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
+ $(TAO_ROOT)/tao/Object_Ref_Table.h \
+ $(TAO_ROOT)/tao/Interceptor_List.h \
+ $(TAO_ROOT)/tao/Interceptor_List.inl \
+ $(TAO_ROOT)/tao/RT_Policy_i.h \
+ $(TAO_ROOT)/tao/RTCORBAS.h \
+ $(TAO_ROOT)/tao/IOPS.h \
+ $(TAO_ROOT)/tao/IOPS_T.h \
+ $(TAO_ROOT)/tao/IOPS_T.i \
+ $(TAO_ROOT)/tao/IOPS_T.cpp \
+ $(TAO_ROOT)/tao/IOPS.i \
+ $(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/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.h \
+ $(TAO_ROOT)/tao/RTCORBAS_T.i \
+ $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
+ $(TAO_ROOT)/tao/RTCORBAS.i \
+ $(TAO_ROOT)/tao/RT_Policy_i.i \
+ $(TAO_ROOT)/tao/Protocols_Hooks.h \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/Priority_Mapping.i \
+ $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/operation_details.h \
+ $(TAO_ROOT)/tao/target_specification.h \
+ $(TAO_ROOT)/tao/target_specification.i \
+ $(TAO_ROOT)/tao/operation_details.i \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
+ $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ObjectIDList.h \
+ $(TAO_ROOT)/tao/ObjectIDList.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/ClientRequestInfo.h \
+ $(TAO_ROOT)/tao/StringSeqC.h \
+ $(TAO_ROOT)/tao/StringSeqC.i \
+ $(TAO_ROOT)/tao/ClientRequestInfo.inl \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/BoundsC.h \
+ $(TAO_ROOT)/tao/BoundsC.i \
+ $(TAO_ROOT)/tao/PortableInterceptor.h \
+ $(TAO_ROOT)/tao/PortableInterceptor.i \
+ $(TAO_ROOT)/tao/BiDirPolicyC.h \
+ $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ TestC.i \
+ $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
+ $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
+ $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
+ $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
  TestS_T.h TestS_T.i TestS_T.cpp TestS.i
 
 .obj/Coordinator.o .obj/Coordinator.so .shobj/Coordinator.o .shobj/Coordinator.so: Coordinator.cpp Coordinator.h \
diff --git a/TAO/tests/LongWrites/Receiver.cpp b/TAO/tests/LongWrites/Receiver.cpp
index 6425de4a18a..a69e71aa6f9 100644
--- a/TAO/tests/LongWrites/Receiver.cpp
+++ b/TAO/tests/LongWrites/Receiver.cpp
@@ -11,6 +11,13 @@ Receiver::Receiver (void)
 {
 }
 
+CORBA::ULong
+Receiver::message_count (void)
+{
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+  return this->message_count_;
+}
+
 void
 Receiver::dump_results ()
 {
@@ -31,5 +38,22 @@ Receiver::receive_data (const Test::Payload &payload,
   this->message_count_++;
   this->byte_count_ += payload.length ();
 
-  ACE_DEBUG ((LM_DEBUG, "Receiver::receive_data\n"));
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) Receiver::receive_data %d\n",
+              this->message_count_));
+}
+
+void
+Receiver::receive_data_oneway (const Test::Payload &payload,
+                               CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->receive_data (payload, ACE_TRY_ENV);
+}
+
+Test::Payload *
+Receiver::return_data (const Test::Payload &payload,
+                       CORBA::Environment &)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return new Test::Payload (payload);
 }
diff --git a/TAO/tests/LongWrites/Receiver.h b/TAO/tests/LongWrites/Receiver.h
index 5242259d81f..8a0b50d1d05 100644
--- a/TAO/tests/LongWrites/Receiver.h
+++ b/TAO/tests/LongWrites/Receiver.h
@@ -27,6 +27,9 @@ public:
   /// Constructor
   Receiver (void);
 
+  /// Return the number of messages received so far
+  CORBA::ULong message_count (void);
+
   /// Print out the results
   void dump_results (void);
 
@@ -34,6 +37,12 @@ public:
   virtual void receive_data (const Test::Payload &payload,
                              CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual void receive_data_oneway (const Test::Payload &payload,
+                                    CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  virtual Test::Payload *return_data (const Test::Payload &payload,
+                                      CORBA::Environment &ACE_TRY_ENV)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   ACE_SYNCH_MUTEX mutex_;
diff --git a/TAO/tests/LongWrites/Sender.cpp b/TAO/tests/LongWrites/Sender.cpp
index 3d7926feb3b..2c1aa50c1ba 100644
--- a/TAO/tests/LongWrites/Sender.cpp
+++ b/TAO/tests/LongWrites/Sender.cpp
@@ -2,13 +2,16 @@
 // $Id$
 //
 #include "Sender.h"
+#include "Sender_Task.h"
 
 ACE_RCSID(LongWrites, Sender, "$Id$")
 
-Sender::Sender (void)
-  : receiver_count_ (0)
+Sender::Sender (int test_type)
+  : test_type_ (test_type)
+  , receiver_count_ (0)
   , receiver_length_ (16)
   , shutdown_called_ (0)
+  , event_count_ (0)
 {
   ACE_NEW (this->receivers_, Test::Receiver_var[this->receiver_length_]);
 }
@@ -18,6 +21,17 @@ Sender::~Sender (void)
   delete[] this->receivers_;
 }
 
+int
+Sender::test_done (CORBA::ULong message_count)
+{
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0);
+  return
+    (this->event_count_ != 0
+     && this->receiver_count_ != 0
+     && this->shutdown_called_ != 0
+     && (4 * this->receiver_count_
+           * this->event_count_ <= message_count));
+}
 
 int
 Sender::shutdown_called (void)
@@ -28,9 +42,10 @@ Sender::shutdown_called (void)
 
 void
 Sender::add_receiver (Test::Receiver_ptr receiver,
-                           CORBA::Environment &)
+                      CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->receiver_count_ == this->receiver_length_)
     {
       this->receiver_length_ *= 2;
@@ -47,10 +62,48 @@ Sender::add_receiver (Test::Receiver_ptr receiver,
 
 void
 Sender::send_events (CORBA::Long event_count,
-                            CORBA::ULong event_size,
-                            CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::ULong event_size,
+                     CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  {
+    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+    this->event_count_ = event_count;
+  }
+  ACE_Thread_Manager thr_mgr;
+  Sender_Task task (this,
+                    event_count,
+                    event_size,
+                    &thr_mgr);
+
+  if (task.activate (THR_NEW_LWP | THR_JOINABLE,
+                     4, 1) == -1)
+    return;
+
+  ACE_TRY
+    {
+      int argc = 0;
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "", ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      ACE_Time_Value tv (60, 0);
+      orb->run (tv, ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+
+  thr_mgr.wait ();
+}
+
+int
+Sender::run_test (CORBA::Long event_count,
+                  CORBA::ULong event_size)
+{
+  ACE_DECLARE_NEW_CORBA_ENV;
+
   Test::Payload payload(event_size); payload.length(event_size);
   for (CORBA::Long i = 0; i != event_count; ++i)
     {
@@ -59,23 +112,41 @@ Sender::send_events (CORBA::Long event_count,
         {
           ACE_TRY
             {
-              this->receivers_[j]->receive_data (payload,
-                                                 ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              if (this->test_type_ == Sender::TEST_ONEWAY)
+                {
+                  this->receivers_[j]->receive_data_oneway (payload,
+                                                            ACE_TRY_ENV);
+                  ACE_TRY_CHECK;
+                }
+              else if (this->test_type_ == Sender::TEST_WRITE)
+                {
+                  this->receivers_[j]->receive_data (payload,
+                                                     ACE_TRY_ENV);
+                  ACE_TRY_CHECK;
+                }
+              else
+                {
+                  Test::Payload_var retval =
+                    this->receivers_[j]->return_data (payload,
+                                                      ACE_TRY_ENV);
+                  ACE_TRY_CHECK;
+                }
             }
           ACE_CATCHANY
             {
+              return -1;
             }
           ACE_ENDTRY;
         }
     }
+  return 0;
 }
 
 void
 Sender::shutdown (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down\n"));
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) shutting down\n"));
   this->shutdown_called_ = 1;
 }
diff --git a/TAO/tests/LongWrites/Sender.h b/TAO/tests/LongWrites/Sender.h
index 0bcbea6d50e..65fc76516d4 100644
--- a/TAO/tests/LongWrites/Sender.h
+++ b/TAO/tests/LongWrites/Sender.h
@@ -22,14 +22,36 @@ class Sender
 {
 public:
   /// Constructor
-  Sender (void);
+  Sender (int test_type);
 
   /// Destructor
   virtual ~Sender (void);
 
+  /// Control the type of test
+  enum {
+    /// Run the test using receive_data_oneway() operations
+    TEST_ONEWAY,
+    /// Run the test using receive_data() operations
+    TEST_WRITE,
+    /// Run the test using return_data() operations
+    TEST_READ_WRITE,
+  };
+
+  /// Run the test in a separate thread
+  int run_test (CORBA::Long event_count,
+                CORBA::ULong event_size);
+
+  /// Return 1 after <shutdown> is invoked and all the messages are
+  /// received.
+  int test_done (CORBA::ULong message_count);
+
   /// Return 1 after <shutdown> is invoked
   int shutdown_called (void);
 
+  /// Return 1 if the test is finished, assuming <message_count>
+  /// messages have been received by the local Receiver
+  int iteration_done (CORBA::ULong messsage_count);
+
   // = The skeleton methods
   virtual void add_receiver (Test::Receiver_ptr receiver,
                              CORBA::Environment &ACE_TRY_ENV)
@@ -42,13 +64,22 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
+  /// The type of test
+  int test_type_;
+
+  /// Synchronize the internal state
   ACE_SYNCH_MUTEX mutex_;
 
+  /// Keep track of all the receivers
   size_t receiver_count_;
   size_t receiver_length_;
   Test::Receiver_var *receivers_;
 
+  /// Set to 1 if the shutdown() operations was called.
   int shutdown_called_;
+
+  /// Setup event count
+  CORBA::ULong event_count_;
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tests/LongWrites/Sender_Task.cpp b/TAO/tests/LongWrites/Sender_Task.cpp
new file mode 100644
index 00000000000..c2418441589
--- /dev/null
+++ b/TAO/tests/LongWrites/Sender_Task.cpp
@@ -0,0 +1,26 @@
+//
+// $Id$
+//
+
+#include "Sender_Task.h"
+#include "Sender.h"
+
+ACE_RCSID(LongWrites, Sender_Task, "$Id$")
+
+Sender_Task::Sender_Task (Sender *sender,
+                          CORBA::Long event_count,
+                          CORBA::ULong event_size,
+                          ACE_Thread_Manager *thr_mgr)
+  : ACE_Task_Base (thr_mgr)
+  , sender_ (sender)
+  , event_count_ (event_count)
+  , event_size_ (event_size)
+{
+}
+
+int
+Sender_Task::svc (void)
+{
+  return this->sender_->run_test (this->event_count_,
+                                  this->event_size_);
+}
diff --git a/TAO/tests/LongWrites/Sender_Task.h b/TAO/tests/LongWrites/Sender_Task.h
new file mode 100644
index 00000000000..446aff3468f
--- /dev/null
+++ b/TAO/tests/LongWrites/Sender_Task.h
@@ -0,0 +1,43 @@
+//
+// $Id$
+//
+
+#ifndef LONGWRITES_SENDER_TASK_H
+#define LONGWRITES_SENDER_TASK_H
+#include "ace/pre.h"
+
+#include "tao/corbafwd.h"
+#include "ace/Task.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class Sender;
+
+/// Implement a Task to run the experiments using multiple threads.
+class Sender_Task : public ACE_Task_Base
+{
+public:
+  /// Constructor
+  Sender_Task (Sender *sender,
+               CORBA::Long event_count,
+               CORBA::ULong event_size,
+               ACE_Thread_Manager *thr_mgr);
+
+  /// Thread entry point
+  int svc (void);
+
+private:
+  /// Reference to the test interface
+  Sender *sender_;
+
+  /// Total number of events
+  CORBA::Long event_count_;
+
+  /// Size of each message
+  CORBA::ULong event_size_;
+};
+
+#include "ace/post.h"
+#endif /* LONGWRITES_SENDER_TASK_H */
diff --git a/TAO/tests/LongWrites/Test.idl b/TAO/tests/LongWrites/Test.idl
index 43d2eb7c3a3..de5dcee47ae 100644
--- a/TAO/tests/LongWrites/Test.idl
+++ b/TAO/tests/LongWrites/Test.idl
@@ -8,7 +8,13 @@ module Test
 
   interface Receiver {
     /// Receive a big payload
-    oneway void receive_data (in Payload the_payload);
+    oneway void receive_data_oneway (in Payload the_payload);
+
+    /// Receive a big payload, using a twoway
+    void receive_data (in Payload the_payload);
+
+    /// Return the same data, useful to check the server side
+    Payload return_data (in Payload the_payload);
   };
 
   interface Sender {
@@ -20,7 +26,7 @@ module Test
                             in unsigned long event_size);
 
     /// Shutdown the sender
-    oneway void shutdown();
+    void shutdown();
   };
 
   interface Coordinator {
diff --git a/TAO/tests/LongWrites/client.cpp b/TAO/tests/LongWrites/client.cpp
index 099270ba0de..4b78a484707 100644
--- a/TAO/tests/LongWrites/client.cpp
+++ b/TAO/tests/LongWrites/client.cpp
@@ -8,10 +8,12 @@ ACE_RCSID(LongWrites, client, "$Id$")
 
 const char *ior = "file://test.ior";
 
+int test_type = Sender::TEST_ONEWAY;
+
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Opt get_opts (argc, argv, "k:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -20,11 +22,25 @@ parse_args (int argc, char *argv[])
       case 'k':
 	ior = get_opts.optarg;
 	break;
+      case 't':
+        if (ACE_OS_String::strcasecmp(get_opts.optarg, "ONEWAY") == 0)
+          test_type = Sender::TEST_ONEWAY;
+        else if (ACE_OS_String::strcasecmp(get_opts.optarg, "WRITE") == 0)
+          test_type = Sender::TEST_WRITE;
+        else if (ACE_OS_String::strcasecmp(get_opts.optarg, "READ_WRITE") == 0)
+          test_type = Sender::TEST_READ_WRITE;
+        else
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unknown test type %s\n",
+                             get_opts.optarg), 1);
+        break;
+
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
 			   "-k <ior>"
+			   "-t <test_type (ONEWAY,WRITE,READ_WRITE)>"
                            "\n",
                            argv [0]),
                           -1);
@@ -43,9 +59,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -88,7 +102,7 @@ main (int argc, char *argv[])
 
       Sender *sender_impl;
       ACE_NEW_RETURN (sender_impl,
-                      Sender,
+                      Sender (test_type),
                       1);
       PortableServer::ServantBase_var sender_owner_transfer(sender_impl);
 
@@ -103,12 +117,13 @@ main (int argc, char *argv[])
                              ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      while (!sender_impl->shutdown_called ())
+      while (!sender_impl->test_done (receiver_impl->message_count ()))
         {
           ACE_Time_Value tv(1, 0);
           orb->run (tv, ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - client event loop done\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -124,5 +139,6 @@ main (int argc, char *argv[])
     }
   ACE_ENDTRY;
 
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - client finished\n"));
   return 0;
 }
diff --git a/TAO/tests/LongWrites/client.dsp b/TAO/tests/LongWrites/client.dsp
new file mode 100644
index 00000000000..03003ce6cc8
--- /dev/null
+++ b/TAO/tests/LongWrites/client.dsp
@@ -0,0 +1,236 @@
+# Microsoft Developer Studio Project File - Name="LongWrites Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=LongWrites Client - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "client.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "client.mak" CFG="LongWrites Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "LongWrites Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "LongWrites Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "LongWrites Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 tao.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

+

+!ELSEIF  "$(CFG)" == "LongWrites Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 taod.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "LongWrites Client - Win32 Release"

+# Name "LongWrites Client - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=.\client.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Receiver.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sender.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sender_Task.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\TestC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\TestS.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=.\Receiver.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sender.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Sender_Task.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\TestS.h

+# End Source File

+# End Group

+# Begin Group "IDL Files"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\Test.idl

+

+!IF  "$(CFG)" == "LongWrites Client - Win32 Release"

+

+# PROP Ignore_Default_Tool 1

+USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Test.idl

+InputName=Test

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "LongWrites Client - Win32 Debug"

+

+USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\Test.idl

+InputName=Test

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# End Group

+# 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/LongWrites/run_test.pl b/TAO/tests/LongWrites/run_test.pl
index 71eafcca0b4..eae2e6aaf7f 100755
--- a/TAO/tests/LongWrites/run_test.pl
+++ b/TAO/tests/LongWrites/run_test.pl
@@ -7,56 +7,62 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../bin';
 use PerlACE::Run_Test;
+use Cwd;
+use Getopt::Std;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+my $iorfile = PerlACE::LocalFile ("test.ior");
 unlink $iorfile;
 
-$SV  = new PerlACE::Process ("server", "-o $iorfile");
-$CL1 = new PerlACE::Process ("client", " -k file://$iorfile ");
-$CL2 = new PerlACE::Process ("client", " -k file://$iorfile ");
-$CL3 = new PerlACE::Process ("client", " -k file://$iorfile ");
+local ($opt_i, $opt_p);
 
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
+if (!getopts ('i:p:')) {
+    print "Usage: run_test.pl [-p payload_size] [-i iterations]\n";
     exit 1;
-} 
-
-$CL1->Spawn (60);
-$CL2->Spawn (60);
-$CL3->Spawn (60);
-
-$client1 = $CL1->WaitKill (60);
-
-if ($client1 != 0) {
-    print STDERR "ERROR: client 1 returned $client1\n";
-    $status = 1;
 }
 
-$client2 = $CL2->WaitKill (60);
-
-if ($client2 != 0) {
-    print STDERR "ERROR: client 2 returned $client2\n";
-    $status = 1;
+my $server_args = "";
+if (defined $opt_i) {
+    $server_args .= " -i ".$opt_i;
+}
+if (defined $opt_p) {
+    $server_args .= " -p ".$opt_p;
 }
 
-$client3 = $CL3->WaitKill (60);
+foreach my $i ("ONEWAY", "WRITE", "READ_WRITE") {
 
-if ($client3 != 0) {
-    print STDERR "ERROR: client 3 returned $client3\n";
-    $status = 1;
-}
+  print "================ Running test $i ================\n";
 
-$server = $SV->TerminateWaitKill (5);
+  my $SV = new PerlACE::Process ("server", "-o $iorfile $server_args");
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+  $SV->Spawn ();
 
-unlink $iorfile;
+  if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+  }
+
+  $CL1 = new PerlACE::Process ("client", " -k file://$iorfile -t $i");
+  $CL2 = new PerlACE::Process ("client", " -k file://$iorfile -t $i");
+  $CL3 = new PerlACE::Process ("client", " -k file://$iorfile -t $i");
+
+  $CL1->Spawn ();
+  $CL2->Spawn ();
+  $CL3->Spawn ();
+
+  $client1 = $CL1->WaitKill (120);
+  $client2 = $CL2->WaitKill (120);
+  $client3 = $CL3->WaitKill (120);
+  $server = $SV->WaitKill (5);
+
+  unlink $iorfile;
+  
+  if ($server != 0
+      || $client1 != 0 || $client2 != 0 || $client3 != 0) {
+    print "ERROR: non-zero status returned by the server or clients\n";
+    print "ERROR: server = $server, client1 = $client1, client2 = $client2, client3 = $client3\n";
+    exit 1;
+  }
+}
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/LongWrites/server.cpp b/TAO/tests/LongWrites/server.cpp
index 7234c896192..6d099d91590 100644
--- a/TAO/tests/LongWrites/server.cpp
+++ b/TAO/tests/LongWrites/server.cpp
@@ -8,10 +8,13 @@ ACE_RCSID(LongWrites, server, "$Id$")
 
 const char *ior_output_file = "test.ior";
 
+CORBA::ULong initial_event_size = 64 * 1024;
+CORBA::Long test_iterations = 50;
+
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Opt get_opts (argc, argv, "o:p:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -20,11 +23,22 @@ parse_args (int argc, char *argv[])
       case 'o':
 	ior_output_file = get_opts.optarg;
 	break;
+
+      case 'p':
+        initial_event_size = ACE_OS::atoi (get_opts.optarg);
+        break;
+
+      case 'i':
+        test_iterations =  ACE_OS::atoi (get_opts.optarg);
+        break;
+
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
 			   "-o <iorfile>"
+			   "-p <payload_size>"
+			   "-i <test_iterations>"
                            "\n",
                            argv [0]),
                           -1);
@@ -43,9 +57,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -64,7 +76,8 @@ main (int argc, char *argv[])
 
       Coordinator *coordinator_impl;
       ACE_NEW_RETURN (coordinator_impl,
-                      Coordinator,
+                      Coordinator (initial_event_size,
+                                   test_iterations),
                       1);
       PortableServer::ServantBase_var coordinator_owner_transfer(coordinator_impl);
 
diff --git a/TAO/tests/Codec/client.dsp b/TAO/tests/LongWrites/server.dsp
index 13780b22983..ed8d1a51f25 100644
--- a/TAO/tests/Codec/client.dsp
+++ b/TAO/tests/LongWrites/server.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="Codec Client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="LongWrites Server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Codec Client - Win32 Debug

+CFG=LongWrites 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 "client.mak".

+!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 "client.mak" CFG="Codec Client - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="LongWrites Server - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Codec Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Codec Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "LongWrites Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "LongWrites Server - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=Codec Client - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Codec Client - Win32 Release"

+!IF  "$(CFG)" == "LongWrites Server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -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 "../../.." /I "../.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -51,9 +51,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 TAO.lib TAO_PortableServer.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

-!ELSEIF  "$(CFG)" == "Codec Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "LongWrites Server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../.." /I "../.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -76,48 +76,56 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 TAOd.lib TAO_PortableServerd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Codec Client - Win32 Release"

-# Name "Codec Client - Win32 Debug"

+# Name "LongWrites Server - Win32 Release"

+# Name "LongWrites Server - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

-SOURCE=.\client.cpp

+SOURCE=.\Coordinator.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\testC.cpp

+SOURCE=.\server.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\TestC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\TestS.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h"

+# PROP Default_Filter ".h"

 # Begin Source File

 

-SOURCE=.\testC.h

+SOURCE=.\Coordinator.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=.\test.idl

+SOURCE=.\Test.idl

 

-!IF  "$(CFG)" == "Codec Client - Win32 Release"

+!IF  "$(CFG)" == "LongWrites Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

 USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

+InputPath=.\Test.idl

+InputName=Test

 

 BuildCmds= \

 	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

@@ -150,12 +158,12 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Codec Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "LongWrites Server - Win32 Debug"

 

 USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

+InputPath=.\Test.idl

+InputName=Test

 

 BuildCmds= \

 	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

@@ -194,10 +202,14 @@ BuildCmds= \
 # End Group

 # Begin Group "Inline Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter ".i"

+# Begin Source File

+

+SOURCE=.\TestC.i

+# End Source File

 # Begin Source File

 

-SOURCE=.\testC.i

+SOURCE=.\TestS.i

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/tests/LongWrites/svc.conf b/TAO/tests/LongWrites/svc.conf
new file mode 100644
index 00000000000..9fb75aeb0dd
--- /dev/null
+++ b/TAO/tests/LongWrites/svc.conf
@@ -0,0 +1,4 @@
+#
+# $Id$
+#
+static Client_Strategy_Factory "-ORBTransportMuxStrategy MUXED"
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index 7d91591bccc..98d48abede8 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -42,9 +42,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -91,9 +89,8 @@ main (int argc, char *argv[])
 	}
 
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index 700a76a2070..8875bf46499 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -104,8 +104,7 @@ Manager::init (int argc,
 
   // Obtain the RootPOA.
   CORBA::Object_var obj_var =
-    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Get the POA_var object from Object_var.
   PortableServer::POA_var root_poa_var =
@@ -295,8 +294,10 @@ Manager::make_iors_register (CORBA::Environment &ACE_TRY_ENV)
 int
 Manager::run (CORBA::Environment &ACE_TRY_ENV)
 {
-  this->orb_->run (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  if (this->orb_->run (ACE_TRY_ENV) == -1)
+    ACE_ERROR_RETURN ((LM_DEBUG,
+                       "Error in run \n"),
+                       -1);
 
   return 0;
 }
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 47c475b7dd9..73f979b5771 100755
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -42,9 +42,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -53,7 +51,7 @@ main (int argc, char *argv[])
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.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);
@@ -66,7 +64,7 @@ main (int argc, char *argv[])
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
-
+                                   
       Simple_Server_var server =
         server_impl._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -91,9 +89,8 @@ main (int argc, char *argv[])
 	}
 
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
index eef7ada635c..9eb881d82ff 100755
--- a/TAO/tests/MT_Client/run_test.pl
+++ b/TAO/tests/MT_Client/run_test.pl
@@ -5,61 +5,64 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$client_conf = PerlACE::LocalFile ("client.global.conf");
-$server_conf = PerlACE::LocalFile ("server.conf");
-$client_process = "client";
-$debug_level = '0';
-$threads = '1';
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd();
+$client_conf="$cwd$DIR_SEPARATOR" ."client.global.conf";
+$client_process="client";
+$debug_level='0';
+$threads='1';
 $status = 0;
 
+ACE::checkForTarget($cwd);
 foreach $i (@ARGV) {
-    if ($i eq '-tss') {
-        $client_conf = PerlACE::LocalFile ("client.tss.conf");
-    } elsif ($i eq '-debug') {
-        $debug_level = '1';
-    } elsif ($i eq '-creation') {
-        $client_process = 'orb_creation';
-        $threads='2';
-    }
+  if ($i eq '-tss') {
+    $client_conf = "$cwd$DIR_SEPARATOR" . "client.tss.conf";
+  } elsif ($i eq '-debug') {
+    $debug_level = '1';
+  } elsif ($i eq '-creation') {
+    $client_process = 'orb_creation';
+    $threads='2';
+  }
 }
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfile = "$cwd$DIR_SEPARATOR" ."server.ior";
 
 unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $server_conf -ORBdebuglevel $debug_level -o $iorfile");
-$CL = new PerlACE::Process ($client_process, 
-                            "-ORBsvcconf $client_conf "
-                            . "-ORBdebuglevel $debug_level "
-                            . "-k file://$iorfile "
-                            . "-n $threads -i 1000 -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 30) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBsvcconf " . "$cwd$DIR_SEPARATOR" ."server.conf ".
+                       " -ORBdebuglevel $debug_level"
+                       . " -o $iorfile");
+
+if (ACE::waitforfile_timed ($iorfile, 30) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (240);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$CL = Process::Create ($EXEPREFIX."$client_process$EXE_EXT ",
+                       " -ORBsvcconf $client_conf "
+                       . "-ORBdebuglevel $debug_level"
+                       . " -k file://$iorfile "
+                       . " -n $threads -i 1000 "
+                       . " -x");
+
+$client = $CL->TimedWait (240);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$server = $SV->WaitKill (30);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (30);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
-
 unlink $iorfile;
 
 exit $status;
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index 83aed347feb..988be31d6cd 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -42,9 +42,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -89,9 +87,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/MT_Server/run_test.pl b/TAO/tests/MT_Server/run_test.pl
index cac09dd3d07..32a2e7cefcb 100755
--- a/TAO/tests/MT_Server/run_test.pl
+++ b/TAO/tests/MT_Server/run_test.pl
@@ -5,68 +5,81 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$threads = '8';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$sv_conf = PerlACE::LocalFile ("server.conf");
+$cwd = getcwd();
+$threads='8';
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads");
-$CL1 = new PerlACE::Process ("client", "-k file://$iorfile -i 100");
-$CL2 = new PerlACE::Process ("client", "-k file://$iorfile -i 100");
-$CL3 = new PerlACE::Process ("client", "-k file://$iorfile -i 100");
-$CLS = new PerlACE::Process ("client", "-k file://$iorfile -i 100 -x ");
-
-$SV->Spawn ();
+ACE::checkForTarget($cwd);
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+unlink $iorfile;
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -ORBsvcconf " . "$cwd$DIR_SEPARATOR" . "server.conf"
+                       . " -o $iorfile"
+		       . " -n $threads");
+
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$CL1->Spawn ();
-$CL2->Spawn ();
-$CL3->Spawn ();
-
-$client = $CL1->WaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+sleep (1);
+
+$CL1 = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			" -k file://$iorfile"
+			. " -i 100");
+$CL2 = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			" -k file://$iorfile"
+			. " -i 100");
+$CL3 = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			" -k file://$iorfile"
+			. " -i 100");
+
+$client1 = $CL1->TimedWait (60);
+if ($client1 == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL1->Kill (); $CL1->TimedWait (1);
 }
-$client = $CL2->WaitKill (30);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+$client2 = $CL2->TimedWait (60);
+if ($client2 == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL2->Kill (); $CL2->TimedWait (1);
 }
 
-$client = $CL3->WaitKill (30);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+$client3 = $CL3->TimedWait (60);
+if ($client3 == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL3->Kill (); $CL3->TimedWait (1);
 }
 
-$client = $CLS->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+		       " -k file://$iorfile"
+		       . " -i 100 -x");
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status
+if ($server != 0
+    || $client1 != 0
+    || $client2 != 0
+    || $client3 != 0
+    || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 2230b637515..9eb94b2aa00 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -70,9 +70,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -149,15 +147,6 @@ Worker::Worker (CORBA::ORB_ptr orb)
 int
 Worker::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
+  this->orb_->run ();
   return 0;
 }
diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile
index 138d2ef0096..2e1836809b5 100644
--- a/TAO/tests/Makefile
+++ b/TAO/tests/Makefile
@@ -11,10 +11,8 @@
 #----------------------------------------------------------------------------
 
 DIRS  = CDR \
-	Codec \
         BiDirectional \
 	BiDirectional_NestedUpcall \
-	Collocation \
         IDL_Test \
         OctetSeq \
         InterOp-Naming \
@@ -38,7 +36,6 @@ DIRS  = CDR \
 	Param_Test \
 	DSI_Gateway \
 	AMI \
-	AMI_Timeouts \
 	Timeout \
 	Timed_Buffered_Oneways \
 	Smart_Proxies \
@@ -55,7 +52,8 @@ DIRS  = CDR \
 	Single_Read \
 	QtTests \
 	Multiple \
-	LongWrites
+	LongWrites \
+	Queued_Message_Test
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
diff --git a/TAO/tests/Makefile.bor b/TAO/tests/Makefile.bor
index 343427aaf6d..fa788cc6e7d 100644
--- a/TAO/tests/Makefile.bor
+++ b/TAO/tests/Makefile.bor
@@ -4,11 +4,7 @@
 
 DIRS = \
         AMI \
-        AMI_Timeouts \
-        Bidirectional \
-        Bidirectional_NestedUpcall \
 	CDR \
-	Codec \
 	Collocation \
 	Connection_Purging \
 	DSI_Gateway \
@@ -16,16 +12,14 @@ DIRS = \
 	Endpoint_Per_Priority \
 	Explicit_Event_Loop \
         Exposed_Policies \
-	Faults \
         FL_Cube \
-        Forwarding \
+	Faults \
 	IDL_Test \
 	IORManipulation \
 	InterOp-Naming \
 	Leader_Followers \
 	MProfile \
 	Multiple_Inheritance \
-        Native_Exceptions \
 	Nested_Event_Loop \
 	ORB_destroy \
 	ORB_init \
diff --git a/TAO/tests/Multiple/Client.dsp b/TAO/tests/Multiple/Client.dsp
index c956c5d7627..e31150b20df 100644
--- a/TAO/tests/Multiple/Client.dsp
+++ b/TAO/tests/Multiple/Client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /out:"Client.exe" /libpath:"..\..\..\ace" /libpath:"..\..\tao"

 

 !ELSEIF  "$(CFG)" == "Client - Win32 Debug"

 

diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp
index d9b5f03a2cc..478f80666bc 100644
--- a/TAO/tests/Multiple/Multiple_Impl.cpp
+++ b/TAO/tests/Multiple/Multiple_Impl.cpp
@@ -18,7 +18,6 @@ Bottom_Impl::~Bottom_Impl (void)
 {
   // No-Op.
 }
-
 char *
 Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -83,7 +82,7 @@ Delegated_Bottom_Impl::top_quote (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::String_var msg =
     this->delegate_->top_quote (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN ("ERROR");
   return msg._retn ();
 }
 
@@ -96,7 +95,7 @@ Delegated_Bottom_Impl::left_quote (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::String_var msg =
     this->delegate_->left_quote (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN ("ERROR");
   return msg._retn ();
 }
 
@@ -109,7 +108,7 @@ Delegated_Bottom_Impl::right_quote (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::String_var msg =
     this->delegate_->right_quote (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN ("ERROR");
   return msg._retn ();
 }
 
@@ -122,7 +121,7 @@ Delegated_Bottom_Impl::bottom_quote (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::String_var msg =
     this->delegate_->bottom_quote (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  ACE_CHECK_RETURN ("ERROR");
   return msg._retn ();
 }
 
@@ -135,4 +134,6 @@ Delegated_Bottom_Impl::shutdown (CORBA::Environment &ACE_TRY_ENV)
   this->delegate_->shutdown (ACE_TRY_ENV);
   //this->orb_->shutdown (0, ACE_TRY_ENV);
   ACE_CHECK;
+
+
 }
diff --git a/TAO/tests/Multiple/Server.dsp b/TAO/tests/Multiple/Server.dsp
index c8d6c66f285..e2e81c29774 100644
--- a/TAO/tests/Multiple/Server.dsp
+++ b/TAO/tests/Multiple/Server.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.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 TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

+# ADD LINK32 ace.lib tao.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Server.exe" /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "Server - Win32 Debug"

 

diff --git a/TAO/tests/Multiple/run_test.pl b/TAO/tests/Multiple/run_test.pl
index fca870955df..789f921beb4 100755
--- a/TAO/tests/Multiple/run_test.pl
+++ b/TAO/tests/Multiple/run_test.pl
@@ -6,93 +6,100 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../../bin";
-use PerlACE::Run_Test;
+require Process;
+
+
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
 
-$direct_colloc = "-ORBCollocationStrategy direct";
-$no_colloc = "-ORBCollocation no";
+$status = 0;
+$EXEPREFIX = "./";
+$DIRECT_COLLOC = "-ORBCollocationStrategy direct";
+$NO_COLLOC = "-ORBCollocation no";
 
-# @todo Test should take -o and -k options to specify iorfile
-# Hard coded in test.
-$iorfile = "s.ior";
+$cwd = getcwd();
 
+$iorfile = "$cwd$DIR_SEPARATOR" . "s.ior";
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
+ACE::checkForTarget($cwd);
 
 #
 # Test using ThruPOA collocation.
 #
 
-$SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$Server = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+			   "");
+
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $Server->Kill (); $Server->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
 
-$SV->Kill ();
+$Client = Process::Create($EXEPREFIX."client$EXE_EXT", "");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if ($Client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = 1;
+  $Client->Kill (); 
 }
 
+$Server->Kill ();
+
+
 #
 # Test using Direct Collocation
 #
 
 unlink $iorfile;
 
-$SV->Arguments ($direct_colloc);
-
-$SV->Spawn ();
+$Server = Process::Create ($EXEPREFIX."server$EXE_EXT", $DIRECT_COLLOC);
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $Server->Kill (); $Server->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
 
-$SV->Kill ();
+$Client = Process::Create($EXEPREFIX."client$EXE_EXT", "");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if ($Client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = $status+1;
+  $Client->Kill (); 
 }
 
+$Server->Kill ();
+
 #
 # Test using No Collocation
 #
 
 unlink $iorfile;
 
-$SV->Arguments ($no_colloc);
+$Server = Process::Create ($EXEPREFIX."server$EXE_EXT", $NO_COLLOC);
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $Server->Kill (); $Server->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
 
-$SV->Kill ();
+$Client = Process::Create($EXEPREFIX."client$EXE_EXT", "");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+if ($Client->TimedWait (60) == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $status = $status+1;
+  $Client3->Kill (); 
 }
 
-unlink $iorfile;
+$Server->Kill ();
 
 exit $status
diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl
index f367f0bc639..cb48069a5c1 100755
--- a/TAO/tests/Multiple_Inheritance/run_test.pl
+++ b/TAO/tests/Multiple_Inheritance/run_test.pl
@@ -5,32 +5,43 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "server.ior";
 
-$SV = new PerlACE::Process ("server", "-f $iorfile");
-$CL = new PerlACE::Process ("client", "-f $iorfile");
+ACE::checkForTarget($cwd);
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT",
+                       " -f $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                       " -f $iorfile");
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+}
 
-$SV->Kill ();
+$SV->Terminate (); $server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
 unlink $iorfile;
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    exit $client;
+if ($server == -1 || $client != 0) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/Native_Exceptions/Makefile.bor b/TAO/tests/Native_Exceptions/Makefile.bor
deleted file mode 100644
index 7d5fd4e9ac0..00000000000
--- a/TAO/tests/Native_Exceptions/Makefile.bor
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for building the forwarding example
-#
-
-MAKEFILES = \
-	client.bor \
-	server.bor
-
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-
diff --git a/TAO/tests/Native_Exceptions/client.bor b/TAO/tests/Native_Exceptions/client.bor
deleted file mode 100644
index ced8892671d..00000000000
--- a/TAO/tests/Native_Exceptions/client.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#
-# Makefile for building the native_exceptions test
-#
-
-NAME = client
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 0
-
-OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\test_i.obj \
-	$(OBJDIR)\client.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/tests/Native_Exceptions/client.dsp b/TAO/tests/Native_Exceptions/client.dsp
index fd541397959..dd2c41aa036 100644
--- a/TAO/tests/Native_Exceptions/client.dsp
+++ b/TAO/tests/Native_Exceptions/client.dsp
@@ -118,7 +118,6 @@ SOURCE=.\test.idl
 !IF  "$(CFG)" == "Native Exceptions Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -157,7 +156,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Native Exceptions Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

diff --git a/TAO/tests/Native_Exceptions/run_test.pl b/TAO/tests/Native_Exceptions/run_test.pl
index b6db030b8cc..1feae5d78b9 100755
--- a/TAO/tests/Native_Exceptions/run_test.pl
+++ b/TAO/tests/Native_Exceptions/run_test.pl
@@ -5,38 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" ."test.ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -i 1000");
+ACE::checkForTarget($cwd);
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile "
+                       . " -i 1000");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/Native_Exceptions/server.bor b/TAO/tests/Native_Exceptions/server.bor
deleted file mode 100644
index 6f036dada9d..00000000000
--- a/TAO/tests/Native_Exceptions/server.bor
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#
-# Makefile for building the native examples test
-#
-
-NAME = server
-
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 0
-
-OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\test_i.obj \
-	$(OBJDIR)\server.obj
-
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\test.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\testC.cpp $(IDLDIR)\testS.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) $**
-
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index cae2e7d2570..1a28e883d43 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -78,8 +78,8 @@ main (int argc, char *argv[])
 
       poa_manager->activate ();
 
-      orb->run ();
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
   catch (CORBA::SystemException &ex)
diff --git a/TAO/tests/Native_Exceptions/server.dsp b/TAO/tests/Native_Exceptions/server.dsp
index edd5e37c345..a2e1734086e 100644
--- a/TAO/tests/Native_Exceptions/server.dsp
+++ b/TAO/tests/Native_Exceptions/server.dsp
@@ -134,7 +134,6 @@ SOURCE=.\test.idl
 !IF  "$(CFG)" == "Native Exceptions Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

@@ -173,7 +172,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "Native Exceptions Server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\test.idl

 InputName=test

diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
index a75bf048920..951f7db9774 100755
--- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
@@ -5,60 +5,67 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$ior1file = PerlACE::LocalFile ("server1.ior");
-$ior2file = PerlACE::LocalFile ("server2.ior");
+$cwd = getcwd();
+$ior1file = "$cwd$DIR_SEPARATOR" . "server1.ior";
+$ior2file = "$cwd$DIR_SEPARATOR" . "server2.ior";
+
+ACE::checkForTarget($cwd);
 
 # Make sure the files are gone
 unlink $ior1file;
 unlink $ior2file;
 
-$SV1 = new PerlACE::Process ("server", "-o $ior1file");
-$SV2 = new PerlACE::Process ("server", "-o $ior2file");
-$CL = new PerlACE::Process ("client", "-f $ior1file -g $ior2file -n 2 -i 10 -s 5");
-
-$SV1->Spawn ();
-$SV2->Spawn ();
+$SV1 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                        " -o $ior1file ");
 
-if (PerlACE::waitforfile_timed ($ior1file, 5) == -1) {
+if (ACE::waitforfile_timed ($ior1file, 5) == -1) {
     print STDERR "ERROR: cannot find file <$ior1file>\n";
-    $SV1->Kill ();
-    $SV2->Kill ();
+    $SV1->Kill (); $SV1->TimedWait (1);
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($ior2file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ior2file>\n";
-    $SV1->Kill ();
-    $SV2->Kill ();
+$SV2 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                        " -o $ior2file ");
+
+if (ACE::waitforfile_timed ($ior2file, 5) == -1) {
+    print STDERR "ERROR: cannot find file <$ior1file>\n";
+    $SV2->Kill (); $SV2->TimedWait (1);
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       " -f $ior1file -g $ior2file -n 2 -i 10 -s 5");
 
-$server1 = $SV1->TerminateWaitKill (5);
-$server2 = $SV2->TerminateWaitKill (5);
-
-# Clean up
-unlink $ior1file;
-unlink $ior2file;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$SV1->Terminate (); $server1 = $SV1->TimedWait (5);
+if ($server1 == -1) {
+    print STDERR "ERROR: cannot terminate server1\n";
+    $SV1->Kill (); $SV1->TimedWait (1);
+    $SV2->Kill (); $SV2->TimedWait (1);
 }
 
-if ($server1 != 0) {
-    print STDERR "ERROR: server 1 returned $server1\n";
-    $status = 1;
+$SV2->Terminate (); $server1 = $SV2->TimedWait (5);
+if ($server2 == -1) {
+    print STDERR "ERROR: cannot terminate server2\n";
+    $SV2->Kill (); $SV2->TimedWait (1);
 }
 
-if ($server2 != 0) {
-    print STDERR "ERROR: server 2 returned $server2\n";
-    $status = 1;
+# Clean up
+unlink $ior1file;
+unlink $ior2file;
+
+if ($client == -1 || $server1 == -1 || $server2 == -1) {
+    exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/NestedUpcall/Simple/run_test.pl b/TAO/tests/NestedUpcall/Simple/run_test.pl
index e43e5d6cb83..2ea90c54820 100755
--- a/TAO/tests/NestedUpcall/Simple/run_test.pl
+++ b/TAO/tests/NestedUpcall/Simple/run_test.pl
@@ -5,70 +5,73 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-f $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
+ACE::checkForTarget($cwd);
 
 print STDERR "\nrunning ST version of the client and the server\n\n";
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -f $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			" -k file://$iorfile -x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-$SV->Arguments ("-f $iorfile -t 2");
-$CL->Arguments ("-k file://$iorfile -x -n 2");
+if ($client != 0 || server != 0) {
+  exit 1;
+}
 
 print STDERR "\nrunning MT version of the client and the server\n\n";
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -f $iorfile -t 2");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+			" -k file://$iorfile -x -n 2");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
-unlink $iorfile;
-
-exit $status;
+exit 0;
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index 2b9450234cc..e35959b5a43 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -33,18 +33,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb)
 int
 Server_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
+  return this->orb_->run ();
 }
 
 static int
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
index 27a7e0c54ce..fa1e674f64d 100755
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -5,61 +5,67 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
+$cwd = getcwd();
+$ior1file = "$cwd$DIR_SEPARATOR" . "servera.ior";
+$ior2file = "$cwd$DIR_SEPARATOR" . "serverb.ior";
 
-$ior1file = PerlACE::LocalFile ("servera.ior");
-$ior2file = PerlACE::LocalFile ("serverb.ior");
+ACE::checkForTarget($cwd);
 
 #  Make sure these aren't hanging around
 unlink $ior1file;
 unlink $ior2file;
 
-$SV1 = new PerlACE::Process ("server_A", "-o $ior1file");
-$SV2 = new PerlACE::Process ("server_B", "-o $ior2file");
-$CL = new PerlACE::Process ("initiator", "-f $ior1file -g $ior2file");
+$SV1 = Process::Create ($EXEPREFIX."server_A".$EXE_EXT,
+                        "-o $ior1file");
 
-$SV1->Spawn ();
-$SV2->Spawn ();
-
-if (PerlACE::waitforfile_timed ($ior1file, 15) == -1) {
+if (ACE::waitforfile_timed ($ior1file, 15) == -1) {
     print STDERR "ERROR: cannot find file <$ior1file>\n";
-    $SV1->Kill (); 
-    $SV2->Kill ();
+    $SV1->Kill (); $SV1->TimedWait (1);
     exit 1;
 }
 
-if (PerlACE::waitforfile_timed ($ior2file, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$ior2file>\n";
-    $SV2->Kill (); 
-    $SV1->Kill (); 
+$SV2 = Process::Create ($EXEPREFIX."server_B".$EXE_EXT,
+                        "-o $ior2file");
+
+if (ACE::waitforfile_timed ($ior2file, 5) == -1) {
+    print STDERR "ERROR: cannot find file <$ior1file>\n";
+    $SV2->Kill (); $SV2->TimedWait (1);
+    $SV1->Kill (); $SV1->TimedWait (1);
     exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
-
-$server1 = $SV1->TerminateWaitKill (5);
-$server2 = $SV2->TerminateWaitKill (5);
+$CL = Process::Create ($EXEPREFIX."initiator".$EXE_EXT,
+                       " -f $ior1file -g $ior2file");
 
-# Clean up
-unlink $ior1file;
-unlink $ior2file;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+}
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$SV1->Terminate (); $server1 = $SV1->TimedWait (5);
+if ($server1 == -1) {
+    print STDERR "ERROR: cannot terminate server1\n";
+    $SV1->Kill (); $SV1->TimedWait (1);
 }
 
-if ($server1 != 0) {
-    print STDERR "ERROR: server 1 returned $server1\n";
-    $status = 1;
+$SV2->Terminate (); $server1 = $SV2->TimedWait (5);
+if ($server2 == -1) {
+    print STDERR "ERROR: cannot terminate server2\n";
+    $SV2->Kill (); $SV2->TimedWait (1);
 }
 
-if ($server2 != 0) {
-    print STDERR "ERROR: server 2 returned $server2\n";
-    $status = 1;
+# Clean up
+unlink $ior1file;
+unlink $ior2file;
+
+if ($client == -1 || $server1 == -1 || $server2 == -1) {
+    exit 1;
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/Nested_Event_Loop/run_test.pl b/TAO/tests/Nested_Event_Loop/run_test.pl
index 457e4f7df29..9d1a922cb34 100755
--- a/TAO/tests/Nested_Event_Loop/run_test.pl
+++ b/TAO/tests/Nested_Event_Loop/run_test.pl
@@ -5,39 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "ior";
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
+unlink $iorfile;
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (200);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       "-k file://$iorfile -x");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (200);
+if ($client == -1) {
+  $time = localtime;
+  print STDERR "ERROR: client timedout at $time\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (100);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (100);
+if ($server == -1) {
+  $time = localtime;
+  print STDERR "ERROR: server timedout at $time\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index b3617663e24..bac5b3b7042 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -89,7 +89,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run (ACE_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.dsp b/TAO/tests/ORB_destroy/ORB_destroy.dsp
index 24536f6a0c0..af313b34aec 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.dsp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/tests/ORB_destroy/run_test.pl b/TAO/tests/ORB_destroy/run_test.pl
index 9f00793287b..8880ed4f961 100755
--- a/TAO/tests/ORB_destroy/run_test.pl
+++ b/TAO/tests/ORB_destroy/run_test.pl
@@ -5,16 +5,19 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("ORB_destroy");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."ORB_destroy".$EXE_EXT);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/ORB_init/run_test.pl b/TAO/tests/ORB_init/run_test.pl
index 89a6a345f8d..88863c537e1 100755
--- a/TAO/tests/ORB_init/run_test.pl
+++ b/TAO/tests/ORB_init/run_test.pl
@@ -5,16 +5,20 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("ORB_init");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$orb_init = Process::Create ($EXEPREFIX."ORB_init".$EXE_EXT);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$pid = $orb_init->TimedWait (15);
+if ($pid == -1) {
+  print STDERR "ERROR: ORB_init timed out\n";
+  $orb_init->Kill (); $orb_init->TimedWait (1);
+
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/Object_Loader/Test_DLL.dsp b/TAO/tests/Object_Loader/Test_DLL.dsp
index a96ca863f76..8d4e20a6c91 100644
--- a/TAO/tests/Object_Loader/Test_DLL.dsp
+++ b/TAO/tests/Object_Loader/Test_DLL.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

+# PROP Intermediate_Dir "Release/DLL"

 # 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

@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# PROP Intermediate_Dir "Debug/DLL"

 # 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

diff --git a/TAO/tests/Object_Loader/driver.dsp b/TAO/tests/Object_Loader/driver.dsp
index 4fdeb9847ad..087825d914d 100644
--- a/TAO/tests/Object_Loader/driver.dsp
+++ b/TAO/tests/Object_Loader/driver.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/tests/Object_Loader/run_test.pl b/TAO/tests/Object_Loader/run_test.pl
index f15b3fd3cec..99649ceb974 100755
--- a/TAO/tests/Object_Loader/run_test.pl
+++ b/TAO/tests/Object_Loader/run_test.pl
@@ -8,13 +8,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib '../../../bin';
 use PerlACE::Run_Test;
 
-$T = new PerlACE::Process ("driver");
+my $CL = new PerlACE::Process ("driver", "");
 
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
-}
-
-exit 0;
+exit $CL->SpawnWaitKill (60);
diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index a574ed6ef0e..b79ea5331fe 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -5,51 +5,62 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-i 5000 -k file://$iorfile");
-$T = new PerlACE::Process ("OctetSeq", "-n 32 -l 8192 -h 8192 -s 1 -q");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 print STDERR "\n\n==== Octet sequence passing test\n";
 
-$SV->Spawn ();
+$file="$cwd$DIR_SEPARATOR" . "test.ior";
+
+unlink $file;
 
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-o $file");
+if (ACE::waitforfile_timed ($file, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (120);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       " -i 5000 -k file://$file");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($client == -1 || $server == -1) {
+  exit 1;
 }
 
+unlink $file;
+
 print STDERR "\n\n==== Octet sequence performance test\n";
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."OctetSeq$EXE_EXT",
+                      " -n 32 -l 8192 -h 8192 -s 1 -q");
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    $status = 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
 }
 
-unlink $iorfile;
+if ($client == -1) {
+  exit 1;
+}
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 0ccc9a2fb08..c52091468ad 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -89,9 +89,8 @@ main (int argc, char *argv[])
         poa_manager->activate (ACE_TRY_ENV);
         ACE_TRY_CHECK;
 
-        orb->run (ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
+        if (orb->run () == -1)
+          ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
         ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
         root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/POA/Deactivation/Deactivation.cpp b/TAO/tests/POA/Deactivation/Deactivation.cpp
index 71a2f5c9b3e..6dfd62612ff 100644
--- a/TAO/tests/POA/Deactivation/Deactivation.cpp
+++ b/TAO/tests/POA/Deactivation/Deactivation.cpp
@@ -185,10 +185,8 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
+                                                               ACE_TRY_ENV);
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/tests/POA/Deactivation/run_test.pl b/TAO/tests/POA/Deactivation/run_test.pl
index f3381e4fff6..a1856b59476 100755
--- a/TAO/tests/POA/Deactivation/run_test.pl
+++ b/TAO/tests/POA/Deactivation/run_test.pl
@@ -5,16 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("Deactivation");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."Deactivation".$EXE_EXT);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
+
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/POA/Destruction/Destruction.cpp b/TAO/tests/POA/Destruction/Destruction.cpp
index f8e80346996..13f0d2c34b0 100644
--- a/TAO/tests/POA/Destruction/Destruction.cpp
+++ b/TAO/tests/POA/Destruction/Destruction.cpp
@@ -56,10 +56,8 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
+                                                               ACE_TRY_ENV);
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/tests/POA/Destruction/run_test.pl b/TAO/tests/POA/Destruction/run_test.pl
index cc3f201286f..9a6c66ef400 100755
--- a/TAO/tests/POA/Destruction/run_test.pl
+++ b/TAO/tests/POA/Destruction/run_test.pl
@@ -5,16 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("Destruction");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."Destruction".$EXE_EXT);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
+
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index ed1a02d6819..c0cc2c4eada 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -702,10 +702,8 @@ main (int argc, char **argv)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
+                                                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
diff --git a/TAO/tests/POA/Identity/run_test.pl b/TAO/tests/POA/Identity/run_test.pl
index df9cee37e8f..477183daba9 100755
--- a/TAO/tests/POA/Identity/run_test.pl
+++ b/TAO/tests/POA/Identity/run_test.pl
@@ -5,17 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("Identity", "-ORBobjrefstyle url");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."Identity".$EXE_EXT, "-ORBobjrefstyle url");
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
 }
 
-exit 0;
+if ($client == -1) {
+  exit 1;
+}
 
+exit 0;
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index 431ca90b91b..ef1f350156d 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -86,10 +86,8 @@ main (int argc, char **argv)
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
+                                                               ACE_TRY_ENV);
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl b/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl
index 07f6a6303ed..0de131614e2 100755
--- a/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl
+++ b/TAO/tests/POA/Non_Servant_Upcalls/run_test.pl
@@ -5,16 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process("Non_Servant_Upcalls");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."Non_Servant_Upcalls".$EXE_EXT);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
+
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/POA/wait_for_completion/run_test.pl b/TAO/tests/POA/wait_for_completion/run_test.pl
index 3243a5feed5..652c62eceb8 100755
--- a/TAO/tests/POA/wait_for_completion/run_test.pl
+++ b/TAO/tests/POA/wait_for_completion/run_test.pl
@@ -5,16 +5,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$T = new PerlACE::Process ("wait_for_completion");
+ACE::checkForTarget(getcwd());
 
-$test = $T->SpawnWaitKill (60);
+$T = Process::Create ($EXEPREFIX."wait_for_completion".$EXE_EXT);
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$client = $T->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+}
+
+if ($client == -1) {
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index 0af736281c0..9ee9cbddb47 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -61,9 +61,8 @@ init_orb (int argc,
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Obtain the RootPOA.
-  CORBA::Object_var obj =
-    orb->resolve_initial_references ("RootPOA",
-                                     ACE_TRY_ENV);
+  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
+                                                           ACE_TRY_ENV);
   ACE_CHECK_RETURN (PortableServer::POA::_nil ());
 
   // Get the POA_var object from Object_var.
diff --git a/TAO/tests/Param_Test/anyop.dsp b/TAO/tests/Param_Test/anyop.dsp
index f50b174e969..fe6bcc9b791 100644
--- a/TAO/tests/Param_Test/anyop.dsp
+++ b/TAO/tests/Param_Test/anyop.dsp
@@ -1,201 +1,201 @@
-# Microsoft Developer Studio Project File - Name="Param_Test Anyop" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Param_Test Anyop - 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 "anyop.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 "anyop.mak" CFG="Param_Test Anyop - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Param_Test Anyop - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Param_Test Anyop - 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)" == "Param_Test Anyop - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\Strategies" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Param_Test Anyop - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

-# 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 TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\Strategies" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Param_Test Anyop - Win32 Release"

-# Name "Param_Test Anyop - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\anyop.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\param_testCli.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Param_TestCli.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ".i"

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ".idl"

-# Begin Source File

-

-SOURCE=.\param_test.idl

-

-!IF  "$(CFG)" == "Param_Test Anyop - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__PARAM="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\param_test.idl

-InputName=param_test

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I..\..\tao\ -Ge 1 -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl

-

-"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Cli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "Param_Test Anyop - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__PARAM="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\param_test.idl

-InputName=param_test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I..\..\tao\ -Ge 1 -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl

-

-"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Cli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="Param_Test Anyop" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Param_Test Anyop - 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 "anyop.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 "anyop.mak" CFG="Param_Test Anyop - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Param_Test Anyop - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "Param_Test Anyop - 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)" == "Param_Test Anyop - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib tao.lib TAO_Strategies.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao\Strategies" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF  "$(CFG)" == "Param_Test Anyop - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# 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 TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao\Strategies" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Param_Test Anyop - Win32 Release"
+# Name "Param_Test Anyop - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".cpp"
+# Begin Source File
+
+SOURCE=.\anyop.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\param_testCli.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ".h"
+# Begin Source File
+
+SOURCE=.\Param_TestCli.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter ".i"
+# End Group
+# Begin Group "IDL Files"
+
+# PROP Default_Filter ".idl"
+# Begin Source File
+
+SOURCE=.\param_test.idl
+
+!IF  "$(CFG)" == "Param_Test Anyop - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__PARAM="..\..\..\bin\Release\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO IDL Compiler
+InputPath=.\param_test.idl
+InputName=param_test
+
+BuildCmds= \
+	..\..\..\bin\Release\tao_idl -I..\..\tao\ -Ge 1 -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i $(InputName).idl
+
+"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Cli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "Param_Test Anyop - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+USERDEP__PARAM="..\..\..\bin\tao_idl.exe"	
+# Begin Custom Build - Invoking TAO IDL Compiler
+InputPath=.\param_test.idl
+InputName=param_test
+
+BuildCmds= \
+	..\..\..\bin\tao_idl -I..\..\tao\ -Ge 1 -hc Cli.h -hs Ser.h -hT Ser_T.h -cs Cli.cpp -ci Cli.i -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i $(InputName).idl
+
+"$(InputName)Cli.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Cli.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Cli.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)Ser_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index df5815fec66..a5ff8189fa1 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -5,20 +5,59 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib "../../../bin";
-use PerlACE::Run_Test;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
 
+use lib "../../../bin";
+require ACEutils;
+require Process;
+use Cwd;
+
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "server.ior";
 $invocation = "sii";
 $num = 5;
 $other = "";
 $debug = "";
 $type = "";
-$status = 0;
 
 unlink $iorfile;
 
+sub run_test
+{
+  my $type = shift(@_);
+
+  unlink $iorfile; # Ignore errors
+  print STDERR "==== Testing $type === wait....\n";
+
+  $SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                         "$debug -o $iorfile");
+
+  if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
+    print STDERR "ERROR: cannot find file <$iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+  }
+
+  $CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                         " $debug -f $iorfile  -i $invocation "
+			 . "-t $type -n $num -x");
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+    print STDERR "ERROR: client timedout\n";
+    $CL->Kill (); $CL->TimedWait (1);
+  }
+
+  $server = $SV->TimedWait (10);
+  if ($server == -1) {
+    print STDERR "ERROR: server timedout\n";
+    $SV->Kill (); $SV->TimedWait (1);
+  }
+  unlink $iorfile;
+
+  print STDERR "==== Test for $type finished ===\n";
+}
+
 # Parse the arguments
 
 @types = ("short", "ulonglong", "ubstring", "bdstring",
@@ -35,76 +74,73 @@ unlink $iorfile;
           "big_union", "small_union", "recursive_union", "complex_any");
 
 
-for ($i = 0; $i <= $#ARGV; $i++) {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?") {
+ACE::checkForTarget($cwd);
+
+for ($i = 0; $i <= $#ARGV; $i++)
+{
+  SWITCH:
+  {
+    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
+    {
       print "Run_Test Perl script for TAO Param Test\n\n";
       print "run_test [-n num] [-d] [-onewin] [-h] [-t type] [-i (dii|sii)] [-chorus <target>]\n";
       print "\n";
       print "-n num              -- runs the client num times\n";
       print "-d                  -- runs each in debug mode\n";
+      print "-onewin             -- keeps all tests in one window on NT\n";
       print "-h                  -- prints this information\n";
       print "-t type             -- runs only one type of param test\n";
       print "-i (dii|sii)        -- Changes the type of invocation\n";
       print "-chorus <target>    -- Run tests on chorus target\n";
       exit 0;
     }
-    elsif ($ARGV[$i] eq "-n") {
+    if ($ARGV[$i] eq "-n")
+    {
       $num = $ARGV[$i + 1];
       $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-d") {
+    if ($ARGV[$i] eq "-d")
+    {
       $debug = $debug." -d";
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-t") {
+    if ($ARGV[$i] eq "-onewin")
+    {
+      if ($^O eq "MSWin32")
+      {
+        $newwindow = "no";
+      }
+      last SWITCH;
+    }
+    if ($ARGV[$i] eq "-twowin")
+    {
+      if ($^O eq "MSWin32")
+      {
+        $newwindow = "yes";
+      }
+      last SWITCH;
+    }
+    if ($ARGV[$i] eq "-t")
+    {
       @types = split (',', $ARGV[$i + 1]);
       $i++;
+      last SWITCH;
     }
-    elsif ($ARGV[$i] eq "-i") {
+    if ($ARGV[$i] eq "-i")
+    {
       $invocation = $ARGV[$i + 1];
       $i++;
+      last SWITCH;
     }
-    else {
-        $other .= $ARGV[$i];
-    }
+    $other .= $ARGV[$i];
+  }
 }
 
-$SV = new PerlACE::Process ("server", "$debug -o $iorfile");
-$CL = new PerlACE::Process ("client");
-
 foreach $type (@types) {
-    unlink $iorfile; # Ignore errors
-
-    print STDERR "==== Testing $type === wait....\n";
-
-    $SV->Spawn ();
-    
-    if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-        print STDERR "ERROR: cannot find file <$iorfile>\n";
-        $SV->Kill (); 
-        exit 1;
-    }
-
-    $CL->Arguments ("$debug -f $iorfile  -i $invocation -t $type -n $num -x");
-
-    $client = $CL->SpawnWaitKill (60);
-    
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
-
-    $server = $SV->WaitKill (10);
-    
-    if ($server != 0) {
-        print STDERR "ERROR: server returned $server\n";
-        $status = 1;
-    }
-    
-    unlink $iorfile;
-
-    print STDERR "==== Test for $type finished ===\n";
+  run_test ($type);
 }
 
 unlink $iorfile;
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/Param_Test/run_test_dii.pl b/TAO/tests/Param_Test/run_test_dii.pl
index deff232deb7..baebb2fd213 100755
--- a/TAO/tests/Param_Test/run_test_dii.pl
+++ b/TAO/tests/Param_Test/run_test_dii.pl
@@ -8,5 +8,5 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 @ARGS=('run_test.pl', '-i', 'dii');
 push @ARGS, @ARGV;
 
-system ('perl ', join ' ', @ARGS);
+exec 'run_test.pl', @ARGS;
 
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 99418c47dd6..93293c80355 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -149,8 +149,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb_ptr->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (orb_ptr->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
 
       good_poa->destroy (1,
                          1,
diff --git a/TAO/tests/Policies/run_test.pl b/TAO/tests/Policies/run_test.pl
index 4d9888e2950..33c6b139a6a 100755
--- a/TAO/tests/Policies/run_test.pl
+++ b/TAO/tests/Policies/run_test.pl
@@ -5,18 +5,22 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$threads = '10';
+$cwd = getcwd();
+$threads='10';
+$status = 0;
 
-$T = new PerlACE::Process ("Manipulation", "-n $threads");
+$T = Process::Create ($EXEPREFIX."Manipulation$EXE_EXT",
+		      " -n $threads");
 
-$test = $T->SpawnWaitKill (60);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+$t = $T->TimedWait (60);
+if ($t == -1) {
+  print STDERR "ERROR: test timedout\n";
+  $T->Kill (); $T->TimedWait (1);
+  $status = 1;
 }
 
-exit 0;
+exit $status;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.dsp b/TAO/tests/Portable_Interceptors/Benchmark/client.dsp
index ae15cf14423..138b58055cd 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.dsp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ACE.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ACE.lib TAO.lib /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Benchmark Client - Win32 Debug"

 

diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
index 937fca29e1b..ea7074f458c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
@@ -40,12 +40,6 @@ Vault_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Vault_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -192,12 +186,6 @@ Vault_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Vault_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -325,13 +313,6 @@ Vault_Client_Request_Context_Interceptor::name (
 }
 
 void
-Vault_Client_Request_Context_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Client_Request_Context_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -450,13 +431,6 @@ Vault_Server_Request_Context_Interceptor::name (
 }
 
 void
-Vault_Server_Request_Context_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
     PortableInterceptor::ServerRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -549,13 +523,6 @@ Vault_Client_Request_Dynamic_Interceptor::name (
 }
 
 void
-Vault_Client_Request_Dynamic_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Client_Request_Dynamic_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -706,13 +673,6 @@ Vault_Server_Request_Dynamic_Interceptor::name (
 }
 
 void
-Vault_Server_Request_Dynamic_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Server_Request_Dynamic_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr ri
     TAO_ENV_ARG_DECL)
@@ -843,13 +803,6 @@ Vault_Client_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Vault_Client_Request_NOOP_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Client_Request_NOOP_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -947,13 +900,6 @@ Vault_Server_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Vault_Server_Request_NOOP_Interceptor::destroy (
-    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Vault_Server_Request_NOOP_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
index 7a077f925d3..4b16f78b58c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
@@ -37,10 +37,8 @@ public:
 
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Canonical name of the interceptor.
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -90,9 +88,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -141,10 +136,8 @@ public:
 
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Canonical name of the interceptor.
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -194,9 +187,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -246,10 +236,8 @@ public:
 
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Canonical name of the interceptor.
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -299,9 +287,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -351,10 +336,8 @@ public:
 
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Canonical name of the interceptor.
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -404,9 +387,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl b/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
index 32b233a0ed9..1178584674b 100755
--- a/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Benchmark/run_test.pl
@@ -5,39 +5,46 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file");
-$CL = new PerlACE::Process ("client", "-ORBobjrefstyle url -f file://$file");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 print STDERR "\n\n==== Running interceptor Benchmark test\n";
 
-$SV->Spawn ();
+$file = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill (); 
-    exit 1;
+unlink $file;
+
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-ORBobjrefstyle url -o $file");
+if (ACE::waitforfile_timed ($file, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       "-ORBobjrefstyle url -f file://$file");
+
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($client == -1 || $server == -1) {
+  exit 1;
 }
 
 unlink $file;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.dsp b/TAO/tests/Portable_Interceptors/Benchmark/server.dsp
index f8b07aebf0f..225b41b42cd 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.dsp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
index 093a0497204..7f8a65aa7ed 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp
@@ -42,12 +42,6 @@ Echo_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED
@@ -223,12 +217,6 @@ Echo_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -327,7 +315,7 @@ Echo_Server_Request_Interceptor::send_reply (
       (result_any.in ()) >>= result;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "The result of calculate is %d + %d = %d\n",
+                  "The result of calculate  is %d + %d = %d\n",
                   param1,
                   param2,
                   result));
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
index fccabebecf0..0d59493a60a 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h
@@ -35,10 +35,8 @@ public:
 
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Canonical name of the interceptor.
 
   virtual void send_poll (
         PortableInterceptor::ClientRequestInfo_ptr
@@ -98,18 +96,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
-
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -123,6 +109,15 @@ public:
                                TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      PortableInterceptor::ForwardRequest));
+
+  virtual void receive_request_service_contexts (
+        PortableInterceptor::ServerRequestInfo_ptr
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+        )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableInterceptor::ForwardRequest
+      ));
   
   virtual void send_other (
         PortableInterceptor::ServerRequestInfo_ptr
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
index 43c9f86a683..e588c46209d 100755
--- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl
@@ -5,41 +5,48 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file");
-$CL = new PerlACE::Process ("client", "-ORBobjrefstyle url -f file://$file");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 print STDERR "\n\n==== Running interceptor Dynamic test\n";
 
-$SV->Spawn ();
+$file = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
+unlink $file;
+
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-ORBobjrefstyle url -o $file");
+if (ACE::waitforfile_timed ($file, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       "-ORBobjrefstyle url -f file://$file");
+
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($client == -1 || $server == -1) {
+  exit 1;
 }
 
 unlink $file;
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
index c180e9e2067..c5bcd77cf94 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp
@@ -26,12 +26,6 @@ Client_Request_Interceptor::name (
 }
 
 void
-Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Client_Request_Interceptor::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri
       TAO_ENV_ARG_DECL)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
index 4696ede0d9c..aa2dceb45f2 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h
@@ -69,9 +69,6 @@ public:
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri
       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile
index f08c90a90fd..05dd1efc958 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile
@@ -14,11 +14,8 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lTAO
 
-IDL_FILES = test ServerRequestInterceptor
-IDL_SRC = \
-  testC.cpp \
-  testS.cpp \
-  ServerRequestInterceptorC.cpp
+IDL_FILES = test
+IDL_SRC = testC.cpp testS.cpp
 BIN_UNCHECKED = client server
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) test_i Client_Request_Interceptor Client_ORBInitializer Server_ORBInitializer Server_Request_Interceptor) $(IDL_SRC)
@@ -36,7 +33,7 @@ SERVER_OBJS = \
   Server_Request_Interceptor.o \
   $(IDL_SRC:.cpp=.o)
 
-TAO_IDLFLAGS += -Ge 1 -I../../.. -DCORBA3
+TAO_IDLFLAGS += -Ge 1
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -67,7 +64,7 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext) ServerRequestInterceptor$(ext))
+	-$(RM) $(foreach ext, $(IDL_EXT), test$(ext))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -111,7 +108,8 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i testC.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -430,8 +428,8 @@ realclean: clean
  $(ACE_ROOT)/ace/Sock_Connect.h \
  $(ACE_ROOT)/ace/Sock_Connect.i \
  $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i test_i.h \
- testS.h testC.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ test_i.h testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
@@ -726,8 +724,7 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
  testS_T.h testS_T.i testS_T.cpp testS.i Server_ORBInitializer.h \
- Server_Request_Interceptor.h ServerRequestInterceptorC.h \
- ServerRequestInterceptorC.i
+ Server_Request_Interceptor.h
 
 .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 \
@@ -1214,7 +1211,8 @@ realclean: clean
  $(TAO_ROOT)/tao/Services.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
  $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i testC.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
@@ -1685,176 +1683,7 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
- Server_Request_Interceptor.h ServerRequestInterceptorC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- ServerRequestInterceptorC.i
+ Server_Request_Interceptor.h
 
 .obj/Server_Request_Interceptor.o .obj/Server_Request_Interceptor.so .shobj/Server_Request_Interceptor.o .shobj/Server_Request_Interceptor.so: Server_Request_Interceptor.cpp \
  Server_Request_Interceptor.h \
@@ -1867,8 +1696,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- ServerRequestInterceptorC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1956,14 +1784,26 @@ realclean: clean
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
  $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/DynamicC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
+ $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1971,209 +1811,28 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
  $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
  $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
  $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- ServerRequestInterceptorC.i
+ $(TAO_ROOT)/tao/LocalObject.h \
+ $(TAO_ROOT)/tao/LocalObject.i
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2847,323 +2506,4 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
  $(TAO_ROOT)/tao/RequestInfo_Util.h
 
-.obj/ServerRequestInterceptorC.o .obj/ServerRequestInterceptorC.so .shobj/ServerRequestInterceptorC.o .shobj/ServerRequestInterceptorC.so: ServerRequestInterceptorC.cpp \
- ServerRequestInterceptorC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- ServerRequestInterceptorC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
-
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl b/TAO/tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl
deleted file mode 100644
index 99f0d71978d..00000000000
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-
-//=============================================================================
-/**
- * @file Server_Request_Interceptor.idl
- *
- * $Id$
- *
- * IDL file for the ForwardRequest specialized server request
- * interceptor.
- *
- * @author Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
-
-#include "tao/PortableInterceptor.pidl"
-
-module ForwardRequestTest
-{
-
-  local interface ServerRequestInterceptor
-    : PortableInterceptor::ServerRequestInterceptor
-  {
-
-    /// Set the references to which requests will be forwarded.
-    void forward_references (in Object obj1,
-                             in Object obj2);
-
-  };
-
-};
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index 5727f3bed21..ddda2fc0c5b 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (ForwardRequest,
 #include "Server_Request_Interceptor.h"
 
 Server_ORBInitializer::Server_ORBInitializer (void)
-  : server_interceptor_ ()
+  : server_interceptor_ (0)
 {
 }
 
@@ -31,9 +31,8 @@ Server_ORBInitializer::post_init (
 {
   TAO_ENV_ARG_DEFN;
 
-  PortableInterceptor::ServerRequestInterceptor_ptr interceptor;
   // Install the server request interceptor.
-  ACE_NEW_THROW_EX (interceptor,
+  ACE_NEW_THROW_EX (this->server_interceptor_,
                     Server_Request_Interceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
@@ -42,19 +41,18 @@ Server_ORBInitializer::post_init (
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
 
-  this->server_interceptor_ = interceptor;
+  PortableInterceptor::ServerRequestInterceptor_var
+    server_interceptor = this->server_interceptor_;
 
-  info->add_server_request_interceptor (interceptor,
-                                        ACE_TRY_ENV);
+  info->add_server_request_interceptor (server_interceptor.in ()
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-PortableInterceptor::ServerRequestInterceptor_ptr
+Server_Request_Interceptor *
 Server_ORBInitializer::server_interceptor (void)
 {
-  return
-    PortableInterceptor::ServerRequestInterceptor::_duplicate (
-      this->server_interceptor_.in ());
+  return this->server_interceptor_;
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
index 7b0320caf55..5172f660f17 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h
@@ -61,13 +61,13 @@ public:
 
   /// Return the created server request interceptor.  Only valid after
   /// post_init(), i.e. ORB_init(), has been called.
-  PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void);
+  Server_Request_Interceptor *server_interceptor (void);
 
 private:
 
   /// Pointer to the server request interceptor.  ORB is responsible
   /// for storage.
-  PortableInterceptor::ServerRequestInterceptor_var server_interceptor_;
+  Server_Request_Interceptor *server_interceptor_;
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index 81b29ec8b2e..cc5df510bab 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -15,6 +15,8 @@ Server_Request_Interceptor::Server_Request_Interceptor (void)
 
 Server_Request_Interceptor::~Server_Request_Interceptor (void)
 {
+  CORBA::release (this->obj_[0]);
+  CORBA::release (this->obj_[1]);
 }
 
 void
@@ -22,7 +24,6 @@ Server_Request_Interceptor::forward_references (
   CORBA::Object_ptr obj1,
   CORBA::Object_ptr obj2,
   CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
     ACE_THROW (CORBA::INV_OBJREF (
@@ -43,14 +44,6 @@ Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::release (this->obj_[0]);
-  CORBA::release (this->obj_[1]);
-}
-
-void
 Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri
     TAO_ENV_ARG_DECL)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
index dc9fb709d2b..5e888a0e412 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h
@@ -22,7 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ServerRequestInterceptorC.h"
+#include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
@@ -55,23 +55,21 @@
  * See the README file for test details.
  */
 class Server_Request_Interceptor
-  : public virtual ForwardRequestTest::ServerRequestInterceptor,
+  : public virtual PortableInterceptor::ServerRequestInterceptor,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
 
-  /// Constructor.
+  /// Constructorl
   Server_Request_Interceptor (void);
 
   /// Destructor.
   ~Server_Request_Interceptor (void);
 
   /// Set the references to which requests will be forwarded.
-  virtual void forward_references (CORBA::Object_ptr obj1,
-                                   CORBA::Object_ptr obj2,
-                                   CORBA::Environment &ACE_TRY_ENV =
-                                     TAO_default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void forward_references (CORBA::Object_ptr obj1,
+                           CORBA::Object_ptr obj2,
+                           CORBA::Environment &ACE_TRY_ENV);
 
   /**
    * @name Methods Required by the Server Request Interceptor
@@ -86,9 +84,6 @@ public:
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void receive_request_service_contexts (
       PortableInterceptor::ServerRequestInfo_ptr ri
       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
index 08d3520bdbb..6556e3ecae7 100755
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl
@@ -7,51 +7,52 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$file1 = PerlACE::LocalFile ("test1.ior");
-$file2 = PerlACE::LocalFile ("test2.ior");
-
-unlink $file1;
-unlink $file2;
-
-$SV = new PerlACE::Process ("server", "-o $file1 -o $file2");
-$CL = new PerlACE::Process ("client", "-k file://$file1 -k file://$file2");
-
-$status = 0;
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 print STDERR "\n\n==== Running PortableInterceptor::ForwardRequest test\n";
 
-$SV->Spawn ();
+$file1 = "$cwd$DIR_SEPARATOR" . "test1.ior";
+$file2 = "$cwd$DIR_SEPARATOR" . "test2.ior";
 
-if (PerlACE::waitforfile_timed ($file1, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file1>\n";
-    $SV->Kill ();
-    exit 1;
-}
+unlink $file1;
+unlink $file2;
 
-if (PerlACE::waitforfile_timed ($file2, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file2>\n";
-    $SV->Kill ();
-    exit 1;
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-o $file1 -o $file2");
+if (ACE::waitforfile_timed ($file1, 15) == -1
+    || ACE::waitforfile_timed ($file2, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$file1> or <$file2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       "-k file://$file1 -k file://$file2");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($client == -1 || $server == -1) {
+  exit 1;
 }
 
 unlink $file1;
 unlink $file2;
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor b/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
index 28af1eb92ec..00fdcad6121 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
@@ -11,7 +11,6 @@ TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 OBJFILES = \
 	$(OBJDIR)\testC.obj \
 	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\ServerRequestInterceptorC.obj \
 	$(OBJDIR)\server.obj \
 	$(OBJDIR)\test_i.obj \
 	$(OBJDIR)\Server_Request_Interceptor.obj \
@@ -28,8 +27,7 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB)
 
 IDLFILES = \
-	$(IDLDIR)\test.idl \
-	$(IDLDIR)\ServerRequestInterceptor.idl
+	$(IDLDIR)\test.idl
 
 CPPDIR = .
 
@@ -43,6 +41,3 @@ IDLDIR = .
 
 $(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
 	$(TAO_IDL) $**
-
-$(IDLDIR)\ServerRequestInterceptorC.cpp: $(IDLDIR)\ServerRequestInterceptor.idl
-	$(TAO_IDL) -DCORBA3 -I..\..\.. $**
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index 9eadd3a9241..ee0cac207b7 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -75,9 +75,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+        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"),
@@ -156,23 +154,12 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Set the forward references in the server request interceptor.
-      PortableInterceptor::ServerRequestInterceptor_var
-        server_interceptor = temp_initializer->server_interceptor ();
+      Server_Request_Interceptor *server_interceptor =
+        temp_initializer->server_interceptor ();
 
-      ForwardRequestTest::ServerRequestInterceptor_var interceptor =
-        ForwardRequestTest::ServerRequestInterceptor::_narrow (
-           server_interceptor.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (interceptor.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Could not obtain reference to "
-                           "server request interceptor.\n"),
-                          -1);
-
-      interceptor->forward_references (obj1.in (),
-                                       obj2.in (),
-                                       ACE_TRY_ENV);
+      server_interceptor->forward_references (obj1.in (),
+                                              obj2.in (),
+                                              ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
       // Write each IOR to a file.
@@ -202,12 +189,6 @@ main (int argc, char *argv[])
       orb->run (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp
index dcaf8a8a497..f57acf02934 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp
@@ -101,10 +101,6 @@ SOURCE=.\Server_Request_Interceptor.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\ServerRequestInterceptorC.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\test_i.cpp

 # End Source File

 # Begin Source File

@@ -129,19 +125,15 @@ SOURCE=.\Server_Request_Interceptor.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ServerRequestInterceptorC.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\test_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\testC.h

+SOURCE=.\testS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\testS.h

+SOURCE=.\testS_T.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"

@@ -149,89 +141,6 @@ SOURCE=.\testS.h
 # PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=.\ServerRequestInterceptor.idl

-

-!IF  "$(CFG)" == "ForwardRequest Server - Win32 Release"

-

-USERDEP__SERVE="..\..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build

-InputPath=.\ServerRequestInterceptor.idl

-InputName=ServerRequestInterceptor

-

-BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Ge 1  -I ..\..\.. -DCORBA3 $(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)" == "ForwardRequest Server - Win32 Debug"

-

-USERDEP__SERVE="..\..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build

-InputPath=.\ServerRequestInterceptor.idl

-InputName=ServerRequestInterceptor

-

-BuildCmds= \

-	..\..\..\..\bin\tao_idl -Ge 1 -I ..\..\.. -DCORBA3 $(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=.\test.idl

 

 !IF  "$(CFG)" == "ForwardRequest Server - Win32 Release"

@@ -320,10 +229,6 @@ BuildCmds= \
 # PROP Default_Filter ".i"

 # Begin Source File

 

-SOURCE=.\ServerRequestInterceptorC.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\testC.i

 # End Source File

 # Begin Source File

diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
index edd9b01080e..c1ed912b164 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp
@@ -13,10 +13,6 @@ test_i::test_i (CORBA::Short num,
 {
 }
 
-test_i::~test_i (void)
-{
-}
-
 CORBA::Short
 test_i::number (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
index 261f380aba6..0498d1a778e 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h
@@ -33,9 +33,6 @@ public:
   test_i (CORBA::Short num,
           CORBA::ORB_ptr orb);
 
-  /// Destructor.
-  ~test_i (void);
-
   /// Return the number assigned to this object.
   virtual CORBA::Short number (CORBA::Environment &ACE_TRY_ENV =
                                  TAO_default_environment ())
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index f583ef93960..f8ead94c273 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -16,12 +16,6 @@ FOO_ClientRequestInterceptor::name (
 }
 
 void
-FOO_ClientRequestInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 FOO_ClientRequestInterceptor::send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri
       TAO_ENV_ARG_DECL)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
index 6dd2180d9de..f9238e40361 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h
@@ -57,13 +57,10 @@ public:
    * methods required for all client request interceptors.
    */
   //@{
-  /// Return the name of this ClientRequestInterceptor.
+  /// Return the name of this ClientRequestinterceptor.
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void send_request (
       PortableInterceptor::ClientRequestInfo_ptr ri
       TAO_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
index 975e89e0d64..9382f62e4de 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp
@@ -3,9 +3,7 @@
 #include "FOO_IORInterceptor.h"
 #include "testC.h"
 
-ACE_RCSID (IORInterceptor,
-           FOO_IORInterceptor,
-           "$Id$")
+ACE_RCSID (IORInterceptor, FOO_IORInterceptor, "$Id$")
 
 char *
 FOO_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -15,12 +13,6 @@ FOO_IORInterceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-FOO_IORInterceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 FOO_IORInterceptor::establish_components (
     PortableInterceptor::IORInfo_ptr info
     TAO_ENV_ARG_DECL)
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
index b828827ef6f..e44a38ddee7 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h
@@ -59,10 +59,6 @@ public:
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  /// Cleanup resources acquired by this IORInterceptor.
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   /// Add the tagged components to the IOR.
   virtual void establish_components (
       PortableInterceptor::IORInfo_ptr info
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
index 5675008c909..1b6cf1435dd 100755
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl
@@ -5,41 +5,48 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 # $Id$
 
-use lib  '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$SV = new PerlACE::Process ("server", "-o $file");
-$CL = new PerlACE::Process ("client", "-k file://$file");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 print STDERR "\n\n==== Running IORInterceptor test\n";
 
-$SV->Spawn ();
+$file = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill (); 
-    exit 1;
+unlink $file;
+
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-o $file");
+if (ACE::waitforfile_timed ($file, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       "-k file://$file");
+
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($client == -1 || $server == -1) {
+  exit 1;
 }
 
 unlink $file;
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
index 2376a251a28..add486026f7 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "interceptors.h"
-#include "tao/OctetSeqC.h"
+
 
 ACE_RCSID (Service_Context_Manipulation,
            interceptors,
@@ -45,12 +45,6 @@ Echo_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Echo_Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Echo_Client_Request_Interceptor::send_poll (
     PortableInterceptor::ClientRequestInfo_ptr
     TAO_ENV_ARG_DECL_NOT_USED)
@@ -100,7 +94,11 @@ Echo_Client_Request_Interceptor::send_request (
   sc.context_id = request_ctx_id;
 
   CORBA::ULong string_len = ACE_OS::strlen (request_msg) + 1;
-  CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len);
+  CORBA::Octet *buf = 0;
+  ACE_NEW_THROW_EX (buf,
+                    CORBA::Octet [string_len],
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
   ACE_OS::strcpy (ACE_reinterpret_cast (char *, buf), request_msg);
 
   sc.context_data.replace (string_len, string_len, buf, 1);
@@ -231,12 +229,6 @@ Echo_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-Echo_Server_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
 Echo_Server_Request_Interceptor::receive_request_service_contexts (
     PortableInterceptor::ServerRequestInfo_ptr ri
     TAO_ENV_ARG_DECL)
@@ -277,7 +269,11 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   scc.context_id = reply_ctx_id;
 
   CORBA::ULong string_len = ACE_OS::strlen (reply_msg) + 1;
-  CORBA::Octet *buff = CORBA::OctetSeq::allocbuf (string_len);
+  CORBA::Octet *buff = 0;
+  ACE_NEW_THROW_EX (buff,
+                    CORBA::Octet [string_len],
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK;
 
   ACE_OS::strcpy (ACE_reinterpret_cast (char *, buff), reply_msg);
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
index a9fad3502c8..6fd281721b9 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.h
@@ -40,10 +40,8 @@ public:
 
   virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  // Canonical name of the interceptor.
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -100,9 +98,6 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Canonical name of the interceptor.
 
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
                                 TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
index 51c67cc0c58..9bb90119a31 100755
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl
@@ -5,41 +5,48 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require Process;
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$SV = new PerlACE::Process ("server", "-ORBobjrefstyle url -o $file");
-$CL = new PerlACE::Process ("client", "-ORBobjrefstyle url -f file://$file");
+$cwd = getcwd();
+ACE::checkForTarget($cwd);
 
 print STDERR "\n\n==== Running interceptor test\n";
 
-$SV->Spawn ();
+$file = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
+unlink $file;
+
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-ORBobjrefstyle url -o $file");
+if (ACE::waitforfile_timed ($file, 15) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       "-ORBobjrefstyle url -f file://$file");
+
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($client == -1 || $server == -1) {
+  exit 1;
 }
 
 unlink $file;
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index 5ec3f7347e0..9c9c881077c 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -9,7 +9,7 @@
 //   client.h
 //
 // = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
+//   Balachandran  Natarajan <bala@cs.wustl.edu>
 //
 // ============================================================================
 
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 33acfad1cd2..63cd1d0929b 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -71,8 +71,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Queued_Message_Test/Makefile b/TAO/tests/Queued_Message_Test/Makefile
new file mode 100644
index 00000000000..176100a9d75
--- /dev/null
+++ b/TAO/tests/Queued_Message_Test/Makefile
@@ -0,0 +1,154 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#       Local macros
+#----------------------------------------------------------------------------
+
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+LDLIBS = -lTAO
+
+IDL_FILES =
+IDL_SRC =
+BIN = Queued_Message_Test
+
+SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC)
+
+QUEUED_MESSAGE_OBJS = Queued_Message_Test.o
+
+TAO_IDLFLAGS += -Ge 1
+#----------------------------------------------------------------------------
+#       Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(TAO_ROOT)/taoconfig.mk
+
+#----------------------------------------------------------------------------
+#       Local targets
+#----------------------------------------------------------------------------
+
+.PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext))
+
+Queued_Message_Test: $(addprefix $(VDIR),$(QUEUED_MESSAGE_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK)
+
+realclean: clean
+	-$(RM) $(foreach ext, $(IDL_EXT), Test$(ext))
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
+
+.obj/Queued_Message_Test.o .obj/Queued_Message_Test.so .shobj/Queued_Message_Test.o .shobj/Queued_Message_Test.so: Queued_Message_Test.cpp \
+ $(TAO_ROOT)/tao/Queued_Message.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Base.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ace_wchar.inl \
+ $(ACE_ROOT)/ace/OS_Errno.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Flag_Manip.h \
+ $(ACE_ROOT)/ace/Flag_Manip.i \
+ $(ACE_ROOT)/ace/Handle_Ops.h \
+ $(ACE_ROOT)/ace/Handle_Ops.i \
+ $(ACE_ROOT)/ace/Lib_Find.h \
+ $(ACE_ROOT)/ace/Lib_Find.i \
+ $(ACE_ROOT)/ace/Init_ACE.h \
+ $(ACE_ROOT)/ace/Init_ACE.i \
+ $(ACE_ROOT)/ace/Sock_Connect.h \
+ $(ACE_ROOT)/ace/Sock_Connect.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
+ $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(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_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
+ $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread_Adapter.inl \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_Allocator.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/varbase.h \
+ $(TAO_ROOT)/tao/TAO_Export.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Queued_Message.inl
+
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
new file mode 100644
index 00000000000..d21f93720ca
--- /dev/null
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -0,0 +1,156 @@
+// ============================================================================
+/**
+ * @brief Unit test for the TAO_Queued_Message class
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ */
+// ============================================================================
+
+#include "tao/Queued_Message.h"
+
+ACE_RCSID(tests, Queued_Message_Test, "$Id$")
+
+/// Max number of bytes on each message block
+const size_t max_block_length = 256;
+
+/// Create a message block chain of at most 64 elements
+const size_t max_chain_length = 64;
+
+/// Add a new message at the tail of the queue.
+static void add_message (TAO_Queued_Message *&head,
+                         TAO_Queued_Message *&tail,
+                         ACE_RANDR_TYPE &seed)
+{
+  // ACE_DEBUG ((LM_DEBUG, "Adding message\n"));
+  // First build a message block chain
+  size_t chain_length =
+    1 + ACE_OS::rand_r(seed) % max_chain_length;
+  ACE_Message_Block *mb = 0;
+  for (size_t j = 0; j != chain_length; ++j)
+    {
+      size_t block_size =
+        64 + ACE_OS::rand_r(seed) % (max_block_length - 64);
+      ACE_Message_Block *cont = mb;
+      mb = new ACE_Message_Block (block_size);
+      mb->wr_ptr (block_size);
+      mb->cont (cont);
+    }
+  TAO_Queued_Message *msg =
+    new TAO_Queued_Message (mb, 1);
+  msg->push_back (head, tail);
+}
+
+/// Remove the message at the head of the queue, and simulate the
+/// behavior of the I/O subsystem when processing such messages.
+static void del_message (TAO_Queued_Message *&head,
+                         TAO_Queued_Message *&tail,
+                         ACE_RANDR_TYPE &seed)
+{
+  // ACE_DEBUG ((LM_DEBUG, "Removing message\n"));
+  TAO_Queued_Message *current = head;
+  current->remove_from_list (head, tail);
+
+  // Simulate message writing: each message is 'sent' using
+  // multiple write() calls, in this simulation, we call the
+  // bytes_transferred() method until all messages are removed.
+
+  size_t total_length = current->mb ()->total_length ();
+  while (total_length > 0)
+    {
+      // select how many bytes we want to 'send' in this iteration.
+      size_t t = ACE_OS::rand_r(seed) % 256 + 1;
+      if (t > total_length)
+        t = total_length;
+
+      current->bytes_transferred (t);
+      total_length -= t;
+    }
+  if (!current->done ())
+    {
+      ACE_ERROR ((LM_DEBUG,
+                  "ERROR: inconsistent state in Queued_Message\n"));
+      ACE_OS::exit (1);
+    }
+  current->destroy ();
+}
+
+int
+main (int, ACE_TCHAR *[])
+{
+
+  // Initialize a random seed to get better coverage.
+  // @@ The random seed and default values should be configurable
+  // using command line options.
+
+  ACE_hrtime_t current_hrtime = ACE_OS::gethrtime ();
+  ACE_UINT32 low_bits =
+    ACE_CU64_TO_CU32(current_hrtime);
+  ACE_RANDR_TYPE seed =
+    ACE_static_cast(ACE_RANDR_TYPE,low_bits);
+
+  ACE_DEBUG ((LM_DEBUG, "Running test SEED = %d\n", seed));
+
+  TAO_Queued_Message *head = 0;
+  TAO_Queued_Message *tail = 0;
+
+  int add_count = 0;
+  int del_count = 0;
+
+  const int iterations = 100;
+  int i;
+  for (i = 0; i != iterations; ++i)
+    {
+      add_message (head, tail, seed);
+      add_count++;
+      if (ACE_OS::rand_r(seed) % 100 > 90)
+        {
+          // every so often remove a message also.
+          if (head != 0)
+            {
+              del_message (head, tail, seed);
+              del_count++;
+            }
+        }
+    }
+
+  // second phase, change the probabilities of removing a message.
+  for (i = 0; i != iterations; ++i)
+    {
+      if (ACE_OS::rand_r(seed) % 100 > 90)
+        {
+          add_message (head, tail, seed); add_count++;
+        }
+      if (head != 0)
+        {
+          del_message (head, tail, seed);
+          del_count++;
+        }
+    }
+
+  // Go through a phase where all messages are removed.
+  while (head != 0)
+    {
+      del_message (head, tail, seed);
+      del_count++;
+    }
+
+  if (tail != 0)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "ERROR: inconsistent state in message queue\n"),
+                        1);
+    }
+
+  if (add_count != del_count)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "ERROR: mismatched (%d != %d) add and del counts\n",
+                         add_count, del_count),
+                        1);
+    }
+    
+
+  return 0;
+}
diff --git a/TAO/tests/CDR/allocator.dsp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsp
index 0b852c81342..33afc8707d1 100644
--- a/TAO/tests/CDR/allocator.dsp
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsp
@@ -1,33 +1,34 @@
-# Microsoft Developer Studio Project File - Name="CDR Allocator" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Queued_Message_Test" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=CDR Allocator - Win32 Debug

+CFG=Queued_Message_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 "allocator.mak".

+!MESSAGE NMAKE /f "Queued_Message_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 "allocator.mak" CFG="CDR Allocator - Win32 Debug"

+!MESSAGE NMAKE /f "Queued_Message_Test.mak" CFG="Queued_Message_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "CDR Allocator - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR Allocator - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Queued_Message_Test - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Queued_Message_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "CDR Allocator - Win32 Release"

+!IF  "$(CFG)" == "Queued_Message_Test - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -41,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 "../../../" /I "../../" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -50,9 +51,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao"

+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "CDR Allocator - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Queued_Message_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -66,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -75,17 +76,21 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao"

+# ADD LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "CDR Allocator - Win32 Release"

-# Name "CDR Allocator - Win32 Debug"

+# Name "Queued_Message_Test - Win32 Release"

+# Name "Queued_Message_Test - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\allocator.cpp

+SOURCE=.\Queued_Message_Test.cpp

 # End Source File

+# End Group

 # End Target

 # End Project

diff --git a/TAO/tests/Codec/Codec.dsw b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsw
index e486960cebe..03521d0402c 100644
--- a/TAO/tests/Codec/Codec.dsw
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "Codec Client"=.\client.dsp - Package Owner=<4>

+Project: "Queued_Message_Test"=.\Queued_Message_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tests/README b/TAO/tests/README
index e955d64a30a..e89d9835358 100644
--- a/TAO/tests/README
+++ b/TAO/tests/README
@@ -30,11 +30,6 @@ how to run the following tests:
           This directory contains several tests for the CDR stream
           class.
 
-        . Codec
-
-          This test verifies that CodecFactory and CDR encapsulation
-          Codec support is working properly.
-
         . Collocation
 
           This program performs a series of sanity check on the
@@ -51,7 +46,7 @@ how to run the following tests:
           A simple test for the DSI/DII gateway support. TAO can
           optimize some demarshaling/marshaling and data copying in
           the implementation of DSI/DII based gateways.
-
+          
         . DynAny_Test
 
           Tests TAO's DynAny feature, which allows composition and
@@ -69,7 +64,7 @@ how to run the following tests:
           This tests the methods work_pending() and perform_work()
           methods of the orb.
 
-        . Exposed_Policies          
+        . Explosed_Policies          
           
           This directory contains a test case used to verify that the
           client exposed policies get embedded correctly in the IOR
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index 088e884a9da..4ee9d671786 100755
--- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
+++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
@@ -5,20 +5,20 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
+$cwd = getcwd();
+$iorfile1 = "$cwd$DIR_SEPARATOR" . "test1.ior";
+$iorfile2 = "$cwd$DIR_SEPARATOR" . "test2.ior";
 
-$iorfile1 = PerlACE::LocalFile ("test1.ior");
-$iorfile2 = PerlACE::LocalFile ("test2.ior");
-$server_conf = PerlACE::LocalFile ("server.conf");
-
-unlink $iorfile1;
-unlink $iorfile2;
+ACE::checkForTarget($cwd);
 
 print STDERR "\n********** RTCORBA Priority Banded Connections Unit Test\n";
 
+unlink $iorfile1;
+unlink $iorfile2;
 
 # CORBA priorities 66, 75 and 80, etc. are for the SCHED_OTHER class on
 # Solaris.  May need to use different values for other platforms
@@ -26,7 +26,7 @@ print STDERR "\n********** RTCORBA Priority Banded Connections Unit Test\n";
 # available range.
 
 $server_args =
-    "-n $iorfile1 -o $iorfile2 -b bands.unix -ORBSvcConf $server_conf "
+    "-n $iorfile1 -o $iorfile2 -b bands.unix -ORBSvcConf server.conf "
     ."-ORBdebuglevel 1 -p 67 -w 78 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=66 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=75 "
@@ -36,9 +36,10 @@ $client_args =
     "-n file://$iorfile1 -o file://$iorfile2 "
     ."-a 76 -b 80 -c 64";
 
-if ($^O eq "MSWin32") {
+if ($^O eq "MSWin32")
+{
     $server_args =
-        "-n $iorfile1 -o $iorfile2 -b bands.nt -ORBSvcConf $server_conf "
+        "-n $iorfile1 -o $iorfile2 -b bands.nt -ORBSvcConf server.conf "
             ."-ORBdebuglevel 1 -p 1 -w 3 "
             ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=2 "
                 ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=5 "
@@ -49,35 +50,35 @@ if ($^O eq "MSWin32") {
             ."-a 4 -b 6 -c 3";
 }
 
-$SV = new PerlACE::Process ("server", $server_args);
-$CL = new PerlACE::Process ("client", $client_args);
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       $server_args);
 
-if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile2, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       $client_args);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (30);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile1;
 unlink $iorfile2;
 
-# Clean up SHMIOP files
-unlink glob ("server_shmiop_*");
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
index 36f3155daef..92f93b96a5b 100755
--- a/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Propagated/run_test.pl
@@ -5,42 +5,47 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-unlink $iorfile;
+ACE::checkForTarget($cwd);
 
 print STDERR "\n            RTCORBA CLIENT_PROPAGATED Priority Unit Test\n\n";
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile");
+unlink $iorfile;
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -k file://$iorfile");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (60);
-
-if ($server !=0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
index a977fb0b44a..e066e18d567 100755
--- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
@@ -5,19 +5,21 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
+$cwd = getcwd();
+$iorfile1 = "$cwd$DIR_SEPARATOR" . "test1.ior";
+$iorfile2 = "$cwd$DIR_SEPARATOR" . "test2.ior";
 
-$iorfile1 = PerlACE::LocalFile ("test1.ior");
-$iorfile2 = PerlACE::LocalFile ("test2.ior");
+ACE::checkForTarget($cwd);
+
+print STDERR "\n********** RTCORBA Client Protocol Policy Unit Test\n\n";
 
 unlink $iorfile1;
 unlink $iorfile2;
 
-print STDERR "\n********** RTCORBA Client Protocol Policy Unit Test\n\n";
-
 # Arguments are platform-dependent (UIOP not available on Windows).
 $server_args =
     "-s $iorfile1 -c $iorfile2 -p 1413566208 "
@@ -25,45 +27,47 @@ $server_args =
 $client_args =
     "-s file://$iorfile1 -c file://$iorfile2 -p 1413566210 -ORBdebuglevel 1 ";
 
-if ($^O eq "MSWin32") {
-    $server_args =
-        "-s $iorfile1 -c $iorfile2 -p 1413566210 "
-        ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
-    $client_args =
-        "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1";
+if ($^O eq "MSWin32")
+{
+$server_args =
+    "-s $iorfile1 -c $iorfile2 -p 1413566210 "
+    ."-ORBendpoint iiop:// -ORBendpoint shmiop:// ";
+$client_args =
+    "-s file://$iorfile1 -c file://$iorfile2 -ORBdebuglevel 1";
 }
 
 # Start server.
-$SV = new PerlACE::Process ("server", $server_args);
-$CL = new PerlACE::Process ("client", $client_args);
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       $server_args);
 
-if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile2, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
 # Start client.
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       $client_args);
+
+# Clean up.
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile1;
 unlink $iorfile2;
 
-# Clean up SHMIOP files
-unlink glob ("server_shmiop_*");
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/RTCORBA/Client_Protocol/svc.conf b/TAO/tests/RTCORBA/Client_Protocol/svc.conf
index 3dec1aece65..9af231e03ce 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/svc.conf
+++ b/TAO/tests/RTCORBA/Client_Protocol/svc.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
-static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop "
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
index 3d41c7f0c42..936e051a1c5 100755
--- a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
+++ b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
@@ -5,45 +5,49 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
 
 print STDERR "\n********** RTCORBA Explicit Binding Unit Test\n\n";
 
+unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile -ORBendpoint iiop:// -ORBendpoint shmiop://");
-$CL = new PerlACE::Process ("client", "-o file://$iorfile -ORBdebuglevel 1");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile "
+                       ."-ORBendpoint iiop:// "
+                       ."-ORBendpoint shmiop://");
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -o file://$iorfile -ORBdebuglevel 1 ");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-# Clean up SHMIOP files
-unlink glob ("server_shmiop_*");
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf
index 3dec1aece65..9af231e03ce 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/svc.conf
+++ b/TAO/tests/RTCORBA/Explicit_Binding/svc.conf
@@ -1,4 +1,2 @@
 #
-# $Id$
-#
-static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop "
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
index 6d9b05d6b39..7358044020e 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/process-output.pl
@@ -4,6 +4,10 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
+unshift @INC, '../../../../bin';
+require Process;
+require Uniqueid;
+
 # Usage:
 # process-output.pl output-filename number-of-iterations priority1 priority2
 
@@ -28,8 +32,6 @@ $iterations = $ARGV[1];
 $priority1 = $ARGV[2];
 $priority2 = $ARGV[3];
 
-$errors = 0;
-
 # Open the output file.
 if ($input_file and $ARGV[1])
 {
@@ -114,14 +116,12 @@ if ($server_shutdown == 0
     or $threads_finished == 0)
 {
     print "ERROR: Missing test over message\n";
-    ++$errors;
 }
 elsif ($iiop_requests != $shmiop_requests
        or $iiop_requests != $iterations)
 {
     print "ERROR: Number of iiop requests differs from shmiop differs from "
         ."number of iterations\n";
-    ++$errors;
 }
 elsif (($priority1 != $priority2 
         and ($priority1_requests != $priority2_requests
@@ -131,16 +131,12 @@ elsif (($priority1 != $priority2
                 or $priority1_requests != 2*$iterations)))
 {
     print "ERROR: Nonmatching number of requests of each priority\n";
-    ++$errors;
 }
 elsif ($test_method != 2*$iterations)
 {
     print "ERROR: Incorrect number servant invocations\n";
-    ++$errors;
 }
 else
 {
     print "Test output is ok \n";
 }
-
-exit $errors;
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
index 650ffcd2586..5fdd0e9e5ee 100755
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl
@@ -5,88 +5,78 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$quiet = 0;
-
-# check for -q flag
-if ($ARGV[0] eq '-q') {
-    $quiet = 1;
-}
+$cwd = getcwd();
 
 # Test parameters.
-$iorfile = PerlACE::LocalFile ("test.ior");
-$data_file = PerlACE::LocalFile ("test_run.data");
-
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
+$data_file = "$cwd$DIR_SEPARATOR" . "test_run.data";
 $iterations = 50;
 $priority1 = 65;
 $priority2 = 70;
 $priority3 = 75;
-
-if ($^O eq "MSWin32") {
+if ($^O eq "MSWin32")
+{
     $priority1 = 6;
     $priority2 = 1;
     $priority3 = 5;
 }
 
+ACE::checkForTarget($cwd);
+
 # Clean up leftovers from previous runs.
 unlink $iorfile;
 unlink $data_file;
 
-$server_conf = PerlACE::LocalFile ("server.conf");
 
 $server_args =
-    "-o $iorfile -ORBdebuglevel 1 -ORBsvcconf $server_conf "
+    "-o $iorfile -ORBdebuglevel 1 -ORBsvcconf server.conf "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority1 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority2 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=$priority3 "
-    ."-ORBendpoint shmiop://0/priority=$priority1 "
-    ."-ORBendpoint shmiop://0/priority=$priority2 "
-    ."-ORBendpoint shmiop://0/priority=$priority3 ";
+    ."-ORBendpoint shmiop://$TARGETHOSTNAME:0/priority=$priority1 "
+    ."-ORBendpoint shmiop://$TARGETHOSTNAME:0/priority=$priority2 "
+    ."-ORBendpoint shmiop://$TARGETHOSTNAME:0/priority=$priority3 ";
 
 $client_args =
     "-o file://$iorfile  "
     ."-a $priority1 -b $priority2 -e 1413566210 -f 0 -n $iterations";
 
-$SV = new PerlACE::Process ("server", $server_args);
-$CL = new PerlACE::Process ("client", $client_args);
 
 print STDERR "\n********** MT Client Protocol & CLIENT_PROPAGATED combo Test\n\n";
 
 # Redirect the output of the test run to a file, so that we can process it later.
-
 open (OLDOUT, ">&STDOUT");
 open (STDOUT, ">$data_file") or die "can't redirect stdout: $!";
 open (OLDERR, ">&STDERR");
 open (STDERR, ">&STDOUT") or die "can't redirect stderror: $!";
 
-# just here to quiet warnings
-$fh = \*OLDOUT;
-$fh = \*OLDERR;
-
 # Run server and client.
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       $server_args);
 
-if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       $client_args);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 close (STDERR);
@@ -96,32 +86,18 @@ open (STDERR, ">&OLDERR");
 
 unlink $iorfile;
 
-# Run a processing script on the test output.
-print STDERR "\n********** Processing test output\n\n";
-
-$errors = system ("perl process-output.pl $data_file $iterations $priority1 $priority2") >> 8;
-
-if ($errors > 0) {
-    $status = 1;
-
-    if (!$quiet) {
-        print STDERR "Errors Detected, printing output\n";
-        if (open (DATA, "<$data_file")) {
-            print STDERR "================================= Begin\n";
-            print STDERR <DATA>;
-            print STDERR "================================= End\n";
-            close (DATA);
-        }
-        else {
-            print STDERR "ERROR: Could not open $data_file\n";
-        }
-        unlink $data_file;
-    }
+if ($server != 0 || $client != 0) {
+  exit 1;
 }
 
-unlink $iorfile;
-
-# Clean up shmiop files
-unlink glob ("server_shmiop_*");
+# Run a processing script on the test output.
+$FL = Process::Create ($EXEPREFIX."process-output.pl",
+                       " $data_file $iterations $priority1 $priority2");
+$filter = $FL->TimedWait (60);
+if ($filter == -1) {
+  print STDERR "ERROR: filter timedout\n";
+  $FL->Kill (); $FL->TimedWait (1);
+}
+  print STDERR "\n";
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/RTCORBA/Private_Connection/run_test.pl b/TAO/tests/RTCORBA/Private_Connection/run_test.pl
index 46efef27cba..08f02da64b8 100755
--- a/TAO/tests/RTCORBA/Private_Connection/run_test.pl
+++ b/TAO/tests/RTCORBA/Private_Connection/run_test.pl
@@ -5,45 +5,51 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
+$cwd = getcwd();
+$iorfile1 = "$cwd$DIR_SEPARATOR" . "test1.ior";
+$iorfile2 = "$cwd$DIR_SEPARATOR" . "test2.ior";
 
-$iorfile1 = PerlACE::LocalFile ("test1.ior");
-$iorfile2 = PerlACE::LocalFile ("test2.ior");
-
-unlink $iorfile1;
-unlink $iorfile2;
+ACE::checkForTarget($cwd);
 
 print STDERR "\n********** RTCORBA Private Connection Unit Test\n\n";
 
-$SV = new PerlACE::Process ("server", "-o $iorfile1 -p $iorfile2");
-$CL = new PerlACE::Process ("client", "-o file://$iorfile1 -p file://$iorfile2 -ORBdebuglevel 3 ");
+unlink $iorfile1;
+unlink $iorfile2;
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile1 -p $iorfile2 ");
 
-if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile2, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -o file://$iorfile1 -p file://$iorfile2 "
+                       ."-ORBdebuglevel 3 ");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server \n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile1;
 unlink $iorfile2;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/RTCORBA/RTMutex/run_test.pl b/TAO/tests/RTCORBA/RTMutex/run_test.pl
index e123f4ea033..702f8d599f7 100755
--- a/TAO/tests/RTCORBA/RTMutex/run_test.pl
+++ b/TAO/tests/RTCORBA/RTMutex/run_test.pl
@@ -5,18 +5,29 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd();
+
+ACE::checkForTarget($cwd);
 
 print STDERR "\n********** RTCORBA RTMutex Unit Test **********\n\n";
+$server_args="";
 
-$T = new PerlACE::Process ("server");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       $server_args);
 
-$test = $T->SpawnWaitKill (60);
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
+if ($server != 0) {
+  print STDERR "ERROR: server returned $server\n";
+  exit 1;
 }
 
 exit 0;
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index 237c9cb03dd..8c69fcc2800 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -98,7 +98,6 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
   return 0;
 }
 
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
 static int
 test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
 {
@@ -160,6 +159,10 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
 
         larry_mutex2->unlock (ACE_TRY_ENV);
         ACE_TRY_CHECK;
+
+        rt_orb->destroy_mutex (larry_mutex2.in (),
+                               ACE_TRY_ENV);
+        ACE_TRY_CHECK;
       }
 
       // test opening the mutex
@@ -181,6 +184,9 @@ test_named_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
 
         larry_mutex3->unlock (ACE_TRY_ENV);
         ACE_TRY_CHECK;
+
+        rt_orb->destroy_mutex (larry_mutex3.in (), ACE_TRY_ENV);
+        ACE_TRY_CHECK;
       }
 
       // Make sure that nothing has been broken behind the scenes.
@@ -239,7 +245,6 @@ test_named_mutex_exception (RTCORBA::RTORB_ptr rt_orb)
 
   return 0;
 }
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
 #if defined (ACE_HAS_THREADS)
 const size_t MAX_ITERATIONS=10;
@@ -533,7 +538,6 @@ main (int argc, char *argv[])
                            "test_mutex_simple failed\n"),
                           1);
 
-#if (TAO_HAS_NAMED_RT_MUTEXES == 1)
       if (test_named_mutex_simple (rt_orb.in ()) != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "test_named_mutex_simple failed\n"),
@@ -543,11 +547,6 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "test_named_mutex_exception failed\n"),
                           1);
-#else
-      ACE_DEBUG ((LM_DEBUG,
-                  "Named RT_Mutex support is not enabled. "
-                  "Skipping Named RT_Mutex tests.\n"));
-#endif /* TAO_HAS_NAMED_RT_MUTEXES == 1 */
 
 #if defined (ACE_HAS_THREADS)
 
diff --git a/TAO/tests/RTCORBA/Server_Declared/run_test.pl b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
index d6367af3a5f..a2c4e48a50b 100755
--- a/TAO/tests/RTCORBA/Server_Declared/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Declared/run_test.pl
@@ -5,17 +5,20 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$iorfile1 = PerlACE::LocalFile ("test1.ior");
-$iorfile2 = PerlACE::LocalFile ("test2.ior");
+$cwd = getcwd();
+$iorfile1 = "$cwd$DIR_SEPARATOR" . "test1.ior";
+$iorfile2 = "$cwd$DIR_SEPARATOR" . "test2.ior";
 
-unlink $iorfile1;
-unlink $iorfile2;
+ACE::checkForTarget($cwd);
 
+print STDERR "\n********** RTCORBA SERVER_DECLARED Priority Unit Test\n\n";
 
-$server_conf = PerlACE::LocalFile ("server.conf");
+unlink $iorfile1;
+unlink $iorfile2;
 
 # CORBA priorities 65, 70 and 75 are for the SCHED_OTHER class on
 # Solaris.  May need to use different values for other platforms
@@ -23,14 +26,15 @@ $server_conf = PerlACE::LocalFile ("server.conf");
 # available range.
 
 $server_args =
-    "-p $iorfile1 -o $iorfile2 -a 65 -b 75 -c 70 -ORBSvcConf $server_conf "
+    "-p $iorfile1 -o $iorfile2 -a 65 -b 75 -c 70 -ORBSvcConf server.conf "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=65 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=75 "
     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=73 ";
 
-if ($^O eq "MSWin32") {
+if ($^O eq "MSWin32")
+{
     $server_args =
-        "-p $iorfile1 -o $iorfile2 -a 3 -b 5 -c 2 -ORBSvcConf $server_conf "
+        "-p $iorfile1 -o $iorfile2 -a 3 -b 5 -c 2 -ORBSvcConf server.conf "
             ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=3 "
                 ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=5 "
                     ."-ORBendpoint iiop://$TARGETHOSTNAME:0/priority=1 ";
@@ -38,35 +42,35 @@ if ($^O eq "MSWin32") {
 
 $client_args = "-p file://$iorfile1 -o file://$iorfile2";
 
-$SV = new PerlACE::Process ("server", $server_args);
-$CL = new PerlACE::Process ("client", $client_args);
-
-print STDERR "\n********** RTCORBA SERVER_DECLARED Priority Unit Test\n\n";
-
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       $server_args);
 
-if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile2, 10) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile2>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       $client_args);
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (60);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile1;
 unlink $iorfile2;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
index 7ff8c15bac4..97576d62193 100755
--- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
+++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
@@ -5,33 +5,61 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
+
+print STDERR "********** RTCORBA Server Protocol Policy Unit Test\n";
+
+
+sub server
+{
+  my $args = "@_ "."-o $iorfile";
+
+  unlink $iorfile;
+  $SV = Process::Create ($EXEPREFIX."server$EXE_EXT ", $args);
 
-$server_reverse_conf    = PerlACE::LocalFile ("server_reverse.conf");
-$server_shmiop_conf     = PerlACE::LocalFile ("server_shmiop.conf");
-$server_reverse_nt_conf = PerlACE::LocalFile ("server_reverse_nt.conf");
+  if (ACE::waitforfile_timed ($iorfile, 10) == -1) {
+    print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
+    $SV->Kill (); $SV->TimedWait (1);
+    exit 1;
+  }
+}
+
+sub client
+{
+  my $args = " -k file://$iorfile -ORBdebuglevel 1";
+
+  $CL = Process::Create ($EXEPREFIX."client$EXE_EXT ", $args);
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+      print STDERR "ERROR: client timedout\n";
+      $CL->Kill (); $CL->TimedWait (1);
+  }
+}
 
 # Configurations for all tests to be run.
 @server_opts =
     ("-ORBendpoint iiop://",
 
-     "-ORBsvcconf $server_reverse_conf "
+     "-ORBsvcconf server_reverse.conf "
      ."-ORBEndpoint uiop:// -ORBendpoint shmiop:// -ORBendpoint iiop://",
 
-     "-ORBsvcconf $server_shmiop_conf -ORBendpoint shmiop://",
+     "-ORBsvcconf server_shmiop.conf -ORBendpoint shmiop://",
 
      "-ORBEndpoint uiop:// "
      ." -ORBendpoint shmiop:// -ORBendpoint iiop://"
-     ." -ORBsvcconf $server_shmiop_conf -p 1413566208",
+     ." -ORBsvcconf server_shmiop.conf -p 1413566208",
 
      "-ORBEndpoint uiop:// "
      ." -ORBendpoint shmiop:// -ORBendpoint iiop://"
-     ." -ORBsvcconf $server_shmiop_conf -p 1413566210 ");
+     ." -ORBsvcconf server_shmiop.conf -p 1413566210 ");
 
 @comments = ("* ORB Default Server Protocol Policy Test\n          "
              ."(TAO's default behavior without config files): \n",
@@ -49,74 +77,48 @@ $server_reverse_nt_conf = PerlACE::LocalFile ("server_reverse_nt.conf");
              ."          (POA Server Protocol set to SHMIOP only): \n");
 
 # UIOP only available on Unix.  Substitute with alternative tests on Windows.
-if ($^O eq "MSWin32") {
+if ($^O eq "MSWin32")
+{
     @server_opts =
         ("-ORBendpoint iiop://",
 
-         "-ORBsvcconf $server_reverse_nt_conf "
+         "-ORBsvcconf server_reverse_nt.conf "
          ."-ORBEndpoint shmiop:// -ORBendpoint iiop://",
 
-         "-ORBsvcconf $server_shmiop_conf -ORBendpoint shmiop://",
+         "-ORBsvcconf server_shmiop.conf -ORBendpoint shmiop://",
 
          "-ORBendpoint shmiop:// -ORBendpoint iiop://"
-         ." -ORBsvcconf $server_shmiop_conf -p 0",
+         ." -ORBsvcconf server_shmiop.conf -p 0",
 
          "-ORBendpoint shmiop:// -ORBendpoint iiop://"
-         ." -ORBsvcconf $server_shmiop_conf -p 1413566210");
+         ." -ORBsvcconf server_shmiop.conf -p 1413566210");
 
     $comments[3] =
         "Overriding ORB Default Server Protocol Policy in the POA "
             ."(POA Server Protocol set to IIOP only): \n";
 }
 
-print STDERR "********** RTCORBA Server Protocol Policy Unit Test\n";
 
 $test_number = 0;
 
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
-
-
-foreach $o (@server_opts) {
+foreach $o (@server_opts)
+{
     print STDERR "\n\n----------------------------------\n";
     print STDERR "        ".$comments[$test_number];
 
-    my $args = "$o -o $iorfile";
+    server ($o);
 
-    unlink $iorfile;
-    
-    $SV->Arguments ($args);
-    
-    $SV->Spawn ();
+    client ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
-        print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
+    $SV->Terminate ();
+    $server = $SV->TimedWait (60);
+    if ($server == -1) {
+        print STDERR "ERROR: server timedout\n";
         $SV->Kill (); $SV->TimedWait (1);
-        exit 1;
-    }
-
-    $CL->Arguments ("-k file://$iorfile -ORBdebuglevel 1");
-
-    $client = $CL->SpawnWaitKill (60);
-    
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
-    }
-
-    $server = $SV->TerminateWaitKill (60);
-    
-    if ($server != 0) {
-        print STDERR "ERROR: server returned $server\n";
-        $status = 1;
     }
 
     $test_number++;
 }
 
 unlink $iorfile;
-
-# Clean up SHMIOP files
-unlink glob ("server_shmiop_*");
-
-exit $status;
+exit 0;
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf
index 0d327c4b5bb..696318541b7 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse.conf
@@ -1,5 +1,4 @@
-#
 # $Id$
 #
-static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop "
 static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory UIOP_Factory -ORBProtocolFactory IIOP_Factory "
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
index 8e1c2731946..f413062d4ca 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_reverse_nt.conf
@@ -1,6 +1,5 @@
-#
 # $Id$
 #
-static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop "
 static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory -ORBProtocolFactory IIOP_Factory"
 
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf b/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf
index f9ea85a4167..c4cd69aa3ce 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf
+++ b/TAO/tests/RTCORBA/Server_Protocol/server_shmiop.conf
@@ -1,5 +1,4 @@
 #
-# $Id$
 #
-static SHMIOP_Factory "-MMAPFilePrefix server_shmiop"
+dynamic SHMIOP_Factory Service_Object *TAO_Strategies:_make_TAO_SHMIOP_Protocol_Factory () "-MMAPFilePrefix server_shmiop "
 static Resource_Factory "-ORBProtocolFactory SHMIOP_Factory "
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index d229244c8d1..59ae6518638 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -99,16 +99,16 @@ main (int argc, char **argv)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      test::data the_data0 (data_bytes);
-      the_data0.length (data_bytes);
+      test::data data (data_bytes);
+      data.length (data_bytes);
 
       data_bytes *= 10;
-      test::data the_data1 (data_bytes);
-      the_data1.length (data_bytes);
+      test::data data1 (data_bytes);
+      data.length (data_bytes);
 
       data_bytes /= 100;
-      test::data the_data2 (data_bytes);
-      the_data2.length (data_bytes);
+      test::data data2 (data_bytes);
+      data.length (data_bytes);
 
       for (CORBA::ULong i = 1; i <= iterations; ++i)
         {
@@ -118,19 +118,19 @@ main (int argc, char **argv)
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data0,
+                               data,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data1,
+                               data1,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data2,
+                               data2,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index b84f0bc46a3..6707dd21ce4 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -87,7 +87,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run (ACE_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp
index 86704d8ba2d..67bf5899caa 100644
--- a/TAO/tests/Single_Read/test_i.cpp
+++ b/TAO/tests/Single_Read/test_i.cpp
@@ -18,12 +18,6 @@ test_i::method (CORBA::ULong request_number,
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("server: Iteration %d @ %T\n"),
               request_number));
-
-  // Time required to process this request.
-  ACE_Time_Value work_time (0,
-                            3000 * 1000);
-
-  ACE_OS::sleep (work_time);
 }
 
 void
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Makefile b/TAO/tests/Smart_Proxies/Benchmark/Makefile
index 9ee83217fe7..28320305426 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Makefile
+++ b/TAO/tests/Smart_Proxies/Benchmark/Makefile
@@ -61,20 +61,18 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
+.obj/Smart_Proxy_Impl.o .obj/Smart_Proxy_Impl.so .shobj/Smart_Proxy_Impl.o .shobj/Smart_Proxy_Impl.so: Smart_Proxy_Impl.cpp Smart_Proxy_Impl.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
  $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
  $(ACE_ROOT)/ace/OS_String.inl \
@@ -88,54 +86,51 @@ realclean: clean
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.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/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -145,16 +140,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -165,337 +158,33 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(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.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i Smart_Proxy_Impl.h \
- $(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/Stats.h \
- $(ACE_ROOT)/ace/Basic_Stats.h \
- $(ACE_ROOT)/ace/Basic_Stats.inl \
- $(ACE_ROOT)/ace/Stats.i
-
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -505,21 +194,25 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -529,64 +222,10 @@ realclean: clean
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -596,296 +235,76 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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 \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServerC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
  $(TAO_ROOT)/tao/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- testS_T.h testS_T.i testS_T.cpp testS.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-
-.obj/Smart_Proxy_Impl.o .obj/Smart_Proxy_Impl.so .shobj/Smart_Proxy_Impl.o .shobj/Smart_Proxy_Impl.so: Smart_Proxy_Impl.cpp Smart_Proxy_Impl.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(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/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/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 \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -893,128 +312,38 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -1025,48 +354,40 @@ realclean: clean
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+ $(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/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/MessagingS.i \
  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/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
  $(ACE_ROOT)/ace/OS_String.inl \
@@ -1076,51 +397,55 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.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/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -1130,16 +455,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -1150,9 +473,33 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(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.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1162,21 +509,25 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -1186,26 +537,89 @@ realclean: clean
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServerC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(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/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/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 \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1213,128 +627,38 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -1345,49 +669,40 @@ realclean: clean
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(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/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ testC.i
 
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
  $(ACE_ROOT)/ace/OS_String.inl \
@@ -1397,51 +712,55 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.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/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -1451,16 +770,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -1471,9 +788,33 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(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.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1483,21 +824,25 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -1507,26 +852,89 @@ realclean: clean
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServerC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(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/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/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 \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1534,128 +942,38 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -1666,64 +984,26 @@ realclean: clean
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- testS_T.h testS_T.i testS_T.cpp testS.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(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/PortableServer/Key_Adapters.i \
- $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(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/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ 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/Smart_Proxies/Benchmark/run_test.pl b/TAO/tests/Smart_Proxies/Benchmark/run_test.pl
index 6bd51348b82..4f1511c74df 100755
--- a/TAO/tests/Smart_Proxies/Benchmark/run_test.pl
+++ b/TAO/tests/Smart_Proxies/Benchmark/run_test.pl
@@ -5,40 +5,45 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
+
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
+
+ACE::checkForTarget($cwd);
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
 unlink $iorfile;
 
 print STDERR "\nrunning Smart Proxy test consisting of the client and the server\n\n";
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-i file://$iorfile");
-
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                        "-i file://$iorfile");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($client != 0 || server != 0) {
+  exit 1;
+}
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index 5538302b111..6ff0b93ec3f 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -49,7 +49,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb)
 }
 
 CORBA::Short
-Test_i::box_prices (CORBA::Environment &)
+Test_i::box_prices (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125;
@@ -57,17 +57,17 @@ Test_i::box_prices (CORBA::Environment &)
 
 CORBA::Long 
 Test_i::tickets (CORBA::Short number,
-                 CORBA::Environment &)
+                 CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 125 * number;
 }
 
 void
-Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Test_i::shutdown (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown ();
 }
 
 static const char *ior_output_file = 0;
@@ -116,9 +116,8 @@ main (int argc, char *argv[])
       Test_i servant (orb.in ());      
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
+        orb->resolve_initial_references ("RootPOA", 
                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
       
       PortableServer::POA_var root_poa = 
         PortableServer::POA::_narrow (object.in (),
@@ -159,9 +158,11 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "orb->run"),
+                          -1);
       ACE_DEBUG ((LM_DEBUG,
                   "event loop finished\n"));
 
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index cfe0ba58e66..e2e0bc922f7 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -34,8 +34,7 @@ Collocation_Test::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV)
 
   // Get an Object reference to RootPOA.
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("RootPOA");
 
   // Narrow the Object reference to a POA reference
   this->root_poa_ =
diff --git a/TAO/tests/Smart_Proxies/Collocation/svc.conf b/TAO/tests/Smart_Proxies/Collocation/svc.conf
index 16f01bef61e..c278301c9bf 100644
--- a/TAO/tests/Smart_Proxies/Collocation/svc.conf
+++ b/TAO/tests/Smart_Proxies/Collocation/svc.conf
@@ -4,11 +4,11 @@
 #
 
 # This is a single threaded "server."
-static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null  -ORBConnectionCacheLock null"
+static Resource_Factory "-ORBResources global -ORBReactorType select_st -ORBInputCDRAllocator null"
 
 # Make sure we use RW client handler so if something goes wrong, the program will bloc,
 # i.e., won't work.
-static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW"
+static Client_Strategy_Factory "-ORBProfileLock null -ORBClientConnectionHandler RW -ORBConnectorLock null"
 
 # Not absolutely necessary for this test, but we add it for fun.
 static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock null"
diff --git a/TAO/tests/Smart_Proxies/Makefile b/TAO/tests/Smart_Proxies/Makefile
index 6d2923535d4..d1107be083f 100644
--- a/TAO/tests/Smart_Proxies/Makefile
+++ b/TAO/tests/Smart_Proxies/Makefile
@@ -43,8 +43,8 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS  += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS +=
 
 .PRECIOUS: testC.h testC.i testC.cpp
 .PRECIOUS: testS.h testS.i testS.cpp
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Makefile b/TAO/tests/Smart_Proxies/On_Demand/Makefile
index b925e343ad0..f5f289f258b 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Makefile
+++ b/TAO/tests/Smart_Proxies/On_Demand/Makefile
@@ -56,8 +56,8 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS  += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS +=
 
 .PRECIOUS: testC.h testC.i testC.cpp
 .PRECIOUS: testS.h testS.i testS.cpp
diff --git a/TAO/tests/Smart_Proxies/On_Demand/run_test.pl b/TAO/tests/Smart_Proxies/On_Demand/run_test.pl
index fa5d9031263..107851f02c1 100755
--- a/TAO/tests/Smart_Proxies/On_Demand/run_test.pl
+++ b/TAO/tests/Smart_Proxies/On_Demand/run_test.pl
@@ -5,41 +5,44 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-i file://$iorfile");
+unlink $iorfile;
 
 print STDERR "\nrunning Smart Proxy test consisting of the client and the server\n\n";
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                     " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT ", "-i file://$iorfile");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (10);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($client != 0 || server != 0) {
+  exit 1;
+}
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index d72e3068539..79975e2e1d2 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -27,7 +27,7 @@ class Test_i : public POA_Test
 {
 public:
   Test_i (CORBA::ORB_ptr orb);
-
+  
   CORBA::Short method  (CORBA::Short boo,
                         CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -38,7 +38,7 @@ public:
 
 private:
   CORBA::ORB_var orb_;
-
+  
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb)
@@ -110,14 +110,14 @@ main (int argc, char *argv[])
                                             "",
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      Test_i servant (orb.in ());
+      
+      Test_i servant (orb.in ());      
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
+        orb->resolve_initial_references ("RootPOA", 
                                          ACE_TRY_ENV);
-
-      PortableServer::POA_var root_poa =
+      
+      PortableServer::POA_var root_poa = 
         PortableServer::POA::_narrow (object.in (),
                                       ACE_TRY_ENV);
 
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file =
+          FILE *output_file = 
             ACE_OS::fopen (ior_output_file, "w");
 
           if (output_file == 0)
@@ -156,10 +156,13 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "orb->run"),
+                          -1);
+      ACE_DEBUG ((LM_DEBUG,
+                  "event loop finished\n"));
 
       root_poa->destroy (1,
                          1,
@@ -175,3 +178,6 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
+
+
+
diff --git a/TAO/tests/Smart_Proxies/Policy/Makefile b/TAO/tests/Smart_Proxies/Policy/Makefile
index cf512af1e4c..0e51a2e3e5b 100644
--- a/TAO/tests/Smart_Proxies/Policy/Makefile
+++ b/TAO/tests/Smart_Proxies/Policy/Makefile
@@ -43,6 +43,7 @@ include $(TAO_ROOT)/taoconfig.mk
 #----------------------------------------------------------------------------
 
 LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS +=
 
 .PRECIOUS: testC.h testC.i testC.cpp
 .PRECIOUS: testS.h testS.i testS.cpp
@@ -60,20 +61,18 @@ realclean: clean
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
+.obj/Smart_Proxy_Impl.o .obj/Smart_Proxy_Impl.so .shobj/Smart_Proxy_Impl.o .shobj/Smart_Proxy_Impl.so: Smart_Proxy_Impl.cpp Smart_Proxy_Impl.h testC.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
  $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
  $(ACE_ROOT)/ace/OS_String.inl \
@@ -87,54 +86,51 @@ realclean: clean
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Get_Opt.i testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.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/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -144,16 +140,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -164,329 +158,33 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(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.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i Smart_Proxy_Impl.h
-
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp testS.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -496,21 +194,25 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -520,64 +222,10 @@ realclean: clean
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
  $(TAO_ROOT)/tao/ValueBase.i \
@@ -587,296 +235,76 @@ realclean: clean
  $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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 \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServerC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
  $(TAO_ROOT)/tao/RTCORBAC.h \
  $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
- $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/operation_details.h \
- $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- testS_T.h testS_T.i testS_T.cpp testS.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-
-.obj/Smart_Proxy_Impl.o .obj/Smart_Proxy_Impl.so .shobj/Smart_Proxy_Impl.o .shobj/Smart_Proxy_Impl.so: Smart_Proxy_Impl.cpp Smart_Proxy_Impl.h testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/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/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(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/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/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 \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -884,128 +312,38 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -1016,48 +354,40 @@ realclean: clean
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
+ $(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/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/MessagingS.i \
  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/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
  $(ACE_ROOT)/ace/OS_String.inl \
@@ -1067,51 +397,55 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.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/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -1121,16 +455,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -1141,9 +473,33 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(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.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1153,21 +509,25 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -1177,26 +537,89 @@ realclean: clean
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServerC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(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/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/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 \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1204,128 +627,38 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -1336,49 +669,40 @@ realclean: clean
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(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/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ testC.i
 
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
  $(ACE_ROOT)/ace/OS_String.inl \
@@ -1388,51 +712,55 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.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/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/Containers.i \
@@ -1442,16 +770,14 @@ realclean: clean
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
  $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
@@ -1462,9 +788,33 @@ realclean: clean
  $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(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.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
@@ -1474,21 +824,25 @@ realclean: clean
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
+ $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/PolicyC.i \
@@ -1498,26 +852,89 @@ realclean: clean
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/ValueBase.h \
+ $(TAO_ROOT)/tao/ValueBase.i \
+ $(TAO_ROOT)/tao/ValueFactory.h \
+ $(TAO_ROOT)/tao/ValueFactory.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/PollableC.i \
+ $(TAO_ROOT)/tao/Smart_Proxies.h \
+ $(TAO_ROOT)/tao/Smart_Proxies.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.h \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
+ $(TAO_ROOT)/tao/TAO_Singleton.cpp \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
+ $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/PortableServerC.h \
+ $(TAO_ROOT)/tao/PortableServerC.i \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(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/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/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 \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1525,128 +942,38 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_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/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
- $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
- $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
- $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
- $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
@@ -1657,64 +984,26 @@ realclean: clean
  $(TAO_ROOT)/tao/target_specification.h \
  $(TAO_ROOT)/tao/target_specification.i \
  $(TAO_ROOT)/tao/operation_details.i \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
  $(TAO_ROOT)/tao/ObjectIDList.h \
  $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/ClientRequestInfo.h \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- testC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- testS_T.h testS_T.i testS_T.cpp testS.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Pair.h \
- $(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/PortableServer/Key_Adapters.i \
- $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(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/MessagingS_T.h \
+ $(TAO_ROOT)/tao/MessagingS_T.i \
+ $(TAO_ROOT)/tao/MessagingS_T.cpp \
+ $(TAO_ROOT)/tao/MessagingS.i \
+ 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/Smart_Proxies/Policy/run_test.pl b/TAO/tests/Smart_Proxies/Policy/run_test.pl
index 0ff69078181..ac709742a4b 100755
--- a/TAO/tests/Smart_Proxies/Policy/run_test.pl
+++ b/TAO/tests/Smart_Proxies/Policy/run_test.pl
@@ -5,108 +5,110 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile1 = PerlACE::LocalFile ("test1.ior");
-$iorfile2 = PerlACE::LocalFile ("test2.ior");
+$cwd = getcwd();
+$iorfile1 = "$cwd$DIR_SEPARATOR" . "test1.ior";
+$iorfile2 = "$cwd$DIR_SEPARATOR" . "test2.ior";
+
+ACE::checkForTarget($cwd);
 
 unlink $iorfile1;
 unlink $iorfile2;
 
-$SV1 = new PerlACE::Process ("server", "-o $iorfile1");
-$SV2 = new PerlACE::Process ("server", "-o $iorfile2");
-$CL  = new PerlACE::Process ("client", "-i file://$iorfile1 -j file://$iorfile2");
-
 print STDERR "\nrunning Smart Proxy test consisting of the client and two servers with <one-shot> policy\n\n";
 
-$SV1->Spawn ();
+$SV1 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile1");
 
-if (PerlACE::waitforfile_timed ($iorfile1, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile1>\n";
-    $SV1->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile1, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile1>\n";
+  $SV1->Kill (); $SV1->TimedWait (1);
+  exit 1;
 }
 
-$SV2->Spawn ();
+$SV2 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile2");
 
-if (PerlACE::waitforfile_timed ($iorfile2, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV1->Kill ();
-    $SV2->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile2, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile2>\n";
+  $SV2->Kill (); $SV2->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                        "-i file://$iorfile1 -j file://$iorfile2");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV1->WaitKill (10);
-
-if ($server == -1) {
-    print STDERR "ERROR: server 1 returned $server\n";
-    $status = 1;
+$server1 = $SV1->TimedWait (10);
+if ($server1 == -1) {
+  print STDERR "ERROR: server1 timedout\n";
+  $SV1->Kill (); $SV1->TimedWait (1);
 }
 
 unlink $iorfile1;
 
-$server = $SV2->WaitKill (10);
-
-if ($server == -1) {
-    print STDERR "ERROR: server 2 returned $server\n";
-    $status = 1;
+$server2 = $SV2->TimedWait (10);
+if ($server2 == -1) {
+  print STDERR "ERROR: server2 timedout\n";
+  $SV2->Kill (); $SV2->TimedWait (1);
 }
 
 unlink $iorfile2;
 
+
 print STDERR "\nrunning Smart Proxy test consisting of the client and two servers with <one-shot> policy disabled\n\n";
 
-$SV1->Spawn ();
+$SV1 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile1");
 
-if (PerlACE::waitforfile_timed ($iorfile1, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile1>\n";
-    $SV1->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile1, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile1>\n";
+  $SV1->Kill (); $SV1->TimedWait (1);
+  exit 1;
 }
 
-$SV2->Spawn ();
+$SV2 = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile2");
 
-if (PerlACE::waitforfile_timed ($iorfile2, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile2>\n";
-    $SV1->Kill ();
-    $SV2->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile2, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile2>\n";
+  $SV2->Kill (); $SV2->TimedWait (1);
+  exit 1;
 }
 
-$CL->Arguments ("-f0 -i file://$iorfile1 -j file://$iorfile2");
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                        "-f0 -i file://$iorfile1 -j file://$iorfile2");
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV1->WaitKill (10);
-
-if ($server == -1) {
-    print STDERR "ERROR: server 1 returned $server\n";
-    $status = 1;
+$server1 = $SV1->TimedWait (10);
+if ($server1 == -1) {
+  print STDERR "ERROR: server1 timedout\n";
+  $SV1->Kill (); $SV1->TimedWait (1);
 }
 
 unlink $iorfile1;
 
-$server = $SV2->WaitKill (10);
-
-if ($server == -1) {
-    print STDERR "ERROR: server 2 returned $server\n";
-    $status = 1;
+$server2 = $SV2->TimedWait (10);
+if ($server2 == -1) {
+  print STDERR "ERROR: server2 timedout\n";
+  $SV2->Kill (); $SV2->TimedWait (1);
 }
 
 unlink $iorfile2;
 
-exit $status;
+if ($client != 0 || server != 0) {
+  exit 1;
+}
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 518e3d4fc1a..22768dc39b3 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -62,10 +62,10 @@ Test_i :: method (CORBA::Short boo,
 }
 
 void
-Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Test_i::shutdown (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown ();
 }
 
 static const char *ior_output_file = 0;
@@ -114,9 +114,8 @@ main (int argc, char *argv[])
       Test_i servant (orb.in ());      
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
+        orb->resolve_initial_references ("RootPOA", 
                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
       
       PortableServer::POA_var root_poa = 
         PortableServer::POA::_narrow (object.in (),
@@ -157,9 +156,11 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "orb->run"),
+                          -1);
       ACE_DEBUG ((LM_DEBUG,
                   "event loop finished\n"));
 
diff --git a/TAO/tests/Smart_Proxies/client.dsp b/TAO/tests/Smart_Proxies/client.dsp
index 7d11300d2af..28f538deef8 100644
--- a/TAO/tests/Smart_Proxies/client.dsp
+++ b/TAO/tests/Smart_Proxies/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/tests/Smart_Proxies/run_test.pl b/TAO/tests/Smart_Proxies/run_test.pl
index 10b76ffd9ef..b6e9fff38d0 100755
--- a/TAO/tests/Smart_Proxies/run_test.pl
+++ b/TAO/tests/Smart_Proxies/run_test.pl
@@ -5,41 +5,45 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
+$cwd = getcwd();
+$iorfile = "$cwd$DIR_SEPARATOR" . "test.ior";
 
-unlink $iorfile;
+ACE::checkForTarget($cwd);
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-i file://$iorfile");
+unlink $iorfile;
 
 print STDERR "\nrunning Smart Proxy test consisting of the client and the server\n\n";
 
-$SV->Spawn ();
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+		       " -o $iorfile");
 
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL  = Process::Create ($EXEPREFIX."client$EXE_EXT",
+                        "-i file://$iorfile");
 
+$client = $CL->TimedWait (60);
 if ($client == -1) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (10);
-
+$server = $SV->TimedWait (10);
 if ($server == -1) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($client != 0 || server != 0) {
+  exit 1;
+}
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index bc3396c04d9..22768dc39b3 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -27,7 +27,7 @@ class Test_i : public POA_Test
 {
 public:
   Test_i (CORBA::ORB_ptr orb);
-
+  
   CORBA::Short method  (CORBA::Short boo,
                         CORBA::Environment &ACE_TRY_ENV)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -38,7 +38,7 @@ public:
 
 private:
   CORBA::ORB_var orb_;
-
+  
 };
 
 Test_i::Test_i (CORBA::ORB_ptr orb)
@@ -110,14 +110,14 @@ main (int argc, char *argv[])
                                             "",
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
-      Test_i servant (orb.in ());
+      
+      Test_i servant (orb.in ());      
       // Obtain RootPOA.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
+        orb->resolve_initial_references ("RootPOA", 
                                          ACE_TRY_ENV);
-
-      PortableServer::POA_var root_poa =
+      
+      PortableServer::POA_var root_poa = 
         PortableServer::POA::_narrow (object.in (),
                                       ACE_TRY_ENV);
 
@@ -138,7 +138,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file =
+          FILE *output_file = 
             ACE_OS::fopen (ior_output_file, "w");
 
           if (output_file == 0)
@@ -156,10 +156,13 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "orb->run"),
+                          -1);
+      ACE_DEBUG ((LM_DEBUG,
+                  "event loop finished\n"));
 
       root_poa->destroy (1,
                          1,
@@ -175,3 +178,6 @@ main (int argc, char *argv[])
   ACE_ENDTRY;
   return 0;
 }
+
+
+
diff --git a/TAO/tests/Smart_Proxies/server.dsp b/TAO/tests/Smart_Proxies/server.dsp
index 5722aab9860..fe1963f2d64 100644
--- a/TAO/tests/Smart_Proxies/server.dsp
+++ b/TAO/tests/Smart_Proxies/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/tests/Strategies/README b/TAO/tests/Strategies/README
index be8a14fedd6..e724a0fbc9e 100644
--- a/TAO/tests/Strategies/README
+++ b/TAO/tests/Strategies/README
@@ -18,3 +18,10 @@ advanced strategies are used.
 
 	The test can be run using the perl script available or
 manually.
+
+
+
+	
+
+
+	
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index e7410c871a0..fb876200dca 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -87,9 +87,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      if (orb->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1, 1, ACE_TRY_ENV);
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 86ce08e0086..f0f53a77c7c 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -271,8 +271,8 @@ main (int argc, char **argv)
                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      test::data the_data (data_bytes);
-      the_data.length (data_bytes);
+      test::data data (data_bytes);
+      data.length (data_bytes);
 
       for (CORBA::ULong i = 1; i <= iterations; ++i)
         {
@@ -282,7 +282,7 @@ main (int argc, char **argv)
 
           // Invoke the oneway method.
           test_object->method (i,
-                               the_data,
+                               data,
                                work,
                                ACE_TRY_ENV);
           ACE_TRY_CHECK;
diff --git a/TAO/tests/Timed_Buffered_Oneways/run_test.pl b/TAO/tests/Timed_Buffered_Oneways/run_test.pl
index 2d47ba4442e..2fadcbd6f1b 100755
--- a/TAO/tests/Timed_Buffered_Oneways/run_test.pl
+++ b/TAO/tests/Timed_Buffered_Oneways/run_test.pl
@@ -7,6 +7,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib "../../../bin";
 use PerlACE::Run_Test;
+use Cwd;
 
 $iorfile = PerlACE::LocalFile ("ior");
 
@@ -18,27 +19,28 @@ $CL = new PerlACE::Process ("client", "-k file://$iorfile -x");
 $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
 $client = $CL->SpawnWaitKill (200);
 
-if ($client != 0) {
-    $time = localtime;
-    print STDERR "ERROR: client returned $client at $time\n";
-    $status = 1;
+if ($client == -1) {
+  $time = localtime;
+  print STDERR "ERROR: client timedout at $time\n";
 }
 
 $server = $SV->WaitKill (100);
-
-if ($server != 0) {
-    $time = localtime;
-    print STDERR "ERROR: server returned $server at $time\n";
-    $status = 1;
+if ($server == -1) {
+  $time = localtime;
+  print STDERR "ERROR: server timedout at $time\n";
 }
 
 unlink $iorfile;
 
-exit $status;
+if ($server != 0 || $client != 0) {
+  exit 1;
+}
+
+exit 0;
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index b84f0bc46a3..6707dd21ce4 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -87,7 +87,8 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      if (orb->run (ACE_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 951411992b0..786bfbf88f9 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -66,8 +66,7 @@ send_echo (CORBA::ORB_ptr orb,
       // Sleep so the server can send the reply...
       ACE_Time_Value tv (max_timeout / 1000,
                          (max_timeout % 1000) * 1000);
-      orb->run (tv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run (tv);
     }
   ACE_ENDTRY;
 }
diff --git a/TAO/tests/Timeout/client.dsp b/TAO/tests/Timeout/client.dsp
index c5debacb5ac..3e2dfbf30ce 100644
--- a/TAO/tests/Timeout/client.dsp
+++ b/TAO/tests/Timeout/client.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

diff --git a/TAO/tests/Timeout/run_test.pl b/TAO/tests/Timeout/run_test.pl
index ca1399d3acc..017d45036b1 100755
--- a/TAO/tests/Timeout/run_test.pl
+++ b/TAO/tests/Timeout/run_test.pl
@@ -5,38 +5,44 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
+unshift @INC, '../../../bin';
+require ACEutils;
+use Cwd;
 
+$cwd = getcwd();
 $status = 0;
 
-$iorfile = PerlACE::LocalFile ("server.ior");
+$iorfile = "$cwd$DIR_SEPARATOR" . "server.ior";
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("server", "-o $iorfile");
-$CL = new PerlACE::Process ("client", "-ORBDebugLevel 0 -k file://$iorfile -l 2 -h 28");
+ACE::checkForTarget($cwd);
 
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT ",
+                       " -o $iorfile");
 
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
+if (ACE::waitforfile_timed ($iorfile, 5) == -1) {
+  print STDERR "ERROR: cannot find file <$iorfile>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client$EXE_EXT ",
+                       " -ORBDebugLevel 0"
+                       ." -k file://$iorfile "
+                       . " -l 2 -h 28");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
+  $status = 1;
 }
 
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  $status = 1;
 }
 
 unlink $iorfile;
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index 33e49416cdc..30f7e1c872c 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
         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;
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
       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;
@@ -89,8 +89,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
     }
diff --git a/TAO/tests/Timeout/server.dsp b/TAO/tests/Timeout/server.dsp
index bb5ea34e252..d362990c185 100644
--- a/TAO/tests/Timeout/server.dsp
+++ b/TAO/tests/Timeout/server.dsp
@@ -37,7 +37,7 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

diff --git a/TAO/tests/Xt_Stopwatch/Makefile b/TAO/tests/Xt_Stopwatch/Makefile
index 2f34c19db94..a252b7391e2 100644
--- a/TAO/tests/Xt_Stopwatch/Makefile
+++ b/TAO/tests/Xt_Stopwatch/Makefile
@@ -200,22 +200,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -223,18 +287,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -243,11 +301,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -268,21 +321,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -290,52 +328,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -348,6 +351,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -364,17 +369,38 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ testC.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ Control.h Client.h \
+ $(TAO_ROOT)/tao/xt_resource.h \
+ $(TAO_ROOT)/tao/default_resource.h \
+ $(TAO_ROOT)/tao/default_resource.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/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 \
+ $(TAO_ROOT)/tao/xt_resource.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 \
@@ -518,22 +544,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -541,18 +631,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -561,11 +645,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -586,21 +665,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -608,52 +672,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -666,6 +695,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -682,18 +713,18 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  testC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
@@ -702,13 +733,28 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
  testS_T.h testS_T.i testS_T.cpp testS.i timer.h Stopwatch_display.h \
+ test_i.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/xt_resource.h \
+ $(TAO_ROOT)/tao/default_resource.h \
+ $(TAO_ROOT)/tao/default_resource.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/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 \
+ $(TAO_ROOT)/tao/xt_resource.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 \
@@ -852,22 +898,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -875,18 +985,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -895,11 +999,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -920,21 +1019,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -942,52 +1026,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -1000,6 +1049,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1016,18 +1067,18 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  testC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
@@ -1036,11 +1087,8 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- testS_T.h testS_T.i testS_T.cpp testS.i timer.h Stopwatch_display.h
+ testS_T.h testS_T.i testS_T.cpp testS.i timer.h Stopwatch_display.h \
+ test_i.i
 
 .obj/Stopwatch_display.o .obj/Stopwatch_display.so .shobj/Stopwatch_display.o .shobj/Stopwatch_display.so: Stopwatch_display.cpp Stopwatch_display.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1184,22 +1232,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1207,18 +1319,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -1227,11 +1333,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -1252,21 +1353,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1274,52 +1360,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -1332,6 +1383,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1348,15 +1401,16 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h
 
 .obj/Control.o .obj/Control.so .shobj/Control.o .shobj/Control.so: Control.cpp Control.h Client.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1500,22 +1554,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1523,18 +1641,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -1543,11 +1655,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -1568,21 +1675,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1590,52 +1682,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -1648,6 +1705,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1664,16 +1723,35 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ testC.i \
+ $(TAO_ROOT)/tao/xt_resource.h \
+ $(TAO_ROOT)/tao/default_resource.h \
+ $(TAO_ROOT)/tao/default_resource.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/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 \
+ $(TAO_ROOT)/tao/xt_resource.i
 
 .obj/timer.o .obj/timer.so .shobj/timer.o .shobj/timer.so: timer.cpp timer.h Stopwatch_display.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -1817,22 +1895,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1840,18 +1982,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -1860,11 +1996,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -1885,21 +2016,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -1907,52 +2023,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -1965,6 +2046,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -1981,15 +2064,16 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2133,22 +2217,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -2156,18 +2304,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -2176,11 +2318,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -2201,21 +2338,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -2223,52 +2345,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -2281,6 +2368,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -2297,17 +2386,17 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
+ testC.i
 
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
@@ -2451,22 +2540,86 @@ realclean: clean
  $(TAO_ROOT)/tao/OctetSeqC.i \
  $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
- $(TAO_ROOT)/tao/Tagged_Profile.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_State.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/IOPC.h \
  $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Message_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/GIOPC.i \
  $(TAO_ROOT)/tao/Tagged_Profile.i \
- $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
  $(TAO_ROOT)/tao/TAO_Server_Request.i \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
  $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Test_and_Set.h \
+ $(ACE_ROOT)/ace/Test_and_Set.i \
+ $(ACE_ROOT)/ace/Test_and_Set.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/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_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/Process_Mutex.h \
+ $(ACE_ROOT)/ace/Process_Mutex.inl \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
  $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -2474,18 +2627,12 @@ realclean: clean
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
  $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/MProfile.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -2494,11 +2641,6 @@ realclean: clean
  $(TAO_ROOT)/tao/TAO_Singleton.h \
  $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_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/Adapter.h \
  $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
@@ -2519,21 +2661,6 @@ realclean: clean
  $(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_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/Parser_Registry.h \
  $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
@@ -2541,52 +2668,17 @@ realclean: clean
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
  $(TAO_ROOT)/tao/Cache_Entries.h \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.h \
+ $(TAO_ROOT)/tao/Base_Connection_Property.h \
  $(TAO_ROOT)/tao/Endpoint.h \
  $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Connection_Descriptor_Interface.inl \
+ $(TAO_ROOT)/tao/Base_Connection_Property.inl \
  $(TAO_ROOT)/tao/Cache_Entries.inl \
  $(TAO_ROOT)/tao/Connection_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
- $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
  $(TAO_ROOT)/tao/Interceptor_List.inl \
- $(TAO_ROOT)/tao/RT_Policy_i.h \
- $(TAO_ROOT)/tao/RTCORBAS.h \
- $(TAO_ROOT)/tao/IOPS.h \
- $(TAO_ROOT)/tao/IOPS_T.h \
- $(TAO_ROOT)/tao/IOPS_T.i \
- $(TAO_ROOT)/tao/IOPS_T.cpp \
- $(TAO_ROOT)/tao/IOPS.i \
- $(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/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.h \
- $(TAO_ROOT)/tao/RTCORBAS_T.i \
- $(TAO_ROOT)/tao/RTCORBAS_T.cpp \
- $(TAO_ROOT)/tao/RTCORBAS.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
- $(TAO_ROOT)/tao/Protocols_Hooks.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/debug.h \
@@ -2599,6 +2691,8 @@ realclean: clean
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
+ $(TAO_ROOT)/tao/RTCORBAC.h \
+ $(TAO_ROOT)/tao/RTCORBAC.i \
  $(TAO_ROOT)/tao/Priority_Mapping.i \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
  $(TAO_ROOT)/tao/TAOC.i \
@@ -2615,18 +2709,18 @@ realclean: clean
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
  $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
  $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
+ $(TAO_ROOT)/tao/InterfaceC.h \
+ $(TAO_ROOT)/tao/ifrfwd.h \
  $(TAO_ROOT)/tao/BoundsC.h \
  $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
  $(TAO_ROOT)/tao/PortableInterceptor.i \
- $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
+ $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
+ $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  testC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
@@ -2635,10 +2729,6 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
  testS_T.h testS_T.i testS_T.cpp testS.i \
  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
@@ -2660,7 +2750,6 @@ realclean: clean
  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
- $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/PortableServer/Operation_Table.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Xt_Stopwatch/run_test.pl b/TAO/tests/Xt_Stopwatch/run_test.pl
index 546d8c8b716..57d8fdfbfc4 100755
--- a/TAO/tests/Xt_Stopwatch/run_test.pl
+++ b/TAO/tests/Xt_Stopwatch/run_test.pl
@@ -5,41 +5,43 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # $Id$
 # -*- perl -*-
 
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("test.ior");
-
-unlink $file;
-
-$SV = new PerlACE::Process ("server", "-o $file");
-$CL = new PerlACE::Process ("client", "file://$file");
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
 
 print STDERR "\n\n==== XtReactor demo test\n";
 
-$SV->Spawn ();
+$file="test.ior";
 
-if (PerlACE::waitforfile_timed ($file, 3) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill (); 
-    exit 1;
+unlink $file;
+
+$SV = Process::Create ($EXEPREFIX."server".$EXE_EXT,
+                       "-o $file");
+if (ACE::waitforfile_timed ($file, 3) == -1) {
+  print STDERR "ERROR: cannot find file <$file>\n";
+  $SV->Kill (); $SV->TimedWait (1);
+  exit 1;
 }
 
-$client = $CL->SpawnWaitKill (60);
+$CL = Process::Create ($EXEPREFIX."client".$EXE_EXT,
+                       "file://$file");
 
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
+$client = $CL->TimedWait (60);
+if ($client == -1) {
+  print STDERR "ERROR: client timedout\n";
+  $CL->Kill (); $CL->TimedWait (1);
 }
 
-$server = $SV->WaitKill (5);
+$server = $SV->TimedWait (5);
+if ($server == -1) {
+  print STDERR "ERROR: server timedout\n";
+  $SV->Kill (); $SV->TimedWait (1);
+}
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
+if ($client == -1 || $server == -1) {
+  exit 1;
 }
 
 unlink $file;
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index e7c69d49af1..4b98a3f1d71 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -81,8 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->resolve_initial_references("RootPOA");
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/ior_corbaloc/Makefile b/TAO/tests/ior_corbaloc/Makefile
index 32760d469d4..8b09c3054c3 100644
--- a/TAO/tests/ior_corbaloc/Makefile
+++ b/TAO/tests/ior_corbaloc/Makefile
@@ -15,7 +15,7 @@ endif # ! TAO_ROOT
 IDL_FILES = corbaloc
 IDL_SRC = corbalocC corbalocS
 
-LDLIBS = -lTAO_CosNaming -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_PortableServer -lTAO -lTAO_CosNaming
 #CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 BIN = server client
 
diff --git a/TAO/tests/ior_corbaloc/run_test.pl b/TAO/tests/ior_corbaloc/run_test.pl
index 973496f2489..819ac3ee1c6 100755
--- a/TAO/tests/ior_corbaloc/run_test.pl
+++ b/TAO/tests/ior_corbaloc/run_test.pl
@@ -8,100 +8,131 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This is a Perl Script that runs the corbaloc: style URL tests.
 # It starts the servers and client.
 
-use lib "../../../bin";
-use PerlACE::Run_Test;
+#use lib "../../../bin";
 
-$status = 0;
+unshift @INC, '../../../bin';
+require Process;
+require ACEutils;
+require Uniqueid;
+use Cwd;
 
+$cwd = getcwd();
 # Amount of delay (in seconds) between starting a server and a client
 # to allow proper server initialization.
 $sleeptime = 8;
 
 # Variables for command-line arguments to client and server
 # executables.
-$ns_multicast_port = 10001 + PerlACE::uniqueid (); # Can not be 10000 on Chorus 4.0
-$ns_orb_port = 12000 + PerlACE::uniqueid ();
-$iorfile = PerlACE::LocalFile ("ns.ior");
+$ns_multicast_port = 10001 + uniqueid (); # Can not be 10000 on Chorus 4.0
+$ns_orb_port = 12000 + uniqueid ();
+$iorfile = "$cwd$DIR_SEPARATOR" . "ns.ior";
+
+ACE::checkForTarget($cwd);
+
+sub name_server
+{
+  my $args = "@_"." -ORBnameserviceport $ns_multicast_port -o $iorfile";
+  my $prog = $EXEPREFIX."..$DIR_SEPARATOR..$DIR_SEPARATOR..$DIR_SEPARATOR".
+      "TAO".$DIR_SEPARATOR."orbsvcs".$DIR_SEPARATOR.
+	"Naming_Service".$DIR_SEPARATOR.
+          "Naming_Service".$EXE_EXT;
+
+  # Make sure the files are gone, so we can wait on them.
+  unlink $iorfile;
+
+  $NS = Process::Create ($prog, $args);
+
+  if (ACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
+    print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
+    $NS->Kill (); $NS->TimedWait (1);
+    exit 1;
+  }
+}
+
+sub server 
+{
+  my $args = "@_"." -ORBInitRef NameService=file://$iorfile";
+  my $prog = $EXEPREFIX."server".$EXE_EXT;
+
+  $SR = Process::Create ($prog, $args);
+
+  $server = $SR->TimedWait (20);
+}
+
+sub client
+{
+  my $args = "@_"." -ORBInitRef NameService=file://$iorfile";
+  my $prog = $EXEPREFIX."client".$EXE_EXT;
+
+  $CL = Process::Create ($prog, $args);
+
+  $client = $CL->TimedWait (60);
+  if ($client == -1) {
+      print STDERR "ERROR: client timedout\n";
+      $CL->Kill (); $CL->TimedWait (1);
+    }
+}
 
 # Options for all simple tests recognized by the 'client' program.
 @opts = ("corbaloc:rir:/NameService",
-         "corbaloc:rir:/",
-         "corbaloc:iiop://$TARGETHOSTNAME:$ns_orb_port/NameService",
-         "corbaloc:iiop://:$ns_orb_port/NameService",
-         "corbaloc:///NameService",
-         "corbaloc://$TARGETHOSTNAME:$ns_orb_port/NameService");
+	 "corbaloc:rir:/",
+	 "corbaloc:iiop://$TARGETHOSTNAME:$ns_orb_port/NameService",
+	 "corbaloc:iiop://:$ns_orb_port/NameService",
+	 "corbaloc:///NameService",
+	 "corbaloc://$TARGETHOSTNAME:$ns_orb_port/NameService");
 
 
 $def_port = 2809;
 
 @name_server_opts = ("-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port",
-                     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port",
-                     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port",
-                     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port",
-                     "-ORBEndPoint iiop://$TARGETHOSTNAME:$def_port",
-                     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port");
+		     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port",
+		     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port",
+		     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port",
+		     "-ORBEndPoint iiop://$TARGETHOSTNAME:$def_port",
+		     "-ORBEndPoint iiop://$TARGETHOSTNAME:$ns_orb_port");
 
 
 @comments = ("Using RIR protocol with the Key object specified: \n",
-             "Using RIR protocol without specifying the key object: \n",
-             "Using IIOP protocol with the hostname, port specified: \n",
-             "Using IIOP protocol with the hostname unspecified but port specified: \n",
-             "Using IIOP protocol with both hostname & port unspecified: \n",
-             "Using the default protocol (iiop) with the hostname, port specified: \n");
+	     "Using RIR protocol without specifying the key object: \n",
+	     "Using IIOP protocol with the hostname, port specified: \n",
+	     "Using IIOP protocol with the hostname unspecified but port specified: \n",
+	     "Using IIOP protocol with both hostname & port unspecified: \n",
+	     "Using the default protocol (iiop) with the hostname, port specified: \n");
 
 $test_number = 0;
 
 # Run the naming service, server. Run the client for each of the test. 
 # Client uses ior in a file to bootstrap to the server.
 
-$SR = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
-$NS = new PerlACE::Process ("../../orbsvcs/Naming_Service/Naming_Service");
+foreach $o (@opts)
+{  
+  name_server ($name_server_opts [$test_number]);
 
-foreach $o (@opts) {  
-    # Make sure the files are gone, so we can wait on them.
-    unlink $iorfile;
+  print STDERR "\n          ".$comments[$test_number];
 
-    $NS->Arguments ($name_server_opts [$test_number]
-                    . " -ORBnameserviceport $ns_multicast_port -o $iorfile");
-    
-    $NS->Spawn ();
+  server ();
 
-    if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-        print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-        $NS->Kill (); 
-        exit 1;
-    }
+  client ($o);
 
-    print STDERR "\n          ".$comments[$test_number];
+  $NS->Terminate (); 
+  $nser = $NS->TimedWait (60);
 
-    $SR->Arguments ("ORBInitRef NameService=file://$iorfile");
-    $SR->Spawn ();
-    
-    sleep $sleeptime;
-
-    $CL->Arguments ("$o -ORBInitRef NameService=file://$iorfile");
-    $client = $CL->SpawnWaitKill (60);
-    
-    if ($client != 0) {
-        print STDERR "ERROR: client returned $client\n";
-        $status = 1;
+  if ($nser == -1) 
+    {
+      print STDERR "ERROR: name server Timedout\n";
+      $NS->Kill (); $NS->TimedWait (1);
     }
-    
-    $nameservice = $NS->TerminateWaitKill (10); 
 
-    if ($nameservice != 0) {
-        print STDERR "ERROR: name server returned $nameservice\n";
-        $status = 1;
-    }
+  $SR->Terminate ();
+  $ser = $NS->TimedWait (60);
 
-    $server = $SR->TerminateWaitKill (10);
-    if ($server != 0) {
-        print STDERR "ERROR: server returned $server\n";
-        $status = 1;
+  if ($ser == -1) 
+    {
+      $NS->Kill (); $NS->TimedWait (1);
     }
 
-    $test_number++;
+  $test_number++;
+
 }
 
-exit $status;
+exit 0;
diff --git a/TAO/tests/ior_corbaloc/server.cpp b/TAO/tests/ior_corbaloc/server.cpp
index ea0a172b6cd..d38e86f0a52 100644
--- a/TAO/tests/ior_corbaloc/server.cpp
+++ b/TAO/tests/ior_corbaloc/server.cpp
@@ -45,7 +45,7 @@ int main (int argc, char* argv[])
       corbaloc_Status_i status_i;
 
       // Activate it to obtain the reference
-      corbaloc::Status_var status =
+      corbaloc::Status_var status = 
         status_i._this ();
 
       // Get a reference to Naming Context
@@ -67,14 +67,12 @@ int main (int argc, char* argv[])
       naming_context->bind (name, status.in ());
 
       // Run the orb
-      orb->run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      orb->run ();
 
       // Destroy the POA, waiting until the destruction terminates
-      poa->destroy (1, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      orb->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa->destroy (1, 1);
+      orb->destroy ();
+
     }
   ACE_CATCH (CORBA::SystemException, ex) {
     std::cerr << "CORBA exception raised! " << ex << std::endl;
diff --git a/TAO/version_tests.dsw b/TAO/version_tests.dsw
new file mode 100644
index 00000000000..14a15e70ad7
--- /dev/null
+++ b/TAO/version_tests.dsw
@@ -0,0 +1,3530 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "ACE DLL"=..\ace\ace_dll.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "ACE_Init_Test"=..\tests\ACE_Init_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "AMI_Test_Client"=.\tests\AMI\AMI_Test_Client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "AMI_Test_Server"=.\tests\AMI\AMI_Test_Server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "AMI_Test_Simple_Client"=.\tests\AMI\AMI_Test_Simple_Client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Atomic_Op_Test"=..\tests\Atomic_Op_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "BCast"=.\orbsvcs\tests\Event\Basic\BCast.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ECTest

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Barrier_Test"=..\tests\Barrier_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Basic_Types_Test"=..\tests\Basic_Types_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Buffer_Stream_Test"=..\tests\Buffer_Stream_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Buffered_AMI Client"=.\examples\Buffered_AMI\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Buffered_AMI Server"=.\examples\Buffered_AMI\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Buffered_Oneways Client"=.\examples\Buffered_Oneways\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Buffered_Oneways Server"=.\examples\Buffered_Oneways\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "CDR Basic Types"=.\tests\CDR\basic_types.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "CDR Growth"=.\tests\CDR\growth.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "CDR TC"=.\tests\CDR\tc.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "CDR_Test"=..\tests\CDR_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Cache_Map_Manager_Test"=..\tests\Cache_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Cached_Accept_Conn_Test"=..\tests\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Cached_Conn_Test"=..\tests\Cached_Conn_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Callback Quoter Consumer"=.\examples\Callback_Quoter\Consumer.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Callback Quoter Notifier"=.\examples\Callback_Quoter\Notifier.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Callback Quoter Supplier"=.\examples\Callback_Quoter\Supplier.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Collection_Test"=..\tests\Collection_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Colocated_Test"=.\orbsvcs\tests\Trading\Colocated_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TradingLib

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Conn_Test"=..\tests\Conn_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Connect"=.\orbsvcs\tests\Event\Performance\Connect.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ECTest

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "DII_Cubit Client"=".\performance-tests\Cubit\TAO\DII_Cubit\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name IDL_Cubit Client

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "DLL_Test"=..\tests\DLL_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "DLList_Test"=..\tests\DLList_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "DynAny Basics"=.\tests\DynAny_Test\basic_test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Dynamic_Priority_Test"=..\tests\Dynamic_Priority_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "ECT_Consumer"=.\orbsvcs\tests\EC_Throughput\ECT_Consumer.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "ECT_Supplier"=.\orbsvcs\tests\EC_Throughput\ECT_Supplier.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "ECT_Throughput"=.\orbsvcs\tests\EC_Throughput\ECT_Throughput.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "ECTest DLL"=.\orbsvcs\tests\Event\lib\ECTest.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "EC_Mcast"=.\orbsvcs\tests\EC_Mcast\EC_Mcast.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "EC_Multiple"=.\orbsvcs\tests\EC_Multiple\EC_Multiple.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Enum_Interfaces_Test"=..\tests\Enum_Interfaces_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Env_Value_Test"=..\tests\Env_Value_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Event_Comm Consumer"=.\examples\Event_Comm\Consumer.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Event_Service

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Event_Comm Notifier"=.\examples\Event_Comm\Notifier.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Event_Service

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Event_Comm Supplier"=.\examples\Event_Comm\Supplier.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Event_Service

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Event_Latency"=.\orbsvcs\tests\Event_Latency\Event_Latency.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Event_Service

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Event_Service"=.\orbsvcs\Event_Service\Event_Service.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Export_Test"=.\orbsvcs\tests\Trading\Export_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TradingLib

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Faults Client"=.\tests\Faults\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Faults Server"=.\tests\Faults\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Future_Set_Test"=..\tests\Future_Set_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Future_Test"=..\tests\Future_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Handle_Set_Test"=..\tests\Handle_Set_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Hash_Map_Bucket_Iterator_Test"=..\tests\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Hash_Map_Manager_Test"=..\tests\Hash_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "High_Res_Timer_Test"=..\tests\High_Res_Timer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "IDL_Cubit Client"=".\performance-tests\Cubit\TAO\IDL_Cubit\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "IDL_Cubit Collocation Test"=".\performance-tests\Cubit\TAO\IDL_Cubit\collocation_test.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "IDL_Cubit Server"=".\performance-tests\Cubit\TAO\IDL_Cubit\server.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "IORTest"=.\tests\IORManipulation\IORTest.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "IOStream_Test"=..\tests\IOStream_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Import_Test"=.\orbsvcs\tests\Trading\Import_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TradingLib

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "InterOp Naming Client"=".\tests\InterOp-Naming\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "InterOp Naming Server"=".\tests\InterOp-Naming\server.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Latency Tests Client"=".\performance-tests\Latency\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Latency Tests Server"=".\performance-tests\Latency\server.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Lazy_Map_Manager_Test"=..\tests\Lazy_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Leader_Followers Client"=.\tests\Leader_Followers\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Leader_Followers Server"=.\tests\Leader_Followers\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MM_Shared_Memory_Test"=..\tests\MM_Shared_Memory_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Client Client"=.\tests\MT_Client\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Client ORB Creation"=.\tests\MT_Client\orb_creation.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Client Server"=.\tests\MT_Client\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Client Simple Client"=.\tests\MT_Client\simple_client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Cubit Client"=".\performance-tests\Cubit\TAO\MT_Cubit\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Cubit Server"=".\performance-tests\Cubit\TAO\MT_Cubit\server.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Reactor_Timer_Test"=..\tests\MT_Reactor_Timer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_SOCK_Test"=..\tests\MT_SOCK_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Server Client"=.\tests\MT_Server\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "MT_Server Server"=.\tests\MT_Server\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Map_Manager_Test"=..\tests\Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Map_Test"=..\tests\Map_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Mem_Map_Test"=..\tests\Mem_Map_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Message_Block_Test"=..\tests\Message_Block_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Message_Queue_Notifications_Test"=..\tests\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Message_Queue_Test"=..\tests\Message_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Multiple Inheritance Client"=.\tests\Multiple_Inheritance\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Multiple Inheritance Server"=.\tests\Multiple_Inheritance\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Naming_Service"=.\orbsvcs\Naming_Service\Naming_Service.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Naming_Test"=..\tests\Naming_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested Upcall MT_Client Client"=.\tests\NestedUpcall\MT_Client_Test\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested Upcall MT_Client Server"=.\tests\NestedUpcall\MT_Client_Test\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested Upcall Simple Client"=.\tests\NestedUpcall\Simple\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested Upcall Simple Server"=.\tests\NestedUpcall\Simple\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested Upcall Triangle Initiator"=.\tests\NestedUpcall\Triangle_Test\initiator.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested Upcall Triangle Server_A"=.\tests\NestedUpcall\Triangle_Test\server_A.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested Upcall Triangle Server_B"=.\tests\NestedUpcall\Triangle_Test\server_B.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested_Event_Loop Client"=.\tests\Nested_Event_Loop\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Nested_Event_Loop Server"=.\tests\Nested_Event_Loop\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "New_Fail_Test"=..\tests\New_Fail_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Notify_Performance_Test"=..\tests\Notify_Performance_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "OBV Typed Events Client"=.\examples\OBV\Typed_Events\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "OBV Typed Events Server"=.\examples\OBV\Typed_Events\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "ORB Services DLL"=.\orbsvcs\orbsvcs\orbsvcs.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "ORB_destroy"=.\tests\ORB_destroy\ORB_destroy.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "ORB_init"=.\tests\ORB_init\ORB_init.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Observer"=.\orbsvcs\tests\Event\Basic\Observer.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ECTest

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "OctetSeq"=.\tests\OctetSeq\OctetSeq.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "OctetSeq Client"=.\tests\OctetSeq\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "OctetSeq Server"=.\tests\OctetSeq\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "OrdMultiSet_Test"=..\tests\OrdMultiSet_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Adapter Activator Server"=.\examples\POA\Adapter_Activator\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name POA Generic Servant DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA DSI Client"=.\examples\POA\DSI\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA DSI Server"=.\examples\POA\DSI\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Deactivation"=.\tests\POA\Deactivation\Deactivation.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Default Servant Client"=.\examples\POA\Default_Servant\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Default Servant Server"=.\examples\POA\Default_Servant\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Destruction"=.\tests\POA\Destruction\Destruction.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Explicit Activation Server"=.\examples\POA\Explicit_Activation\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name POA Generic Servant DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA FindPOA"=.\examples\POA\FindPOA\FindPOA.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Forwarding Client"=.\examples\POA\Forwarding\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Forwarding Server"=.\examples\POA\Forwarding\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Generic Servant Client"=.\examples\POA\Generic_Servant\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name POA Generic Servant DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Generic Servant DLL"=.\examples\POA\Generic_Servant\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Identity"=.\tests\POA\Identity\Identity.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Loader Server"=.\examples\POA\Loader\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name POA Generic Servant DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA NewPOA"=.\examples\POA\NewPOA\NewPOA.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Non_Servant_Upcalls"=.\tests\POA\Non_Servant_Upcalls\Non_Servant_Upcalls.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA On Demand Activation Server"=.\examples\POA\On_Demand_Activation\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name POA Generic Servant DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA On Demand Loading Server"=.\examples\POA\On_Demand_Loading\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name POA Generic Servant DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Reference Counted Servant Server"=.\examples\POA\Reference_Counted_Servant\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA Registration"=".\performance-tests\POA\Object_Creation_And_Registration\registration.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA RootPOA"=.\examples\POA\RootPOA\RootPOA.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA TIE Client"=.\examples\POA\TIE\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "POA TIE Server"=.\examples\POA\TIE\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Param_Test Client"=.\tests\Param_Test\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Param_Test Server"=.\tests\Param_Test\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Pipe_Test"=..\tests\Pipe_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Pluggable Client"=".\performance-tests\Pluggable\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Pluggable Server"=".\performance-tests\Pluggable\server.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Priority_Buffer_Test"=..\tests\Priority_Buffer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Priority_Reactor_Test"=..\tests\Priority_Reactor_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Priority_Task_Test"=..\tests\Priority_Task_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Process_Mutex_Test"=..\tests\Process_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Process_Strategy_Test"=..\tests\Process_Strategy_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Quoter Client"=.\examples\Quoter\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Quoter Factory Finder"=.\examples\Quoter\Factory_Finder.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Quoter Generic Factory"=.\examples\Quoter\Generic_Factory.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Quoter Server"=.\examples\Quoter\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "RB_Tree_Test"=..\tests\RB_Tree_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reactor_Exceptions_Test"=..\tests\Reactor_Exceptions_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reactor_Notify_Test"=..\tests\Reactor_Notify_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reactor_Performance_Test"=..\tests\Reactor_Performance_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reactor_Timer_Test"=..\tests\Reactor_Timer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reactors_Test"=..\tests\Reactors_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reader_Writer_Test"=..\tests\Reader_Writer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reconnect"=.\orbsvcs\tests\Event\Basic\Reconnect.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ECTest

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Recursive_Mutex_Test"=..\tests\Recursive_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reliable Oneways Client"=".\performance-tests\RTCorba\Oneways\Reliable\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reliable Oneways Server"=".\performance-tests\RTCorba\Oneways\Reliable\server.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Reverse_Lock_Test"=..\tests\Reverse_Lock_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "SOCK_Connector_Test"=..\tests\SOCK_Connector_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "SOCK_Send_Recv_Test"=..\tests\SOCK_Send_Recv_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "SOCK_Test"=..\tests\SOCK_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "SPIPE_Test"=..\tests\SPIPE_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "SString_Test"=..\tests\SString_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "SV_Shared_Memory_Test"=..\tests\SV_Shared_Memory_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Sched_Conf"=.\orbsvcs\tests\Sched_Conf\Sched_Conf.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Schedule"=.\orbsvcs\tests\Event\Basic\Schedule.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ECTest

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Semaphore_Test"=..\tests\Semaphore_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Service_Config_Test"=..\tests\Service_Config_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Shutdown"=.\orbsvcs\tests\Event\Basic\Shutdown.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ECTest

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Sigset_Ops_Test"=..\tests\Sigset_Ops_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Bank Client"=.\examples\Simple\bank\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Bank Server"=.\examples\Simple\bank\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Chat Client"=.\examples\Simple\chat\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Chat Server"=.\examples\Simple\chat\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Echo Client"=.\examples\Simple\echo\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Echo Server"=.\examples\Simple\echo\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Grid Client"=.\examples\Simple\grid\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Grid Server"=.\examples\Simple\grid\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Naming Client"=.\orbsvcs\tests\Simple_Naming\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ORB Services DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Time Client"=.\examples\Simple\time\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Time Date Client"=".\examples\Simple\time-date\client.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Simple Time Date Library

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Time Date Library"=".\examples\Simple\time-date\Time_Date.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Time Date Server"=".\examples\Simple\time-date\server.dsp" - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Simple Time Date Library

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple Time Server"=.\examples\Simple\time\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Simple_Message_Block_Test"=..\tests\Simple_Message_Block_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Svc_Handler_Test"=..\tests\Svc_Handler_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "TAO DLL"=.\tao\TAO.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "TAO_IDL Compiler"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL_BE_DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL_FE_DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "TAO_IDL_BE_DLL"=.\TAO_IDL\TAO_IDL_BE_DLL.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL_FE_DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "TAO_IDL_FE_DLL"=.\TAO_IDL\TAO_IDL_FE_DLL.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name gperf

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "TSS_Test"=..\tests\TSS_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Task_Test"=..\tests\Task_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Thread_Manager_Test"=..\tests\Thread_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Thread_Mutex_Test"=..\tests\Thread_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Thread_Pool_Reactor_Test"=..\tests\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Thread_Pool_Test"=..\tests\Thread_Pool_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Throughput"=.\orbsvcs\tests\Event\Performance\Throughput.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ECTest

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Time_Service_Test"=..\tests\Time_Service_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Time_Value_Test"=..\tests\Time_Value_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Timed_Buffered_Oneways Client"=.\tests\Timed_Buffered_Oneways\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Timed_Buffered_Oneways Server"=.\tests\Timed_Buffered_Oneways\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Timeout"=.\orbsvcs\tests\Event\Basic\Timeout.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Timeout Client"=.\tests\Timeout\client.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Timeout Server"=.\tests\Timeout\server.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Timeprobe_Test"=..\tests\Timeprobe_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Timer_Queue_Test"=..\tests\Timer_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Tokens_Test"=..\tests\Tokens_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Trading Test Library"=.\orbsvcs\tests\Trading\TradingLib.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "UPIPE_SAP_Test"=..\tests\UPIPE_SAP_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "Upgradable_RW_Test"=..\tests\Upgradable_RW_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name gperf_lib

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "gperf_lib"=..\apps\gperf\src\gperf_lib.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name ACE DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "idl_test"=.\tests\IDL_Test\idl_test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name TAO DLL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name TAO_IDL Compiler

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/THANKS b/THANKS
index ebf177c3150..3414a05f7ed 100644
--- a/THANKS
+++ b/THANKS
@@ -18,11 +18,11 @@ Priyanka Gontla <pgontla@ece.uci.edu>
 Pradeep Gore <pradeep@cs.wustl.edu>
 Shawn Hannan <hannan@cs.wustl.edu>
 Tim Harrison <harrison@cs.wustl.edu>
-John Heitmann <jwh1@cs.wustl.edu>
+John Heitmann  <jwh1@cs.wustl.edu>
 James Hu <jxh@cs.wustl.edu>
 Prashant Jain <pjain@cs.wustl.edu>
 Vishal Kachroo <vishal@cs.wustl.edu>
-Michael Kircher <Michael.Kircher@mchp.siemens.de>
+Michael Kircher <mlkirche@mchp.siemens.de>
 Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
 Fred Kuhns <fredk@cs.wustl.edu>
 David Levine <levine@cs.wustl.edu>
@@ -136,7 +136,7 @@ Jean-Francois Ripouteau <Jean-Francois.Ripouteau@netsurf.org>
 Ajit Sagar <asagar@spdmail.spd.dsccc.com>
 Ashish Singhai <singhai@delirius.cs.uiuc.edu>
 David Sames <David.L.Sames.1@gsfc.nasa.gov>
-Gonzalo Diethelm <Gonzalo.Diethelm@sonda.com>
+Gonzalo Diethelm <gonzo@ing.puc.cl>
 Raj <raj@itd.ssb.com>
 Darrin Edelman <darrin@aetherworks.com>
 Steve Weismuller <spweismu@rsoc.rockwell.com>
@@ -503,7 +503,7 @@ Patty Hair <patty@Lynx.COM>
 Ivan Pascal <pascal@info.tsu.ru>
 William A. Hoffman <hoffman@crd.ge.com>
 Mark Lucovsky <markl@microsoft.com>
-Greg Holtmeyer <greg.holtmeyer@windriver.com>
+Greg Holtmeyer <greg.a.holtmeyer@boeing.com>
 Jody Hagins <jody@atdesk.com>
 Patrice Bensoussan <pbensoussan@amadeus.net>
 Keith Brown <kalbrown@ix.netcom.com>
@@ -1040,7 +1040,7 @@ Caleb Epstein <cae@home.com>
 Bruno Marconi <bmarconi@jetstream.com>
 Ken Childress <kchildre@uccs.jpl.nasa.gov>
 Michael Kramer <kramer@ave.ac.agit.de>
-Johnny Willemsen <johnny.willemsen@meco.nl>
+Johnny Willemsen <jwillemsen@meco.nl>
 Jonathan Astle <JNASTLE@dera.gov.uk>
 Javier Lopez Sanchez <jlopez@uida.es>
 Nir Drang <Nir@bandwiz.com>
@@ -1091,7 +1091,7 @@ David Channon <djc@uq.net.au>
 Andy Guy <andy@emory.demon.co.uk>
 Oscar Rodriquez <Oscar.Rodriquez@eln.ericsson.se>
 Jonathan Cano <jcano@mmcnet.com>
-Alain Decamps <Alain.Decamps@PIDPA.be>
+Decamps Alain <Alain.Decamps@PIDPA.be>
 Paul Rubel <prubel@bbn.com>
 Jon Loeliger <jloeliger@chiaro.com>
 Ricardo Chan <ricchan@nortelnetworks.com>
@@ -1107,7 +1107,7 @@ Alexander Kogan <jk@kogan.nnov.ru>
 Michael Lindner <mikel@att.net>
 Arnaud Compan <compan@ipanematech.com>
 Frank A. Hunleth <fhunleth@cs.wustl.edu>
-Michael Searles <msearles@base16.com>
+Michael Searles <msearles@base16.com> 
 Bogdan Jeram <bjeram@eso.org>
 Sebastian Schubert <sschuber@et.htwk-leipzig.de>
 Li Zhou <lizhou@doc.ece.uci.edu>
@@ -1127,7 +1127,7 @@ Mike Anderson <manderson@sonusnet.com>
 David Singer <David_P_Singer@res.raytheon.com>
 Nick Lin <nicklin@vantech.com.tw>
 Ron Hashimshony <Ron@bandwiz.com>
-Max Khon <fjoe@iclub.nsu.ru>
+Max Khon <fjoe@iclub.nsu.ru> 
 Jonas Nordin <jonas.nordin@syncom.se>
 Jonathan Stockdale <Jonathan.Stockdale@locusdialogue.com>
 Jean-Francois Daune <Daune@IBA.be>
@@ -1136,35 +1136,13 @@ Rick Stille  <stille_r@ociweb.com>
 Kirill Kuolechov <Kirill.Koulechov@gmx.net>
 Edwin Wrench <Edwin.Wrench@itt.com>
 Yung Trinh <ytrinh@email.com>
-Richard Eperjesi <reperjesi@yahoo.com>
+Richard Eperjesi <reperjesi@yahoo.com> 
 Ben Strong <bstrong@bluelark.com>
 David Karr <dkarr@bbn.com>
-Sathish Tiptur <Sathish.Tiptur@geind.ge.com>
+Sathish Tiptur <Sathish.Tiptur@geind.ge.com> 
 Frank Hunleth <fhunleth@cs.wustl.edu>
 Lu Yunhai <luyunhai@huawei.com>
 Christian Ewald <christian.ewald@zuehlke.com>
-Samuel Qi Luo <Samuel.QiLuo@ericsson.com.au>
-Sergey Logvin <S.Logvin@telesens.com.ua>
-Orlando Ribeiro <oribeiro@inescporto.pt>
-Doug Warner <dougwarner@micron.com>
-Kevin Regan <kregan@infoglide.com>
-Andy Olson <andrew.olson@lmco.com>
-Max Voronoy <m.voronoy@telesens.com.ua>
-Alexandr Gavrilov <gavr@trustworks.com>
-Scott Gunn <gunns@tvratings.com>
-Mason Deaver <mason.deaver@tripointglobal.com>
-Richard Huber <rhuber@amadeus.net>
-Glen Osterhout <gosterho@elronsw.com>
-YingLi <taoace@sina.com>
-Haka <newhaka@21cn.com>
-Sam Chong <sam@i2i-inc.com> 
-Virgilijus Globis <virgis@megagis.lt>
-Stefan Scherer <stefan_scherer@sepp.de>
-Pim Philipse <ppm@rogan-medical.com>
-Mike Snowy <snowymike@aol.com>
-John Mackenzie <John.Mackenzie.extern@icn.siemens.de>
-Ricky Marek <ricky@waveip.com>
-Patrick Maassen <patrick.maassen@meco.nl>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/VERSION b/VERSION
index 575b1417245..f524d01cb04 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.1.13, released Fri Feb 23 19:44:36 2001.
+This is ACE version 5.1.12, released Thu Jan 11 09:56:43 2001.
 
 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/WindozeCE/ACEApp.cpp b/WindozeCE/ACEApp.cpp
new file mode 100644
index 00000000000..00e176a8d7e
--- /dev/null
+++ b/WindozeCE/ACEApp.cpp
@@ -0,0 +1,17 @@
+// $Id$
+
+#include "stdafx.h"
+#include "ace/OS.h"
+#include "ACEApp.h"
+
+#if 0
+int
+main (int argc, ACE_TCHAR *argv[])
+{
+  Sleep (500);
+  for (int i = 0; i < argc; i++, Sleep (700))
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The %d command arg is \"%s\""),
+                i, argv [i]));
+  return 0;
+}
+#endif
diff --git a/WindozeCE/ACEApp.h b/WindozeCE/ACEApp.h
new file mode 100644
index 00000000000..9ceb9d69727
--- /dev/null
+++ b/WindozeCE/ACEApp.h
@@ -0,0 +1,14 @@
+// $Id$
+
+#ifndef ACE_APP_H
+#define ACE_APP_H
+
+#if !defined (NC_ACE_NOTIRY)
+#define NC_ACE_NOTIFY 2
+#define INC_ACE_LOGMSG 0
+#endif
+
+#endif /* ACE_APP_H */
+
+  
+
diff --git a/WindozeCE/README b/WindozeCE/README
new file mode 100644
index 00000000000..9d5d184e3db
--- /dev/null
+++ b/WindozeCE/README
@@ -0,0 +1,35 @@
+        CE specific files, may not run on 95/NT.
+
+What is this directory:
+
+        This directory contains a collection of files for a template
+        windows program.  It is written with Microsoft's MFC classes.
+        They also demonstrate a simple method to pass ACE_Log_Msg's
+        output to a window program with PostMessage.
+
+How to use this directory:
+
+        I was planning to make this a DLL so that we can integrate CE
+        project files with the current Win32 project files.  However,
+        the CE toolkit still seems very rudimentary and, certainly, I
+        am not familiar with it.  
+
+        To use these files, simply include all .cpp and .rc files in
+        your original text-based program.  Compile them with "using
+        Shared MFC library" set (important.)
+
+Running the programs:
+        
+        Start the program.  Key in command line parameters in the edit
+        box and tap on start button.  The button displays "Running.."
+        when the program is executing and "Stopped" after the ACE
+        program has finished execution.
+
+Future works:
+     
+        * We need to allow scrollable output.
+
+        * Make this a DLL?
+
+        * Get the command line automatically.  (This may need to
+          rewrite the program using native Win32 APIs.)
diff --git a/WindozeCE/StdAfx.cpp b/WindozeCE/StdAfx.cpp
new file mode 100644
index 00000000000..ee3447570e6
--- /dev/null
+++ b/WindozeCE/StdAfx.cpp
@@ -0,0 +1,7 @@
+// $Id$
+// stdafx.cpp : source file that includes just the standard includes
+//	WindozeCE.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
diff --git a/WindozeCE/StdAfx.h b/WindozeCE/StdAfx.h
new file mode 100644
index 00000000000..cb29f2a1b1f
--- /dev/null
+++ b/WindozeCE/StdAfx.h
@@ -0,0 +1,26 @@
+// $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__37544C6D_E3BC_11D1_968E_0040054CF0F0__INCLUDED_)
+#define AFX_STDAFX_H__37544C6D_E3BC_11D1_968E_0040054CF0F0__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__37544C6D_E3BC_11D1_968E_0040054CF0F0__INCLUDED_)
diff --git a/WindozeCE/WindozeCE.aps b/WindozeCE/WindozeCE.aps
new file mode 100644
index 00000000000..0f2688cf3cd
--- /dev/null
+++ b/WindozeCE/WindozeCE.aps
diff --git a/WindozeCE/WindozeCE.clw b/WindozeCE/WindozeCE.clw
new file mode 100644
index 00000000000..eca2fb8b2d8
--- /dev/null
+++ b/WindozeCE/WindozeCE.clw
@@ -0,0 +1,41 @@
+; CLW file contains information for the MFC ClassWizard

+

+[General Info]

+Version=1

+LastClass=CWindozeCEDlg

+LastTemplate=CDialog

+NewFileInclude1=#include "stdafx.h"

+NewFileInclude2=#include "WindozeCE.h"

+

+ClassCount=2

+Class1=CWindozeCEApp

+Class2=CWindozeCEDlg

+

+ResourceCount=3

+Resource2=IDR_MAINFRAME

+Resource3=IDD_WINDOZECE_DIALOG

+

+[CLS:CWindozeCEApp]

+Type=0

+HeaderFile=WindozeCE.h

+ImplementationFile=WindozeCE.cpp

+Filter=N

+

+[CLS:CWindozeCEDlg]

+Type=0

+HeaderFile=WindozeCEDlg.h

+ImplementationFile=WindozeCEDlg.cpp

+Filter=D

+BaseClass=CDialog

+VirtualFilter=dWC

+LastObject=IDC_RUN

+

+

+[DLG:IDD_WINDOZECE_DIALOG]

+Type=1

+Class=CWindozeCEDlg

+ControlCount=3

+Control1=IDC_PROGRAM_OUTPUT,edit,1352730692

+Control2=IDC_RUN,button,1342242817

+Control3=IDC_PROGRAM_ARGUMENTS,edit,1350631552

+

diff --git a/WindozeCE/WindozeCE.cpp b/WindozeCE/WindozeCE.cpp
new file mode 100644
index 00000000000..427aeb2990f
--- /dev/null
+++ b/WindozeCE/WindozeCE.cpp
@@ -0,0 +1,73 @@
+// $Id$
+// WindozeCE.cpp : Defines the class behaviors for the application.
+//
+
+#include "stdafx.h"
+#include "WindozeCE.h"
+#include "WindozeCEDlg.h"
+
+// Since this is only for Windows CE, we can use the Win32 character macros
+// FUZZ: disable check_for_tchar
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// CWindozeCEApp
+
+BEGIN_MESSAGE_MAP(CWindozeCEApp, CWinApp)
+	//{{AFX_MSG_MAP(CWindozeCEApp)
+		// NOTE - the ClassWizard will add and remove mapping macros here.
+		//    DO NOT EDIT what you see in these blocks of generated code!
+	//}}AFX_MSG
+END_MESSAGE_MAP()
+
+/////////////////////////////////////////////////////////////////////////////
+// CWindozeCEApp construction
+
+CWindozeCEApp::CWindozeCEApp(LPCTSTR lpszAppName)
+	: CWinApp(lpszAppName)
+{
+	// TODO: add construction code here,
+	// Place all significant initialization in InitInstance
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// The one and only CWindozeCEApp object
+
+// WCE MFC apps require the application name to be specified in the CWinApp 
+// constructor. A help contents filename may also be specified.
+
+CWindozeCEApp theApp(_T("WindozeCE"));
+
+/////////////////////////////////////////////////////////////////////////////
+// CWindozeCEApp initialization
+
+BOOL CWindozeCEApp::InitInstance()
+{
+	// Standard initialization
+	// If you are not using these features and wish to reduce the size
+	//  of your final executable, you should remove from the following
+	//  the specific initialization routines you do not need.
+
+	CWindozeCEDlg dlg;
+	m_pMainWnd = &dlg;
+	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
+	}
+
+	// Since the dialog has been closed, return FALSE so that we exit the
+	//  application, rather than start the application's message pump.
+	return FALSE;
+}
diff --git a/WindozeCE/WindozeCE.dsp b/WindozeCE/WindozeCE.dsp
new file mode 100644
index 00000000000..c0008c5bc50
--- /dev/null
+++ b/WindozeCE/WindozeCE.dsp
@@ -0,0 +1,377 @@
+# Microsoft Developer Studio Project File - Name="WindozeCE" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

+# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+

+CFG=WindozeCE - Win32 (WCE MIPS) 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 "WindozeCE.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 "WindozeCE.mak" CFG="WindozeCE - Win32 (WCE MIPS) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "WindozeCE - Win32 (WCE MIPS) Release" (based on\

+ "Win32 (WCE MIPS) Application")

+!MESSAGE "WindozeCE - Win32 (WCE MIPS) Debug" (based on\

+ "Win32 (WCE MIPS) Application")

+!MESSAGE "WindozeCE - Win32 (WCE x86em) Release" (based on\

+ "Win32 (WCE x86em) Application")

+!MESSAGE "WindozeCE - Win32 (WCE x86em) Debug" (based on\

+ "Win32 (WCE x86em) Application")

+!MESSAGE "WindozeCE - Win32 (WCE SH) Release" (based on\

+ "Win32 (WCE SH) Application")

+!MESSAGE "WindozeCE - Win32 (WCE SH) Debug" (based on\

+ "Win32 (WCE SH) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+# PROP WCE_Configuration "H/PC Ver. 2.00"

+

+!IF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Release"

+

+# PROP BASE Use_MFC 2

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "WMIPSRel"

+# PROP BASE Intermediate_Dir "WMIPSRel"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "WMIPSRel"

+# PROP Intermediate_Dir "WMIPSRel"

+# PROP Target_Dir ""

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MT /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /QMRWCE  /c

+# ADD CPP /nologo /MT /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /QMRWCE  /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG" /d "_AFXDLL"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /entry:"wWinMainCRTStartup" /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 /nologo /entry:"wWinMainCRTStartup" /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 2

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Target_Dir ""

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MTd /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /QMRWCE  /c

+# ADD CPP /nologo /MTd /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /QMRWCE  /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Release"

+

+# PROP BASE Use_MFC 2

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "x86emRel"

+# PROP BASE Intermediate_Dir "x86emRel"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "x86emRel"

+# PROP Intermediate_Dir "x86emRel"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MT /W3 /GX- /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "_AFXDLL" /Yu"stdafx.h" /c

+# ADD CPP /nologo /MT /W3 /GX- /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "_AFXDLL" /Yu"stdafx.h" /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG" /d "_AFXDLL"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /windowsce:emulation

+# ADD LINK32 /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /windowsce:emulation

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE -COPY

+# ADD EMPFILE -COPY

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 2

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX- /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "_AFXDLL" /Yu"stdafx.h" /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX- /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "_AFXDLL" /Yu"stdafx.h" /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /windowsce:emulation

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE -COPY

+# ADD EMPFILE -COPY

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Release"

+

+# PROP BASE Use_MFC 2

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "WCESHRel"

+# PROP BASE Intermediate_Dir "WCESHRel"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "WCESHRel"

+# PROP Intermediate_Dir "WCESHRel"

+# PROP Target_Dir ""

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MT /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /c

+# ADD CPP /nologo /MT /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG" /d "_AFXDLL"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /entry:"wWinMainCRTStartup" /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 /nologo /entry:"wWinMainCRTStartup" /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Debug"

+

+# PROP BASE Use_MFC 2

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Target_Dir ""

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MTd /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /c

+# ADD CPP /nologo /MTd /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_AFXDLL" /Yu"stdafx.h" /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ENDIF 

+

+# Begin Target

+

+# Name "WindozeCE - Win32 (WCE MIPS) Release"

+# Name "WindozeCE - Win32 (WCE MIPS) Debug"

+# Name "WindozeCE - Win32 (WCE x86em) Release"

+# Name "WindozeCE - Win32 (WCE x86em) Debug"

+# Name "WindozeCE - Win32 (WCE SH) Release"

+# Name "WindozeCE - Win32 (WCE SH) Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=.\StdAfx.cpp

+

+!IF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Release"

+

+# ADD CPP /Yc"stdafx.h"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Debug"

+

+# ADD CPP /Yc"stdafx.h"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Release"

+

+# ADD CPP /Yc"stdafx.h"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Debug"

+

+# ADD CPP /Yc"stdafx.h"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Release"

+

+# ADD CPP /Yc"stdafx.h"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Debug"

+

+# ADD CPP /Yc"stdafx.h"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\WindozeCE.cpp

+

+!IF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\WindozeCE.rc

+

+!IF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Release"

+

+!ELSEIF  "$(CFG)" == "WindozeCE - Win32 (WCE SH) Debug"

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=.\Resource.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\StdAfx.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\WindozeCE.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\WindozeCEDlg.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=.\res\WindozeCE.ico

+# End Source File

+# Begin Source File

+

+SOURCE=.\res\WindozeCE.rc2

+# PROP Exclude_From_Scan -1

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+# End Source File

+# End Group

+# Begin Source File

+

+SOURCE=.\ReadMe.txt

+# End Source File

+# End Target

+# End Project

diff --git a/WindozeCE/WindozeCE.h b/WindozeCE/WindozeCE.h
new file mode 100644
index 00000000000..bc674209c15
--- /dev/null
+++ b/WindozeCE/WindozeCE.h
@@ -0,0 +1,55 @@
+// $Id$
+// WindozeCE.h : main header file for the WINDOZECE application
+//
+
+#if !defined(AFX_WINDOZECE_H__37544C69_E3BC_11D1_968E_0040054CF0F0__INCLUDED_)
+#define AFX_WINDOZECE_H__37544C69_E3BC_11D1_968E_0040054CF0F0__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 "resource.h"		// main symbols
+#include "ace/OS.h"
+
+// FUZZ: disable check_for_tchar
+
+/////////////////////////////////////////////////////////////////////////////
+// CWindozeCEApp:
+// See WindozeCE.cpp for the implementation of this class
+//
+
+class CWindozeCEApp : public CWinApp
+{
+public:
+	CWindozeCEApp(LPCTSTR lpszAppName);
+
+// Overrides
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CWindozeCEApp)
+	public:
+	virtual BOOL InitInstance();
+	//}}AFX_VIRTUAL
+
+// Implementation
+
+	//{{AFX_MSG(CWindozeCEApp)
+		// 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()
+          private:
+            ACE_Object_Manager obj_mgr_;
+};
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_WINDOZECE_H__37544C69_E3BC_11D1_968E_0040054CF0F0__INCLUDED_)
diff --git a/WindozeCE/WindozeCE.rc b/WindozeCE/WindozeCE.rc
new file mode 100644
index 00000000000..ff78591cb9c
--- /dev/null
+++ b/WindozeCE/WindozeCE.rc
@@ -0,0 +1,176 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "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\\WindozeCE.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""afxres.rc""         // Standard components\r\n"
+    "#include ""wceres.rc""         // WCE-specific 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     "res\\WindozeCE.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_WINDOZECE_DIALOG DIALOGEX 0, 0, 285, 111
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_APPWINDOW | WS_EX_CAPTIONOKBTN
+CAPTION "WindozeCE"
+FONT 8, "Tahoma"
+BEGIN
+    EDITTEXT        IDC_PROGRAM_OUTPUT,7,7,271,79,ES_MULTILINE | 
+                    ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL
+    DEFPUSHBUTTON   "Run",IDC_RUN,7,90,50,14
+    EDITTEXT        IDC_PROGRAM_ARGUMENTS,61,90,217,14,ES_AUTOHSCROLL
+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", "WindozeCE WCE MFC Application\0"
+            VALUE "FileVersion", "1, 0, 0, 1\0"
+            VALUE "InternalName", "WindozeCE\0"
+            VALUE "LegalCopyright", "Copyright (C) 1998\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "WindozeCE.EXE\0"
+            VALUE "ProductName", "WindozeCE 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_WINDOZECE_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 278
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 104
+    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 "res\WindozeCE.rc2"  // non-Microsoft Visual C++ edited resources
+#include "afxres.rc"         // Standard components
+#include "wceres.rc"         // WCE-specific components
+#endif
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/WindozeCE/WindozeCEDlg.cpp b/WindozeCE/WindozeCEDlg.cpp
new file mode 100644
index 00000000000..24a26b1e427
--- /dev/null
+++ b/WindozeCE/WindozeCEDlg.cpp
@@ -0,0 +1,159 @@
+// $Id$
+// WindozeCEDlg.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "WindozeCE.h"
+#include "WindozeCEDlg.h"
+#include "ace/ARGV.h"
+#include "ACEApp.h"
+
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#undef THIS_FILE
+static char THIS_FILE[] = __FILE__;
+#endif
+
+static CWnd *host_window_ = 0;
+
+// Since this is only for Windows CE, we can use the Win32 character macros
+// FUZZ: disable check_for_tchar
+
+
+UINT worker (void * arg)
+{
+  ACE_ARGV cmd_line ((ACE_TCHAR *) arg);
+  extern int ace_ce_main (int, ACE_TCHAR *[]);
+
+  int retv =  ace_ce_main (cmd_line.argc (), cmd_line.argv ());
+  host_window_->SetDlgItemText (IDC_RUN, TEXT ("Stopped"));
+
+  return retv;
+
+  //   Sleep (500);
+  //   for (size_t i = 0; i < cmd_line.argc (); i++, Sleep (500))
+  //     ACE_DEBUG ((LM_DEBUG, TEXT ("The %d command arg is \"%s\""),
+  //                 i, cmd_line.argv ()[i]));
+
+  //   return 0;
+  //   CString *msg = 0;
+  //   while (1)
+  //     {
+  //       Sleep (500);
+  //       msg = new CString;
+  //       SYSTEMTIME curtime;
+  //       GetLocalTime (&curtime);
+  //       msg->Format (TEXT ("Time: %02d:%02d:%02d.%03d"), curtime.wHour,
+  //                    curtime.wMinute, curtime.wSecond,
+  //                    curtime.wMilliseconds);
+  //       ACE_DEBUG ((LM_DEBUG, TEXT ("(%P|%t) Test logging: %s\n"), *msg));
+  //       delete msg;
+  //     }
+  //   return 0;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// CWindozeCEDlg dialog
+
+CWindozeCEDlg::CWindozeCEDlg(CWnd* pParent /*=NULL*/)
+  : CDialog(CWindozeCEDlg::IDD, pParent)
+{
+  //{{AFX_DATA_INIT(CWindozeCEDlg)
+  // 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 CWindozeCEDlg::DoDataExchange(CDataExchange* pDX)
+{
+  CDialog::DoDataExchange(pDX);
+  //{{AFX_DATA_MAP(CWindozeCEDlg)
+  // NOTE: the ClassWizard will add DDX and DDV calls here
+  //}}AFX_DATA_MAP
+}
+
+BEGIN_MESSAGE_MAP(CWindozeCEDlg, CDialog)
+  //{{AFX_MSG_MAP(CWindozeCEDlg)
+  ON_WM_TIMER()
+  ON_BN_CLICKED(IDC_RUN, OnStart)
+  //}}AFX_MSG_MAP
+  END_MESSAGE_MAP()
+
+  /////////////////////////////////////////////////////////////////////////////
+  // CWindozeCEDlg message handlers
+
+  BOOL CWindozeCEDlg::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
+
+  this->SetDlgItemText (IDC_PROGRAM_OUTPUT,
+                        TEXT ("Fill in the command line arguments you want to pass to the program below:"));
+  CenterWindow(GetDesktopWindow());	// center to the hpc screen
+
+  this->ace.set_window (this->m_hWnd, NC_ACE_NOTIFY, INC_ACE_LOGMSG);
+  this->ace.set_self_default ();
+  host_window_ = this;
+  return TRUE;  // return TRUE  unless you set the focus to a control
+}
+
+BOOL CWindozeCEDlg::OnCommand(WPARAM wParam, LPARAM lParam)
+{
+  static BOOL got_cmd = FALSE;
+  int notify = HIBYTE (wParam);
+  int id = LOBYTE (wParam);
+
+  if (notify == NC_ACE_NOTIFY && id == INC_ACE_LOGMSG)
+    {
+      LPTSTR head = (LPTSTR) lParam ;
+      CString newbuf;
+
+      LPTSTR newline;
+
+      while ((newline = ACE_OS::strchr (head, '\n')) != NULL)
+        {
+          *newline = 0;
+          newbuf += head;
+          newbuf += "\r\n";
+          head = newline+1;
+        }
+
+      newbuf += head;
+
+      CEdit *editor = (CEdit *) GetDlgItem (IDC_PROGRAM_OUTPUT);
+      editor -> ReplaceSel (newbuf);
+
+      ACE_OS::free (head);
+      return TRUE;
+    }
+  return CDialog::OnCommand(wParam, lParam);
+}
+
+void CWindozeCEDlg::OnTimer(UINT nIDEvent)
+{
+  //   CWnd *text = this->GetDlgItem (IDC_TEXT_DISP);
+  //   text->ModifyStyle (WS_VISIBLE, SS_CENTER, 0);
+  //   this->UpdateWindow ();
+
+  CDialog::OnTimer(nIDEvent);
+}
+
+void CWindozeCEDlg::OnStart()
+{
+  static BOOL once = FALSE;
+
+  if (! once)
+    {
+      CString cmdline;
+      this->GetDlgItemText (IDC_PROGRAM_ARGUMENTS, cmdline);
+      AfxBeginThread (worker, (void *) (LPCTSTR) cmdline);
+      this->SetDlgItemText (IDC_RUN, TEXT ("Running..."));
+      once = TRUE;
+    }
+}
diff --git a/WindozeCE/WindozeCEDlg.h b/WindozeCE/WindozeCEDlg.h
new file mode 100644
index 00000000000..d141e218117
--- /dev/null
+++ b/WindozeCE/WindozeCEDlg.h
@@ -0,0 +1,54 @@
+// $Id$
+// WindozeCEDlg.h : header file
+//
+
+#include "ace/OS.h"
+
+#if !defined(AFX_WINDOZECEDLG_H__37544C6B_E3BC_11D1_968E_0040054CF0F0__INCLUDED_)
+#define AFX_WINDOZECEDLG_H__37544C6B_E3BC_11D1_968E_0040054CF0F0__INCLUDED_
+
+#if _MSC_VER >= 1000
+#pragma once
+#endif // _MSC_VER >= 1000
+
+/////////////////////////////////////////////////////////////////////////////
+// CWindozeCEDlg dialog
+
+class CWindozeCEDlg : public CDialog
+{
+  // Construction
+public:
+  CWindozeCEDlg(CWnd* pParent = NULL);	// standard constructor
+
+  // Dialog Data
+  //{{AFX_DATA(CWindozeCEDlg)
+  enum { IDD = IDD_WINDOZECE_DIALOG };
+  // NOTE: the ClassWizard will add data members here
+  //}}AFX_DATA
+
+	// ClassWizard generated virtual function overrides
+	//{{AFX_VIRTUAL(CWindozeCEDlg)
+protected:
+  virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV support
+  virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
+  //}}AFX_VIRTUAL
+
+// Implementation
+protected:
+  HICON m_hIcon;
+
+  ACE_CE_Bridge ace;
+
+  // Generated message map functions
+  //{{AFX_MSG(CWindozeCEDlg)
+  virtual BOOL OnInitDialog();
+  afx_msg void OnTimer(UINT nIDEvent);
+  afx_msg void OnStart();
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
+    };
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_WINDOZECEDLG_H__37544C6B_E3BC_11D1_968E_0040054CF0F0__INCLUDED_)
diff --git a/WindozeCE/res/WindozeCE.ico b/WindozeCE/res/WindozeCE.ico
new file mode 100644
index 00000000000..b9204c1c06d
--- /dev/null
+++ b/WindozeCE/res/WindozeCE.ico
diff --git a/WindozeCE/res/WindozeCE.rc2 b/WindozeCE/res/WindozeCE.rc2
new file mode 100644
index 00000000000..65f376ac843
--- /dev/null
+++ b/WindozeCE/res/WindozeCE.rc2
@@ -0,0 +1,13 @@
+// $Id$
+// WindozeCE.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/WindozeCE/resource.h b/WindozeCE/resource.h
new file mode 100644
index 00000000000..174cf16aba9
--- /dev/null
+++ b/WindozeCE/resource.h
@@ -0,0 +1,21 @@
+// $Id$
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by WindozeCE.rc
+//
+#define IDD_WINDOZECE_DIALOG            102
+#define IDR_MAINFRAME                   128
+#define IDC_PROGRAM_OUTPUT              1001
+#define IDC_RUN                         1003
+#define IDC_PROGRAM_ARGUMENTS           1004
+
+// 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         1005
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/ace/ACE.i b/ace/ACE.i
index d58ab35463c..d885afcaf4f 100644
--- a/ace/ACE.i
+++ b/ace/ACE.i
@@ -210,7 +210,7 @@ ACE::sendv_n (ACE_HANDLE handle,
 ASYS_INLINE ssize_t
 ACE::send_i (ACE_HANDLE handle, const void *buf, size_t len)
 {
-#if defined (ACE_WIN32) || defined (ACE_PSOS) || defined (HPUX)
+#if defined (ACE_WIN32) || defined (ACE_PSOS)
   return ACE_OS::send (handle, (const char *) buf, len);
 #else
   return ACE_OS::write (handle, (const char *) buf, len);
diff --git a/ace/ARGV.h b/ace/ARGV.h
index 5bf17da94ec..9f2e501a982 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -101,8 +101,7 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
 
   /// Add another argument.  This only works in the <ITERATIVE> state.
-  /// Note that this method does not copy <next_arg>, but instead
-  /// assumes ownership of it.  Returns -1 on failure and 0 on success.
+  /// Returns -1 on failure and 0 on success.
   int add (const ACE_TCHAR *next_arg);
 
   /**
diff --git a/ace/Asynch_Acceptor.cpp b/ace/Asynch_Acceptor.cpp
index 74082ffe811..2321302c331 100644
--- a/ace/Asynch_Acceptor.cpp
+++ b/ace/Asynch_Acceptor.cpp
@@ -408,12 +408,6 @@ ACE_Asynch_Acceptor<HANDLER>::handle (void) const
   return this->listen_handle_;
 }
 
-template <class HANDLER> void
-ACE_Asynch_Acceptor<HANDLER>::handle (ACE_HANDLE h)
-{
-  ACE_Handler::handle (h);
-}
-
 template <class HANDLER> HANDLER *
 ACE_Asynch_Acceptor<HANDLER>::make_handler (void)
 {
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index adc5e34d892..cd8b286b6c3 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -150,8 +150,6 @@ protected:
 
   /// Return the listen handle.
   ACE_HANDLE handle (void) const;
-  /// Set the listen handle.
-  void handle (ACE_HANDLE h);
 
   /// This parses the address from read buffer.
   void parse_address (const ACE_Asynch_Accept::Result &result,
diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i
index 7fba5b4edfa..2dca307b97a 100644
--- a/ace/Auto_Ptr.i
+++ b/ace/Auto_Ptr.i
@@ -92,7 +92,7 @@ ACE_Auto_Basic_Array_Ptr<X>::release (void)
 template<class X> ACE_INLINE void
 ACE_Auto_Basic_Array_Ptr<X>::reset (X *p)
 {
-  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::reset");
+  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::reset");
   if (this->get () != p)
     delete [] this->get ();
   this->p_ = p;
diff --git a/ace/Base_Thread_Adapter.cpp b/ace/Base_Thread_Adapter.cpp
index 2f8efd4e58f..d528222a550 100644
--- a/ace/Base_Thread_Adapter.cpp
+++ b/ace/Base_Thread_Adapter.cpp
@@ -87,8 +87,7 @@ ACE_Base_Thread_Adapter::thr_desc_log_msg (void)
 // be an extern "C" to make certain compilers happy...
 
 #if defined (ACE_PSOS)
-extern "C" void 
-ace_thread_adapter (unsigned long args)
+extern "C" void ace_thread_adapter (unsigned long args)
 {
   ACE_OS_TRACE ("ace_thread_adapter");
 
@@ -107,8 +106,7 @@ ace_thread_adapter (unsigned long args)
   thread_args->invoke ();
 }
 #else /* ! defined (ACE_PSOS) */
-extern "C" void * 
-ace_thread_adapter (void *args)
+extern "C" void * ace_thread_adapter (void *args)
 {
   ACE_OS_TRACE ("ace_thread_adapter");
 
diff --git a/ace/Based_Pointer_T.i b/ace/Based_Pointer_T.i
index 1d99f9ecaa8..a557c558081 100644
--- a/ace/Based_Pointer_T.i
+++ b/ace/Based_Pointer_T.i
@@ -13,7 +13,7 @@ ACE_Based_Pointer<CONCRETE>::operator->(void)
 template <class CONCRETE> ACE_INLINE void
 ACE_Based_Pointer_Basic<CONCRETE>::operator = (CONCRETE *rhs)
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator =");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator=");
   if (rhs == 0)
     // Store a value of <target_> that indicate "NULL" pointer.
     this->target_ = -1;
@@ -25,7 +25,7 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator = (CONCRETE *rhs)
 template <class CONCRETE> ACE_INLINE void
 ACE_Based_Pointer<CONCRETE>::operator = (CONCRETE *rhs)
 {
-  ACE_TRACE ("ACE_Based_Pointer<CONCRETE>::operator =");
+  ACE_TRACE ("ACE_Based_Pointer<CONCRETE>::operator=");
   if (rhs == 0)
     // Store a value of <target_> that indicate "NULL" pointer.
     this->target_ = -1;
@@ -45,7 +45,7 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator *(void) const
 template <class CONCRETE> ACE_INLINE CONCRETE *
 ACE_Based_Pointer_Basic<CONCRETE>::addr (void) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::addr");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator CONCRETE *()");
 
   if (this->target_ == -1)
     return 0;
@@ -65,7 +65,7 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator CONCRETE *() const
 template <class CONCRETE> ACE_INLINE CONCRETE
 ACE_Based_Pointer_Basic<CONCRETE>::operator [] (int index) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator []");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator[]");
   CONCRETE *c = ACE_reinterpret_cast (CONCRETE *,
                                       ACE_COMPUTE_BASED_POINTER (this));
   return c[index];
@@ -74,49 +74,49 @@ ACE_Based_Pointer_Basic<CONCRETE>::operator [] (int index) const
 template <class CONCRETE> ACE_INLINE void
 ACE_Based_Pointer_Basic<CONCRETE>::operator += (int index)
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator +=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator+=");
   this->base_offset_ += (index * sizeof (CONCRETE));
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator == (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator ==");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator==");
   return ACE_COMPUTE_BASED_POINTER (this) == ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator != (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator !=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator!=");
   return !(*this == rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator < (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator <");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator<");
   return ACE_COMPUTE_BASED_POINTER (this) < ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator <= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator <=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator<=");
   return ACE_COMPUTE_BASED_POINTER (this) <= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator > (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator >");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator>");
   return ACE_COMPUTE_BASED_POINTER (this) > ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
 template <class CONCRETE> ACE_INLINE int 
 ACE_Based_Pointer_Basic<CONCRETE>::operator >= (const ACE_Based_Pointer_Basic<CONCRETE> &rhs) const
 {
-  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator >=");
+  ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::operator>=");
   return ACE_COMPUTE_BASED_POINTER (this) >= ACE_COMPUTE_BASED_POINTER (&rhs);
 }
 
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index e1e4c0c3e77..dd2f97df094 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -311,12 +311,6 @@ public:
   /// this is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined.
   int do_byte_swap (void) const;
 
-  /// For use by a gateway, which creates the output stream for the
-  /// reply to the client in its native byte order, but which must
-  /// send the reply in the byte order of the target's reply to the
-  /// gateway.
-  void reset_byte_order (int byte_order);
-
 private:
   /// disallow copying...
   ACE_OutputCDR (const ACE_OutputCDR& rhs);
@@ -683,8 +677,8 @@ public:
   /// this is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined.
   int do_byte_swap (void) const;
 
-  /// If <do_byte_swap> returns 0, this returns ACE_CDR_BYTE_ORDER else
-  /// it returns !ACE_CDR_BYTE_ORDER.
+  /// If <do_byte_swap> returns 1, this returns ACE_CDR_BYTE_ORDER else
+  /// it returns ~ACE_CDR_BYTE_ORDER.
   int byte_order (void) const;
 
   /// Access the codeset translators. They can be nil!
diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i
index b790166fcdf..b98953347a3 100644
--- a/ace/CDR_Stream.i
+++ b/ace/CDR_Stream.i
@@ -432,12 +432,6 @@ ACE_OutputCDR::do_byte_swap (void) const
   return this->do_byte_swap_;
 }
 
-ACE_INLINE void
-ACE_OutputCDR::reset_byte_order (int byte_order)
-{
-  this->do_byte_swap_ = (byte_order != ACE_CDR_BYTE_ORDER);
-}
-
 ACE_INLINE size_t
 ACE_OutputCDR::current_alignment (void) const
 {
diff --git a/ace/CLASSIX/CLASSIX_CO_Acceptor.i b/ace/CLASSIX/CLASSIX_CO_Acceptor.i
index d15dedd007d..dcb6a0d2862 100644
--- a/ace/CLASSIX/CLASSIX_CO_Acceptor.i
+++ b/ace/CLASSIX/CLASSIX_CO_Acceptor.i
@@ -7,7 +7,7 @@ ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor (ACE_Reactor* theReactor)
     : port_    (0),
       reactor_ (theReactor)
 {
-  ACE_TRACE ("ACE_CLASSIX_CO_Acceptor::ACE_CLASSIX_CO_Acceptor");
+  ACE_TRACE ("ACE_CLASSIX_Acceptor::ACE_CLASSIX_Acceptor");
 }
 
 ACE_INLINE
diff --git a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
index 960e76358aa..13716a5d351 100644
--- a/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
+++ b/ace/CLASSIX/CLASSIX_Select_Reactor.cpp
@@ -150,7 +150,7 @@ ACE_CLASSIX_Select_Reactor::handle_error_ (int thePort)
 int
 ACE_CLASSIX_Select_Reactor::check_handles_ (int thePort)
 {
-    ACE_TRACE ("ACE_CLASSIX_Select_Reactor::check_handles_");
+    ACE_TRACE ("ACE_Select_Reactor::check_handles");
     if (thePort == K_ANYENABLED)
 	return -1;
     else
@@ -220,7 +220,7 @@ ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications (
     int & number_of_active_handles,
     const ACE_Handle_Set &rd_mask)
 {
-  ACE_TRACE ("(%t) ACE_CLASSIX_Select_Reactor_Notify::dispatch_notifications");
+  ACE_TRACE ("(%t) ACE_Select_Reactor_Notify::handle_notification");
 
   ACE_HANDLE read_handle =
       this->notification_sap_.get_handle ();
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index 15eef258692..0544196ce59 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -416,7 +416,7 @@ ACE_Connector<SH, PR_CO_2>::connect_i (SH *&sh,
                                        int flags,
                                        int perms)
 {
-  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::connect_i");
+  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::connect");
 
   // If the user hasn't supplied us with a <SVC_HANDLER> we'll use the
   // factory method to create one.  Otherwise, things will remain as
@@ -737,7 +737,7 @@ ACE_Connector<SH, PR_CO_2>::~ACE_Connector (void)
 template <class SH, PR_CO_1> int
 ACE_Strategy_Connector<SH, PR_CO_2>::open (ACE_Reactor *r, int flags)
 {
-  ACE_TRACE ("ACE_Strategy_Connector<SH, PR_CO_2>::open");
+  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::open");
   return this->open (r, 0, 0, 0, flags);
 }
 
@@ -749,7 +749,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::open
    ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
    int flags)
 {
-  ACE_TRACE ("ACE_Strategy_Connector<SH, PR_CO_2>::open");
+  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::open");
 
   this->reactor (r);
 
@@ -839,7 +839,7 @@ ACE_Strategy_Connector<SH, PR_CO_2>::ACE_Strategy_Connector
       concurrency_strategy_ (0),
       delete_concurrency_strategy_ (0)
 {
-  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::ACE_Strategy_Connector");
+  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::ACE_Connector");
 
   if (this->open (reactor, cre_s, conn_s, con_s, flags) == -1)
     ACE_ERROR ((LM_ERROR,  ACE_LIB_TEXT ("%p\n"),  ACE_LIB_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector")));
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 5326b8f1ad3..02e90016df7 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -469,7 +469,7 @@ ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)
 template <class T> int
 ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_head");
+  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_tail");
 
   ACE_Node<T> *temp;
 
@@ -490,7 +490,7 @@ ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 template <class T> int
 ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item)
 {
-  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_tail");
+  //   ACE_TRACE ("ACE_Unbounded_Queue<T>::enqueue_head");
 
   ACE_Node<T> *temp;
 
@@ -1724,7 +1724,7 @@ ACE_Unbounded_Set<T>::size (void) const
 template <class T> int
 ACE_Unbounded_Set<T>::insert_tail (const T &item)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set<T>::insert_tail");
+  // ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
   ACE_Node<T> *temp;
 
   // Insert <item> into the old dummy node location.
@@ -1873,7 +1873,7 @@ ACE_Unbounded_Set<T>::operator= (const ACE_Unbounded_Set<T> &us)
 template <class T> int
 ACE_Unbounded_Set<T>::find (const T &item) const
 {
-  // ACE_TRACE ("ACE_Unbounded_Set<T>::find");
+  // ACE_TRACE ("ACE_Unbounded_Stack<T>::find");
   // Set <item> into the dummy node.
   this->head_->item_ = item;
 
@@ -2254,7 +2254,7 @@ template <class T> int
 ACE_Ordered_MultiSet<T>::insert_from (const T &item, ACE_DNode<T> *position,
                                       ACE_DNode<T> **new_position)
 {
-  // ACE_TRACE ("ACE_Ordered_MultiSet<T>::insert_from");
+  // ACE_TRACE ("ACE_Unbounded_Queue<T>::insert_tail");
 
   // create a new node
   ACE_DNode<T> *temp;
diff --git a/ace/DEV_Addr.i b/ace/DEV_Addr.i
index 3a7ad769e24..7ada0c3dd18 100644
--- a/ace/DEV_Addr.i
+++ b/ace/DEV_Addr.i
@@ -38,7 +38,7 @@ ACE_DEV_Addr::get_addr (void) const
 ACE_INLINE int
 ACE_DEV_Addr::operator == (const ACE_DEV_Addr &sap) const
 {
-  ACE_TRACE ("ACE_DEV_Addr::operator ==");
+  ACE_TRACE ("ACE_DEV_Addr::operator=");
 
   return ACE_OS::strcmp (this->devname_, sap.devname_) == 0;
 }
@@ -48,7 +48,7 @@ ACE_DEV_Addr::operator == (const ACE_DEV_Addr &sap) const
 ACE_INLINE int
 ACE_DEV_Addr::operator != (const ACE_DEV_Addr &sap) const
 {
-  ACE_TRACE ("ACE_DEV_Addr::operator !=");
+  ACE_TRACE ("ACE_DEV_Addr::operator!=");
 
   return !((*this) == sap);	// This is lazy, of course... ;-).
 }
diff --git a/ace/Dynamic.i b/ace/Dynamic.i
index 5b25ac54f55..6a32b94d4e6 100644
--- a/ace/Dynamic.i
+++ b/ace/Dynamic.i
@@ -26,7 +26,7 @@ ACE_Dynamic::is_dynamic ()
 ACE_INLINE void
 ACE_Dynamic::reset (void)
 { 
-  ACE_TRACE ("ACE_Dynamic::reset");
+  ACE_TRACE ("ACE_Dynamic::set");
   this->is_dynamic_ = 0; 
 }
 
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 50d4f8c4596..ebbd72c43aa 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -3,7 +3,6 @@
 
 #include "ace/Event_Handler.h"
 #include "ace/Message_Block.h"
-#include "ace/OS_Errno.h"
 #include "ace/Reactor.h"
 #include "ace/Thread_Manager.h"
 
@@ -28,10 +27,7 @@ ACE_Event_Handler::~ACE_Event_Handler (void)
 {
   // ACE_TRACE ("ACE_Event_Handler::~ACE_Event_Handler");
   if (this->reactor_ != 0)
-    {
-      ACE_Errno_Guard guard (errno);     // purge may get ENOTSUP
-      this->reactor_->purge_pending_notifications (this);
-    }
+    this->reactor_->purge_pending_notifications (this);
 }
 
 // Gets the file descriptor associated with this I/O device. 
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index 1c031eaa049..e6e5445f6a8 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -91,7 +91,7 @@ ACE_FILE::position (long offset, int startpos)
 off_t
 ACE_FILE::tell (void)
 {
-  ACE_TRACE ("ACE_FILE::tell");
+  ACE_TRACE ("ACE_FILE::position");
   return ACE_OS::lseek (this->get_handle (), 0, SEEK_CUR);
 }
 
diff --git a/ace/Flag_Manip.i b/ace/Flag_Manip.i
index b041e1f19d8..e477f235d23 100644
--- a/ace/Flag_Manip.i
+++ b/ace/Flag_Manip.i
@@ -6,7 +6,7 @@
 ASYS_INLINE int
 ACE_Flag_Manip::get_flags (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_Flag_Manip::get_flags");
+  ACE_TRACE ("ACE::get_flags");
 
 #if defined (ACE_LACKS_FCNTL)
   // ACE_OS::fcntl is not supported, e.g., on VxWorks.  It
diff --git a/ace/Handle_Set.i b/ace/Handle_Set.i
index ac7e837c2d9..ae775b907cc 100644
--- a/ace/Handle_Set.i
+++ b/ace/Handle_Set.i
@@ -31,9 +31,9 @@ ACE_Handle_Set::reset (void)
 
 #if defined (ACE_HAS_BIG_FD_SET)
 ACE_INLINE ACE_Handle_Set &
-ACE_Handle_Set::operator = (const ACE_Handle_Set &rhs)
+ACE_Handle_Set::operator= (const ACE_Handle_Set &rhs)
 {
-  ACE_TRACE ("ACE_Handle_Set::operator =");
+  ACE_TRACE ("ACE_Handle_Set::reset");
 
   if (rhs.size_ > 0)
     {
@@ -147,7 +147,7 @@ ACE_Handle_Set::num_set (void) const
 ACE_INLINE
 ACE_Handle_Set::operator fd_set *()
 {
-  ACE_TRACE ("ACE_Handle_Set::operator fd_set *");
+  ACE_TRACE ("ACE_Handle_Set::operator ACE_FD_SET_TYPE *");
 
   if (this->size_ > 0)
     return (fd_set *) &this->mask_;
@@ -160,7 +160,7 @@ ACE_Handle_Set::operator fd_set *()
 ACE_INLINE fd_set *
 ACE_Handle_Set::fdset (void)
 {
-  ACE_TRACE ("ACE_Handle_Set::fdset");
+  ACE_TRACE ("ACE_Handle_Set::operator ACE_FD_SET_TYPE *");
 
   if (this->size_ > 0)
     return (fd_set *) &this->mask_;
diff --git a/ace/Hash_Map_Manager_T.cpp b/ace/Hash_Map_Manager_T.cpp
index dbab8a02a2c..c692077bd95 100644
--- a/ace/Hash_Map_Manager_T.cpp
+++ b/ace/Hash_Map_Manager_T.cpp
@@ -375,7 +375,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Hash_Map_Iterator_Base_Ex)
 template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> void
 ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
 {
-  ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i");
+  ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("index_ = %d "), this->index_));
diff --git a/ace/Lib_Find.cpp b/ace/Lib_Find.cpp
index 51765c1cb93..edda500268a 100644
--- a/ace/Lib_Find.cpp
+++ b/ace/Lib_Find.cpp
@@ -539,7 +539,7 @@ ACE_Lib_Find::strsplit_r (wchar_t *str,
 size_t
 ACE_Lib_Find::strrepl (wchar_t *s, wchar_t search, wchar_t replace)
 {
-  ACE_TRACE ("ACE_Lib_Find::strrepl");
+  ACE_TRACE ("ACE::strrepl");
 
   size_t replaced = 0;
 
diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp
index 7747e690076..35e8371d153 100644
--- a/ace/Local_Name_Space_T.cpp
+++ b/ace/Local_Name_Space_T.cpp
@@ -80,7 +80,7 @@ ACE_Name_Space_Map<ALLOCATOR>::find (const ACE_NS_String &ext_id,
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::remap (EXCEPTION_POINTERS *ep)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::remap");
+  ACE_TRACE ("ACE_Name_Space_Map::remap");
 
   void *addr = (void *) ep->ExceptionRecord->ExceptionInformation[1];
 
@@ -131,7 +131,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::shared_bind_i (const ACE_WString
                                                            int rebind)
 {
 
-  ACE_TRACE ("ACE_Local_Name_Space::shared_bind_i");
+  ACE_TRACE ("ACE_Local_Name_Space::shared_bind");
   size_t name_len = (name.length () + 1) * sizeof (ACE_USHORT16);
   size_t value_len = (value.length () + 1) * sizeof (ACE_USHORT16);
   size_t type_len = ACE_OS::strlen (type) + 1;
@@ -223,7 +223,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::unbind (const ACE_WString &name)
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::unbind_i (const ACE_WString &name)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::unbind_i");
+  ACE_TRACE ("ACE_Local_Name_Space::unbind");
 
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
   ACE_NS_String ns_name (name);
@@ -288,7 +288,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::resolve_i (const ACE_WString &na
                                                            ACE_WString &value,
                                                            char *&type)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::resolve_i");
+  ACE_TRACE ("ACE_Local_Name_Space::resolve");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   ACE_NS_String ns_name (name);
@@ -383,7 +383,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager (void)
 template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::create_manager_i");
+  ACE_TRACE ("ACE_Local_Name_Space::create_manager");
   // Get directory name
   const ACE_TCHAR *dir = this->name_options_->namespace_dir ();
   const ACE_TCHAR *database = this->name_options_->database ();
@@ -511,7 +511,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_names_i (ACE_PWSTRING_SET &set,
                                                               const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_names_i");
+  ACE_TRACE ("ACE_Local_Name_Space::list_names");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -544,7 +544,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_values_i (ACE_PWSTRING_SET &set,
                                                            const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_values_i");
+  ACE_TRACE ("ACE_Local_Name_Space::list_values");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -577,7 +577,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_types_i (ACE_PWSTRING_SET &set,
                                                           const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_types_i");
+  ACE_TRACE ("ACE_Local_Name_Space::list_types");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -647,7 +647,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space <ACE_MEM_POOL_2, ACE_LOCK>::list_name_entries_i (ACE_BINDING_SET &set,
                                                                       const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_name_entries_i");
+  ACE_TRACE ("ACE_Local_Name_Space::list_name_entries");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -675,7 +675,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_value_entries_i (ACE_BINDING_SET &set,
                                                                   const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_value_entries_i");
+  ACE_TRACE ("ACE_Local_Name_Space::list_value_entries");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -702,7 +702,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> int
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_type_entries_i (ACE_BINDING_SET &set,
                                                                  const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Local_Name_Space::list_type_entries_i");
+  ACE_TRACE ("ACE_Local_Name_Space::list_type_entries");
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
 
   MAP_ITERATOR map_iterator (*this->name_space_map_);
@@ -756,7 +756,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::list_type_entries_i (ACE_BINDING
 template <ACE_MEM_POOL_1, class ACE_LOCK> void
 ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const
 {
-  ACE_TRACE ("ACE_Local_Name_Space::dump_i");
+  ACE_TRACE ("ACE_Local_Name_Space::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
diff --git a/ace/Local_Tokens.cpp b/ace/Local_Tokens.cpp
index 0487fb45c71..6edb9684175 100644
--- a/ace/Local_Tokens.cpp
+++ b/ace/Local_Tokens.cpp
@@ -8,8 +8,6 @@
 #include "ace/Local_Tokens.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(ace, Local_Tokens, "$Id$")
 
 void
@@ -915,7 +913,7 @@ ACE_RW_Token::release (ACE_TPQ_Entry *caller)
 void
 ACE_RW_Token::notify_new_owner (ACE_TPQ_Entry *old_owner)
 {
-  ACE_TRACE ("ACE_RW_Token::notify_new_owner");
+  ACE_TRACE ("ACE_RW_Token::new_owner");
 
   if (this->owner () == 0)
     return;
@@ -1017,7 +1015,7 @@ ACE_RW_Token::is_waiting_for (const ACE_TCHAR *id)
 int
 ACE_RW_Token::is_owner (const ACE_TCHAR *id)
 {
-  ACE_TRACE ("ACE_RW_Token::is_owner");
+  ACE_TRACE ("ACE_Mutex_Token::is_owner");
   // If there is no owner, return false.
   if (this->owner () == 0)
     return 0;
@@ -1097,7 +1095,7 @@ ACE_Token_Proxy::owner_id (void)
 const ACE_TCHAR *
 ACE_Token_Proxy::name (void) const
 {
-  ACE_TRACE ("ACE_Token_Proxy::name");
+  ACE_TRACE ("ACE_Token_Proxy::owner_id");
   return this->token_->name ();
 }
 
@@ -1122,7 +1120,7 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &)
 // @@ should I do a mutex_->release ()?
 ACE_Token_Proxy::~ACE_Token_Proxy (void)
 {
-  ACE_TRACE ("ACE_Token_Proxy::~ACE_Token_Proxy");
+  ACE_TRACE ("ACE_Local_Mutex::~ACE_Local_Mutex");
 
   if (token_ != 0)
     // notify token manager that we are done with it so it can
@@ -1454,5 +1452,3 @@ template class ACE_Node <ACE_TPQ_Entry *>;
 #pragma instantiate ACE_Unbounded_Stack <ACE_TPQ_Entry *>
 #pragma instantiate ACE_Node <ACE_TPQ_Entry *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h
index 6660d8b2028..b11d03f06f1 100644
--- a/ace/Local_Tokens.h
+++ b/ace/Local_Tokens.h
@@ -41,6 +41,7 @@
  */
 //=============================================================================
 
+
 #ifndef ACE_LOCAL_MUTEX_H
 #define ACE_LOCAL_MUTEX_H
 #include "ace/pre.h"
@@ -56,8 +57,6 @@
 #include "ace/Map_Manager.h"
 #include "ace/Log_Msg.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 #if !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE))
 # define ACE_NO_TSS_TOKENS 1
 #endif /* !(defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)) */
@@ -1089,8 +1088,6 @@ protected:
   ACE_Tokens *create_token (const ACE_TCHAR *name);
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
-
 #if defined (__ACE_INLINE__)
 #include "ace/Local_Tokens.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Local_Tokens.i b/ace/Local_Tokens.i
index 6f9fe43fa30..9a195950729 100644
--- a/ace/Local_Tokens.i
+++ b/ace/Local_Tokens.i
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
+// Local_Tokens.i
 
 ACE_INLINE int
 ACE_Token_Proxy::type (void) const
@@ -10,6 +10,7 @@ ACE_Token_Proxy::type (void) const
   return 0;
 }
 
+
 ACE_INLINE int
 ACE_Token_Proxy::acquire_read (int notify,
                                void (*sleep_hook)(void *),
@@ -430,5 +431,3 @@ ACE_Token_Name::operator== (const ACE_Token_Name &rhs) const
   // the name and type must be the same
   return (ACE_OS::strcmp (this->token_name_, rhs.name ()) == 0);
 }
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 30fe7f6aea8..4603c975f2b 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -24,7 +24,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/Log_Msg_Callback.h"
 #include "ace/Log_Msg_IPC.h"
-#include "ace/Log_Msg_NT_Event_Log.h"
 
 ACE_RCSID(ace, Log_Msg, "$Id$")
 
@@ -78,11 +77,7 @@ class ACE_Log_Msg_Manager
   //     For internal use by ACE, only!
 {
 public:
-  static ACE_Log_Msg_Backend *log_backend_;
-
-  static u_long log_backend_flags_;
-
-  static int init_backend (const u_long *flags = 0);
+  static ACE_Log_Msg_Backend *ipc_backend_;
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   static void close (void);
@@ -94,52 +89,7 @@ private:
 #endif /* ! ACE_MT_SAFE */
 };
 
-ACE_Log_Msg_Backend *ACE_Log_Msg_Manager::log_backend_ = 0;
-u_long ACE_Log_Msg_Manager::log_backend_flags_ = 0;
-
-int ACE_Log_Msg_Manager::init_backend (const u_long *flags)
-{
-  // If flags have been supplied, and they are different from the flags
-  // we had last time, then we may have to re-create the backend as a
-  // different type.
-  if (flags)
-    {
-      if ((ACE_BIT_ENABLED (*flags, ACE_Log_Msg::SYSLOG)
-            && ACE_BIT_DISABLED (ACE_Log_Msg_Manager::log_backend_flags_, ACE_Log_Msg::SYSLOG))
-          || (ACE_BIT_DISABLED (*flags, ACE_Log_Msg::SYSLOG)
-            && ACE_BIT_ENABLED (ACE_Log_Msg_Manager::log_backend_flags_, ACE_Log_Msg::SYSLOG)))
-        {
-          delete ACE_Log_Msg_Manager::log_backend_;
-          ACE_Log_Msg_Manager::log_backend_ = 0;
-        }
-
-      ACE_Log_Msg_Manager::log_backend_flags_ = *flags;
-    }
-  
-  if (ACE_Log_Msg_Manager::log_backend_ == 0)
-    {
-      ACE_NO_HEAP_CHECK;
-
-#if defined (WIN32) && !defined (ACE_HAS_WINCE)
-      // Allocate the ACE_Log_Msg_Backend instance.
-      if (ACE_BIT_ENABLED (ACE_Log_Msg_Manager::log_backend_flags_, ACE_Log_Msg::SYSLOG))
-        ACE_NEW_RETURN (ACE_Log_Msg_Manager::log_backend_,
-                        ACE_Log_Msg_NT_Event_Log,
-                        -1);
-      else
-        ACE_NEW_RETURN (ACE_Log_Msg_Manager::log_backend_,
-                        ACE_Log_Msg_IPC,
-                        -1);
-#else /* WIN32 && !ACE_HAS_WINCE */
-      // Allocate the ACE_Log_Msg IPC instance.
-      ACE_NEW_RETURN (ACE_Log_Msg_Manager::log_backend_,
-                      ACE_Log_Msg_IPC,
-                      -1);
-#endif /* WIN32 && !ACE_HAS_WINCE */
-    }
-
-  return 0;
-}
+ACE_Log_Msg_Backend *ACE_Log_Msg_Manager::ipc_backend_ = 0;
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 ACE_Recursive_Thread_Mutex *ACE_Log_Msg_Manager::lock_ = 0;
@@ -160,8 +110,16 @@ ACE_Log_Msg_Manager::get_lock (void)
                         0);
     }
 
-  if (init_backend () == -1)
-    return 0;
+
+  if (ACE_Log_Msg_Manager::ipc_backend_ == 0)
+    {
+      ACE_NO_HEAP_CHECK;
+
+      // Allocate the ACE_Log_Msg IPC instance.
+      ACE_NEW_RETURN (ACE_Log_Msg_Manager::ipc_backend_,
+                      ACE_Log_Msg_IPC,
+                      0);
+    }
 
   return ACE_Log_Msg_Manager::lock_;
 }
@@ -182,8 +140,8 @@ ACE_Log_Msg_Manager::close (void)
   delete ACE_Log_Msg_Manager::lock_;
   ACE_Log_Msg_Manager::lock_ = 0;
 
-  delete ACE_Log_Msg_Manager::log_backend_;
-  ACE_Log_Msg_Manager::log_backend_ = 0;
+  delete ACE_Log_Msg_Manager::ipc_backend_;
+  ACE_Log_Msg_Manager::ipc_backend_ = 0;
 }
 
 # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || \
@@ -312,8 +270,10 @@ ACE_Log_Msg::instance (void)
   // We don't have threads, we cannot call
   // ACE_Log_Msg_Manager::get_lock () to initialize the logger
   // callback, so instead we do it here.
-  if (ACE_Log_Msg_Manager::init_backend () == -1)
-    return 0;
+  if (ACE_Log_Msg_Manager::ipc_backend_ == 0)
+    ACE_NEW_RETURN (ACE_Log_Msg_Manager::ipc_backend_,
+                    ACE_Log_Msg_IPC,
+                    0);
 
   // Singleton implementation.
   static ACE_Cleanup_Adapter<ACE_Log_Msg> *log_msg = 0;
@@ -574,8 +534,8 @@ ACE_Log_Msg::~ACE_Log_Msg (void)
   if (instance_count == 0)
     {
       // Destroy the message queue instance.
-      if (ACE_Log_Msg_Manager::log_backend_ != 0)
-        ACE_Log_Msg_Manager::log_backend_->close ();
+      if (ACE_Log_Msg_Manager::ipc_backend_ != 0)
+        ACE_Log_Msg_Manager::ipc_backend_->close ();
 
 #     if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 #       if defined (ACE_HAS_TSS_EMULATION)
@@ -639,24 +599,23 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name,
   int status = 0;
 
   // Be sure that there is a message_queue_, with multiple threads.
-  ACE_MT (ACE_Log_Msg_Manager::init_backend (&flags));
+  ACE_MT (ACE_Log_Msg_Manager::get_lock ());
 
   // Always close the current handle before doing anything else.
-  ACE_Log_Msg_Manager::log_backend_->reset ();
+  ACE_Log_Msg_Manager::ipc_backend_->reset ();
 
   // Note that if we fail to open the message queue the default action
   // is to use stderr (set via static initialization in the
   // Log_Msg.cpp file).
 
-  if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::LOGGER)
-      || ACE_BIT_ENABLED (flags, ACE_Log_Msg::SYSLOG))
+  if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::LOGGER))
     {
       if (logger_key == 0)
         status = -1;
       else
         {
           status =
-            ACE_Log_Msg_Manager::log_backend_->open (logger_key);
+            ACE_Log_Msg_Manager::ipc_backend_->open (logger_key);
         }
 
       if (status == -1)
@@ -1458,10 +1417,10 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
                            ACE_Log_Msg::LOGGER))
         {
           // Be sure that there is a message_queue_, with multiple threads.
-          ACE_MT (ACE_Log_Msg_Manager::init_backend ());
+          ACE_MT (ACE_Log_Msg_Manager::get_lock ());
 
           result =
-            ACE_Log_Msg_Manager::log_backend_->log (log_record);
+            ACE_Log_Msg_Manager::ipc_backend_->log (log_record);
         }
 
       // This must come last, after the other two print operations
@@ -1613,7 +1572,7 @@ ACE_Log_Msg::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_));
 
   // Be sure that there is a message_queue_, with multiple threads.
-  ACE_MT (ACE_Log_Msg_Manager::init_backend ());
+  ACE_MT (ACE_Log_Msg_Manager::get_lock ());
 
   ACE_MT (ACE_Log_Msg_Manager::get_lock ()->dump ());
   // Synchronize output operations.
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 2e570ac9987..a8d5c945407 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -168,9 +168,7 @@ public:
     VERBOSE_LITE = 32,
     /// Do not print messages at all (just leave in thread-specific
     /// storage for later inspection).
-    SILENT = 64,
-    /// Write messages to the system's event log.
-    SYSLOG = 128
+    SILENT = 64
  };
 
   // = Initialization and termination routines.
diff --git a/ace/Log_Msg_Backend.h b/ace/Log_Msg_Backend.h
index bc8e867018a..73e90d8b8ff 100644
--- a/ace/Log_Msg_Backend.h
+++ b/ace/Log_Msg_Backend.h
@@ -43,15 +43,16 @@ public:
   /// Open a new connection
   virtual int open (const ACE_TCHAR *logger_key) = 0;
 
+  /// Reset the backend.
   /*
-   * Reset the backend.  When changing the logging destination the
-   * backend may need to properly disconnect from the remote logging
-   * daemon and reclaim some local resources.  But we try to reduce
-   * the number of local allocations/deallocations.
+   * When changing the logging destination the backend may need to
+   * properly disconnect from the remote logging daemon and reclaim
+   * some local resources.  But we try to reduce the number of local
+   * allocations/deallocations.
    */
   virtual int reset (void) = 0;
 
-  /// Close the backend completely.
+  /// Close the Backend completely.
   virtual int close (void) = 0;
 
   /// Backend routine.  This is called when we want to log a message.
diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp
deleted file mode 100644
index 28760c255de..00000000000
--- a/ace/Log_Msg_NT_Event_Log.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-#include "ace/config-all.h"
-
-#if defined (ACE_WIN32)
-
-#include "ace/Log_Msg_NT_Event_Log.h"
-#include "ace/Log_Record.h"
-
-ACE_RCSID(ace, Log_Msg_NT_Event_Log, "$Id$")
-
-ACE_Log_Msg_NT_Event_Log::ACE_Log_Msg_NT_Event_Log (void)
-  : evlog_handle_(0)
-{
-}
-
-ACE_Log_Msg_NT_Event_Log::~ACE_Log_Msg_NT_Event_Log (void)
-{
-  (void) this->close ();
-}
-
-int
-ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key)
-{
-  // ACE's "resource module" contains the message resource required
-  // for event logging.
-  ACE_TCHAR msg_file [MAXPATHLEN];
-
-  if (!GetModuleFileName (ACE_OS::get_win32_resource_module (),
-                          msg_file,
-                          MAXPATHLEN))
-    return -1;
-  int msg_file_length = ACE_OS::strlen (msg_file);
-
-  // Information is stored in the registry at a location based on the
-  // logger_key.
-  ACE_TCHAR reg_key [MAXPATHLEN];
-  ACE_OS::strcpy (reg_key,
-                  "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\");
-  int reg_key_length = ACE_OS::strlen(reg_key);
-  ACE_OS::strncat (reg_key,
-                   logger_key,
-                   MAXPATHLEN - reg_key_length);
-
-  // Add the event source to the registry. Note that if this fails it
-  // is not fatal. The application will still be able to write entries
-  // to the event log, they just won't be formatted correctly.
-  HKEY hkey;
-  RegCreateKey (HKEY_LOCAL_MACHINE,
-                reg_key,
-                &hkey);
-  DWORD flags = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
-  RegSetValueEx (hkey,
-                 "TypesSupported",
-                 0,
-                 REG_DWORD,
-                 (LPBYTE) &flags,
-                 sizeof (DWORD));
-  RegSetValueEx (hkey,
-                 "EventMessageFile", 
-                 0,
-                 REG_SZ,
-                 (LPBYTE) msg_file,
-                 msg_file_length + 1);
-  RegCloseKey (hkey);
-
-  // Obtain a handle to the event source.
-  this->evlog_handle_ = RegisterEventSource (0, logger_key);
-  return this->evlog_handle_ ? 0 : -1;
-}
-
-int
-ACE_Log_Msg_NT_Event_Log::reset (void)
-{
-  return this->close ();
-}
-
-int
-ACE_Log_Msg_NT_Event_Log::close (void)
-{
-  if (DeregisterEventSource (this->evlog_handle_))
-    {
-      this->evlog_handle_ = 0;
-      return 0;
-    }
-  else
-    return -1;
-}
-
-int
-ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record)
-{
-  // Make a copy of the log text and replace any newlines with
-  // spaces. Newline characters do not appear correctly in the event
-  // viewer.
-  const ACE_TCHAR* src_msg_data = log_record.msg_data ();
-  ACE_TCHAR msg_data [ACE_Log_Record::MAXLOGMSGLEN];
-
-  for (long i = 0; i < log_record.length (); ++i)
-    {
-      if (src_msg_data[i] == '\n')
-        msg_data[i] = ' ';
-      else
-        msg_data[i] = src_msg_data[i];
-    }
-
-  // Map the ACE log record type to an event log type.
-  WORD event_type;
-  switch (log_record.type ())
-  {
-  case LM_STARTUP:
-  case LM_SHUTDOWN:
-  case LM_TRACE:
-  case LM_DEBUG:
-  case LM_INFO:
-    event_type = EVENTLOG_INFORMATION_TYPE;
-    break;
-  case LM_NOTICE:
-  case LM_WARNING:
-    event_type = EVENTLOG_WARNING_TYPE;
-    break;
-  case LM_ERROR:
-  case LM_CRITICAL:
-  case LM_ALERT:
-  case LM_EMERGENCY:
-  default:
-    event_type = EVENTLOG_ERROR_TYPE;
-    break;
-  }
-
-  // Send the log message to the system event log.
-  const ACE_TCHAR* msgs [1];
-  msgs[0] = msg_data;
-
-  if (ReportEvent (this->evlog_handle_,
-                   event_type, 0, 0, 0, 1, 0, msgs, 0) == 0)
-    return -1;
-  else 
-    return 0;
-}
-
-#endif /* ACE_WIN32 */
diff --git a/ace/Log_Msg_NT_Event_Log.h b/ace/Log_Msg_NT_Event_Log.h
deleted file mode 100644
index fe33a54ab28..00000000000
--- a/ace/Log_Msg_NT_Event_Log.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Log_Msg_NT_Event_Log.h
- *
- *  $Id$
- *
- *  @author Christopher Kohlhoff <chris@kohlhoff.com>
- */
-//=============================================================================
-
-#ifndef ACE_LOG_MSG_NT_EVENT_LOG_H
-#define ACE_LOG_MSG_NT_EVENT_LOG_H
-#include "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
-
-#include "ace/Log_Msg_Backend.h"
-
-/**
- * @class ACE_Log_Msg_NT_Event_Log
- *
- * @brief Implements an ACE_Log_Msg_Backend that logs to the WinNT system
- * event log.
- */
-class ACE_Export ACE_Log_Msg_NT_Event_Log : public ACE_Log_Msg_Backend
-{
-public:
-  /// Constructor
-  ACE_Log_Msg_NT_Event_Log (void);
-
-  /// Destructor
-  virtual ~ACE_Log_Msg_NT_Event_Log (void);
-
-  /// Open a new event log.
-  virtual int open (const ACE_TCHAR *logger_key);
-
-  /// Reset the backend.
-  virtual int reset (void);
-
-  /// Close the backend completely.
-  virtual int close (void);
-
-  /// This is called when we want to log a message.
-  virtual int log (ACE_Log_Record &log_record);
-
-private:
-  HANDLE evlog_handle_;
-};
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
-
-#include "ace/post.h"
-#endif /* ACE_LOG_MSG_NT_EVENT_LOG_H */
diff --git a/ace/Logging_Strategy.cpp b/ace/Logging_Strategy.cpp
index 69a271b0f13..43648f76ec5 100644
--- a/ace/Logging_Strategy.cpp
+++ b/ace/Logging_Strategy.cpp
@@ -97,8 +97,6 @@ ACE_Logging_Strategy::tokenize (ACE_TCHAR *flag_string)
         ACE_SET_BITS (this->flags_, ACE_Log_Msg::VERBOSE_LITE);
       else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("SILENT")) == 0)
         ACE_SET_BITS (this->flags_, ACE_Log_Msg::SILENT);
-      else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("SYSLOG")) == 0)
-        ACE_SET_BITS (this->flags_, ACE_Log_Msg::SYSLOG);
     }
 }
 
@@ -108,19 +106,12 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[])
   ACE_TRACE ("ACE_Logging_Strategy::parse_args");
   ACE_TCHAR *temp;
 
-  // Perform data member initializations.
-  this->thread_priority_mask_ = 0;
-  this->process_priority_mask_ = 0;
   this->flags_ = 0;
   this->wipeout_logfile_ = 0;
-  this->count_ = 0;
-  this->fixed_number_ = 0;
-  this->order_files_ = 0;
-  this->max_file_number_ = 1;
   this->interval_ = 0;
   this->max_size_ = ACE_DEFAULT_MAX_LOGFILE_SIZE;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("f:i:k:m:p:s:t:wn:o"), 0);
+  ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("f:i:m:p:s:t:w"), 0);
 
   for (int c; (c = get_opt ()) != -1; )
     {
@@ -135,12 +126,6 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[])
           // Interval (in secs) at which logfile size is sampled.
           this->interval_ = ACE_OS::strtoul (get_opt.optarg, 0, 10);
           break;
-        case 'k':
-          // Ensure that the LOGGER flag is set
-          ACE_SET_BITS (this->flags_, ACE_Log_Msg::LOGGER);
-          delete [] this->logger_key_;
-          this->logger_key_ = ACE::strnew (get_opt.optarg);
-          break;
         case 'm':
           // Maximum logfile size (in KB).  Must be a non-zero value.
           this->max_size_ = ACE_OS::strtoul (get_opt.optarg, 0, 10);
@@ -148,15 +133,6 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[])
             this->max_size_ = ACE_DEFAULT_MAX_LOGFILE_SIZE;
           this->max_size_ <<= 10;       // convert to KB
           break;
-        case 'n':
-          // The max number for the log_file being created
-          this->max_file_number_ = ACE_OS::atoi (get_opt.optarg) - 1;
-          this->fixed_number_ = 1;
-          break;
-        case 'o':
-          // Log_files generation order
-          this->order_files_ = 1;
-          break;
         case 'p':
           temp = get_opt.optarg;
           // Now tokenize the string to setup process log priority
@@ -190,8 +166,7 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void)
 #if defined (ACE_DEFAULT_LOGFILE)
   this->filename_ = ACE::strnew (ACE_DEFAULT_LOGFILE);
 #else /* ACE_DEFAULT_LOGFILE */
-  ACE_NEW (this->filename_,
-           ACE_TCHAR[MAXPATHLEN + 1]);
+  ACE_NEW (this->filename_, ACE_TCHAR[MAXPATHLEN + 1]);
 
   // Get the temporary directory
   if (ACE_Lib_Find::get_temp_dir (this->filename_,
@@ -207,14 +182,12 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void)
   ACE_OS::strcat (this->filename_,
                   ACE_LIB_TEXT ("logfile"));
 #endif /* ACE_DEFAULT_LOGFILE */
-  this->logger_key_ = ACE::strnew (ACE_DEFAULT_LOGGER_KEY);
 }
 
 int
 ACE_Logging_Strategy::fini (void)
 {
   delete [] this->filename_;
-  delete [] this->logger_key_;
   return 0;
 }
 
@@ -252,8 +225,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
                                           | ACE_Log_Msg::OSTREAM
                                           | ACE_Log_Msg::VERBOSE
                                           | ACE_Log_Msg::VERBOSE_LITE
-                                          | ACE_Log_Msg::SILENT
-                                          | ACE_Log_Msg::SYSLOG);
+                                          | ACE_Log_Msg::SILENT);
       // Check if OSTREAM bit is set
       if (ACE_BIT_ENABLED (this->flags_,
                            ACE_Log_Msg::OSTREAM))
@@ -300,7 +272,7 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[])
 
   return ACE_LOG_MSG->open (ACE_LIB_TEXT ("Logging_Strategy"),
                             ACE_LOG_MSG->flags (),
-                            this->logger_key_);
+                            ACE_DEFAULT_LOGGER_KEY);
 }
 
 int
@@ -329,93 +301,22 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &,
       ofstream *output_file = (ofstream *) ACE_LOG_MSG->msg_ostream ();
       output_file->close ();
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-      // Save current logfile to logfile.old analyse if it was set any
-      // fixed number for the log_files
-      if (fixed_number_)
-        {
-          if (max_file_number_ < 1) //we only want one file
-            {
-              // Just unlink the file.
-              ACE_OS::unlink (this->filename_);
-
-              // Open a new log file with the same name.
-              output_file->open (ACE_TEXT_ALWAYS_CHAR (this->filename_),
-                                 ios::out);
-
-              // Release the lock previously acquired.
-              ACE_LOG_MSG->release ();
-              return 0;
-            }
-        }
-      count_++;
-
-      // Set the number of digits of the log_files labels.
-      int digits = 1, res = count_;
-      while((res = (res / 10))>0)
-        digits++;
-
-      if (ACE_OS::strlen (this->filename_) + digits <= MAXPATHLEN)
+      // Save current logfile to logfile.old
+      if (ACE_OS::strlen (this->filename_) + 4 <= MAXPATHLEN)   // 4 for ".old"
         {
           ACE_TCHAR backup[MAXPATHLEN+1];
 
-          // analyse if it was chosen the mode which will order the
-          // log_files
-          if (order_files_)
-            {
-              ACE_TCHAR to_backup[MAXPATHLEN+1];
-
-              // reorder the logs starting at the oldest (the biggest
-              // number) watch if we reached max_file_number_.
-              int max_num;
-              if (fixed_number_ && count_ > max_file_number_)
-                // count_ will always be bigger than max_file_number_,
-                // so do nothing so to always reorder files from
-                // max_file_number_.
-                max_num = max_file_number_;
-              else
-                max_num = count_;
-
-              for (int i = max_num ; i > 1 ;i--)
-                {
-                  ACE_OS::sprintf (backup,
-                                   ACE_LIB_TEXT ("%s.%d"),
-                                   this->filename_,
-                                   i);
-                  ACE_OS::sprintf (to_backup,
-                                   ACE_LIB_TEXT ("%s.%d"),
-                                   this->filename_,
-                                   i - 1);
-
-                  // Remove any existing old file; ignore error as
-                  // file may not exist.
-                  ACE_OS::unlink (backup);
-
-                  // Rename the current log file to the name of the
-                  // backup log file.
-                  ACE_OS::rename (to_backup, backup);
-                }
-              ACE_OS::sprintf (backup,
-                               ACE_LIB_TEXT ("%s.1"),
-                               this->filename_);
-            }
-          else
-            {
-              if (fixed_number_ && count_>max_file_number_) //start over from 1
-                count_ = 1;
-
-              ACE_OS::sprintf (backup,
-                               ACE_LIB_TEXT ("%s.%d"),
-                               this->filename_,
-                               count_);
-            }
+          ACE_OS::strcpy (backup, this->filename_);
+          ACE_OS::strcat (backup, ACE_LIB_TEXT (".old"));
 
-          // Remove any existing old file; ignore error as file may
+          // Remove any existing .old file; ignore error as file may
           // not exist.
           ACE_OS::unlink (backup);
 
           // Rename the current log file to the name of the backup log
           // file.
-          ACE_OS::rename (this->filename_, backup);
+          ACE_OS::rename (this->filename_,
+                          backup);
         }
       else
         ACE_ERROR ((LM_ERROR,
diff --git a/ace/Logging_Strategy.h b/ace/Logging_Strategy.h
index 5a0376793a4..d411fc7ef58 100644
--- a/ace/Logging_Strategy.h
+++ b/ace/Logging_Strategy.h
@@ -42,20 +42,6 @@
  * by specifying the -i <sample_interval_in_secs> and -m
  * <max_size_in_KB> options for the Logging_Strategy class in a
  * svc.conf file.
- *
- * By default, two logfiles are generated.  It's possible, however, to
- * generate as many logfiles as necessary to store all the
- * information.  To achieve this, it is only necessary to indicate the
- * maximum size of the logfiles via the -m option and the process will
- * generate automatically the logfiles.  You can control the total
- * number of logfiles created via the -n option.
- *
- * By using the -o option we can also choose the mode of organization
- * of the files, e.g., the first one is the normal used in Unix
- * systems (when cron rotates the logs it keeps the lowest number the
- * most recent one), the second is for increasing speed (we only
- * create a new log file, and don't rotate the others (fewer accesses
- * to disk)).
  */
 class ACE_Export ACE_Logging_Strategy : public ACE_Service_Object
 {
@@ -76,29 +62,7 @@ public:
    */
   virtual int handle_timeout (const ACE_Time_Value& tv, const void* arg);
 
-  /** Parse arguments provided in svc.conf file.
-   '-f' Pass in the flags (such as OSTREAM, STDERR, LOGGER, VERBOSE,
-        SILENT, VERBOSE_LITE) used to control logging. 
-   '-i' The interval (in seconds) at which the logfile size is sampled
-        (default is 0, i.e., do not sample by default).
-   '-k' Set the logging key.
-   '-m' Maximum logfile size in Kbytes.
-   '-n' The maximum number of logfiles that we want created.
-   '-o' Specifies that we want the no standard logfiles ordering
-        (fastest processing in <handle_timeout>).  Default is not to order
-        logfiles.  
-   '-p' Pass in the process-wide priorities to either enable (e.g.,
-        DEBUG, INFO, WARNING, NOTICE, ERROR, CRITICAL, ALERT,
-        EMERGENCY) or to disable (e.g., ~DEBUG, ~INFO, ~WARNING,
-        ~NOTICE, ~ERROR, ~CRITICAL, ~ALERT, ~EMERGENCY).
-   '-s' Ensure that the OSTREAM flag is set
-   '-t' Pass in the thread-wide priorities to either enable (e.g.,
-        DEBUG, INFO, WARNING, NOTICE, ERROR, CRITICAL, ALERT,
-        EMERGENCY) or to disable (e.g., ~DEBUG, ~INFO, ~WARNING,
-        ~NOTICE, ~ERROR, ~CRITICAL, ~ALERT, ~EMERGENCY).
-   '-w' Cause the logfile to be wiped out, both on startup and on
-        reconfiguration. 
-   */
+  /// Parse svc.conf arguments.
   int parse_args (int argc, ACE_TCHAR *argv[]);
 
 private:
@@ -121,36 +85,14 @@ private:
   /// File name we're logging to.
   ACE_TCHAR *filename_;
 
-  /// Logger key for distributed logging.
-  ACE_TCHAR *logger_key_;
-
   /// If non-0 then wipeout the logfile, otherwise append to it.
-  /// Default value is 0.  
   int wipeout_logfile_;
 
-  /// This tells us in what file we last wrote. It will be increased
-  /// to enable multiple log files
-  int count_;
-
-  /// If non-0 we have a maximum number of log files we can write.
-  /// Default value is 0, i.e., no maximum number.
-  int fixed_number_;
-
-  /// If non-0 we order the files as we rotate them.  Default value
-  /// is 0, i.e., we do not rotate files by default.
-  int order_files_;
-
-  /// Tells us what is the maximum log file to write. We will write
-  /// <max_file_number_> + 1 files (includes the current log file).
-  /// Default value is 1, i.e., 2 files by default.
-  int max_file_number_;
-
   /// If non-zero, sampling interval (in secs) at which maximum logfile
   /// size is checked, otherwise logfile size can grow indefinitely.
-  /// Default value is 0.
   u_long interval_;
 
-  /// Maximum logfile size (in KB).  Default value is <ACE_DEFAULT_MAX_LOGFILE_SIZE>.
+  /// Maximum logfile size (in KB).
   u_long max_size_;
 };
 
diff --git a/ace/MEM_Acceptor.cpp b/ace/MEM_Acceptor.cpp
index 428ec6912a5..98d7fbe8b20 100644
--- a/ace/MEM_Acceptor.cpp
+++ b/ace/MEM_Acceptor.cpp
@@ -3,8 +3,6 @@
 
 #include "ace/MEM_Acceptor.h"
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/MEM_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
@@ -205,5 +203,3 @@ ACE_MEM_Acceptor::shared_accept_finish (ACE_MEM_Stream new_stream,
 
   return 0;
 }
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Acceptor.h b/ace/MEM_Acceptor.h
index b8a719d7de8..fa45b191d73 100644
--- a/ace/MEM_Acceptor.h
+++ b/ace/MEM_Acceptor.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #include "ace/MEM_Stream.h"
 #include "ace/MEM_Addr.h"
 
@@ -159,7 +157,5 @@ private:
 #include "ace/MEM_Acceptor.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
 #include "ace/post.h"
 #endif /* ACE_MEM_ACCEPTOR_H */
diff --git a/ace/MEM_Addr.cpp b/ace/MEM_Addr.cpp
index c51fdceca98..43da9c3164f 100644
--- a/ace/MEM_Addr.cpp
+++ b/ace/MEM_Addr.cpp
@@ -5,8 +5,6 @@
 #include "ace/MEM_Addr.h"
 #include "ace/Log_Msg.h"
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #if !defined (__ACE_INLINE__)
 #include "ace/MEM_Addr.i"
 #endif /* __ACE_INLINE__ */
@@ -143,5 +141,3 @@ ACE_MEM_Addr::dump (void) const
   this->internal_.dump ();
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Addr.h b/ace/MEM_Addr.h
index d13aa45479c..a9cfea3f5d4 100644
--- a/ace/MEM_Addr.h
+++ b/ace/MEM_Addr.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #include "ace/INET_Addr.h"
 
 /**
@@ -147,7 +145,5 @@ private:
 #include "ace/MEM_Addr.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
 #include "ace/post.h"
 #endif /* ACE_MEM_ADDR_H */
diff --git a/ace/MEM_Addr.i b/ace/MEM_Addr.i
index e2cb980a34b..73cb2af2e05 100644
--- a/ace/MEM_Addr.i
+++ b/ace/MEM_Addr.i
@@ -24,7 +24,7 @@ ACE_MEM_Addr::set_port_number (u_short port_number,
 ACE_INLINE int
 ACE_MEM_Addr::set (u_short port_number, int encode)
 {
-  ACE_TRACE ("ACE_MEM_Addr::set");
+  ACE_TRACE ("ACE_INET_Addr::set");
   this->set_port_number (port_number, encode);
   return 0;
 }
diff --git a/ace/MEM_Connector.cpp b/ace/MEM_Connector.cpp
index 3fabb12d5ae..6f739e71a87 100644
--- a/ace/MEM_Connector.cpp
+++ b/ace/MEM_Connector.cpp
@@ -5,8 +5,6 @@
 
 ACE_RCSID(ace, MEM_Connector, "$Id$")
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/MEM_Connector.i"
 #endif
@@ -106,5 +104,3 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream,
 
   return 0;
 }
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Connector.h b/ace/MEM_Connector.h
index 24c9a0f6369..68338c8bb67 100644
--- a/ace/MEM_Connector.h
+++ b/ace/MEM_Connector.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #include "ace/MEM_Stream.h"
 #include "ace/MEM_Addr.h"
 
@@ -113,7 +111,5 @@ private:
 #include "ace/MEM_Connector.i"
 #endif
 
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
 #include "ace/post.h"
 #endif /* ACE_MEM_CONNECTOR_H */
diff --git a/ace/MEM_IO.cpp b/ace/MEM_IO.cpp
index 2a9672c0f70..79e49e81021 100644
--- a/ace/MEM_IO.cpp
+++ b/ace/MEM_IO.cpp
@@ -4,8 +4,6 @@
 #include "ace/MEM_IO.h"
 #include "ace/Handle_Set.h"
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/MEM_IO.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
@@ -202,5 +200,3 @@ ACE_MEM_IO::recv (size_t n, ...) const
   return result;
 }
 #endif /* 0 */
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h
index 6b52edcaa54..9dcecaf4f5e 100644
--- a/ace/MEM_IO.h
+++ b/ace/MEM_IO.h
@@ -24,8 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 /**
  * @class ACE_MEM_IO
  *
@@ -170,7 +168,5 @@ private:
 #include "ace/MEM_IO.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
 #include "ace/post.h"
 #endif /* ACE_SOCK_IO_H */
diff --git a/ace/MEM_SAP.cpp b/ace/MEM_SAP.cpp
index 88725dcad8b..ae62b5e518d 100644
--- a/ace/MEM_SAP.cpp
+++ b/ace/MEM_SAP.cpp
@@ -2,8 +2,6 @@
 
 #include "ace/MEM_SAP.h"
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/MEM_SAP.i"
 #endif
@@ -79,5 +77,3 @@ template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control
 #pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block>
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h
index 1a480b81884..853b3dd8772 100644
--- a/ace/MEM_SAP.h
+++ b/ace/MEM_SAP.h
@@ -21,9 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// MEM_SAP requries position independent pointers to work
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #include "ace/Process_Mutex.h"
 
 /**
@@ -37,7 +34,12 @@ class ACE_Export ACE_MEM_SAP
 public:
   // = Initialization and termination methods.
 
+  /// I'll just hardcode this for mmap for now.
+#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
   typedef ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> MALLOC_TYPE;
+#else
+  typedef ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_Control_Block> MALLOC_TYPE;
+#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
   typedef ACE_MMAP_Memory_Pool_Options MALLOC_OPTIONS;
 
   /// Destructor.
@@ -103,7 +105,5 @@ protected:
 #include "ace/MEM_SAP.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
 #include "ace/post.h"
 #endif /* ACE_SOCK_IO_H */
diff --git a/ace/MEM_Stream.cpp b/ace/MEM_Stream.cpp
index 0b1f9ca3394..9e13eb1708f 100644
--- a/ace/MEM_Stream.cpp
+++ b/ace/MEM_Stream.cpp
@@ -3,7 +3,6 @@
 
 #include "ace/MEM_Stream.h"
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
 #include "ace/MEM_Stream.i"
 #endif
@@ -33,5 +32,3 @@ ACE_MEM_Stream::close (void)
   // Close down the socket.
   return ACE_SOCK::close ();
 }
-
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h
index 24cfbce2733..1fdc9a910aa 100644
--- a/ace/MEM_Stream.h
+++ b/ace/MEM_Stream.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
-
 #include "ace/INET_Addr.h"
 
 class ACE_MEM_Acceptor;
@@ -136,7 +134,5 @@ public:
 #include "ace/MEM_Stream.i"
 #endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
-#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
-
 #include "ace/post.h"
 #endif /* ACE_MEM_STREAM_H */
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 0672fadb9d8..6419a8286ed 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -361,7 +361,12 @@ libACE_Other_la_SOURCES = \
   Name_Space.cpp \
   Naming_Context.cpp \
   Registry_Name_Space.cpp \
-  Remote_Name_Space.cpp
+  Remote_Name_Space.cpp \
+  SOCK_Dgram_Mcast_QoS.cpp \
+  QoS_Session_Impl.cpp \
+  QoS_Session_Factory.cpp \
+  QoS_Manager.cpp \
+  QoS_Decorator.cpp
 
 libACE_la_SOURCES = \
   $(libACE_OS_la_SOURCES) \
@@ -650,7 +655,11 @@ HEADER_FILES = \
   Process_Mutex.h \
   Process_Semaphore.h \
   Profile_Timer.h \
+  QoS_Decorator.h \
+  QoS_Manager.h \
   QoS_Session.h \
+  QoS_Session_Factory.h \
+  QoS_Session_Impl.h \
   QtReactor.h \
   RB_Tree.h \
   RW_Process_Mutex.h \
@@ -668,6 +677,7 @@ HEADER_FILES = \
   SOCK_Dgram.h \
   SOCK_Dgram_Bcast.h \
   SOCK_Dgram_Mcast.h \
+  SOCK_Dgram_Mcast_QoS.h \
   SOCK_IO.h \
   SOCK_Stream.h \
   SPIPE.h \
@@ -770,7 +780,8 @@ HEADER_FILES = \
   post.h \
   pre.h \
   streams.h \
-  svc_export.h 
+  svc_export.h \
+  ws2tcpip.h
 ## Make sure config.h and config-all.h are in the above header list!
 
 INLINE_FILES = \
@@ -881,6 +892,7 @@ INLINE_FILES = \
   Process.i \
   Process_Manager.i \
   Profile_Timer.i \
+  QoS_Session_Impl.i \
   RB_Tree.i \
   Reactor.i \
   Read_Buffer.i \
@@ -892,6 +904,7 @@ INLINE_FILES = \
   SOCK_Dgram.i \
   SOCK_Dgram_Bcast.i \
   SOCK_Dgram_Mcast.i \
+  SOCK_Dgram_Mcast_QoS.i \
   SOCK_IO.i \
   SOCK_Stream.i \
   SPIPE.i \
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index e1ffea7f45b..22bd08b9b30 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -5,8 +5,7 @@
 
 NAME = ace
 
-DIRS =  QoS \
-        SSL \
+DIRS =  SSL \
 	RMCast
 
 OBJFILES = \
@@ -78,7 +77,6 @@ OBJFILES = \
 	$(OBJDIR)\Log_Msg_Backend.obj \
 	$(OBJDIR)\Log_Msg_Callback.obj \
 	$(OBJDIR)\Log_Msg_IPC.obj \
-	$(OBJDIR)\Log_Msg_NT_Event_Log.obj \
 	$(OBJDIR)\Log_Record.obj \
 	$(OBJDIR)\Logging_Strategy.obj \
 	$(OBJDIR)\LSOCK.obj \
@@ -133,6 +131,9 @@ OBJFILES = \
 	$(OBJDIR)\Process.obj \
 	$(OBJDIR)\Process_Manager.obj \
 	$(OBJDIR)\Profile_Timer.obj \
+	$(OBJDIR)\QoS_Manager.obj \
+	$(OBJDIR)\QoS_Session_Factory.obj \
+	$(OBJDIR)\QoS_Session_Impl.obj \
 	$(OBJDIR)\Reactor.obj \
 	$(OBJDIR)\Read_Buffer.obj \
 	$(OBJDIR)\Registry.obj \
@@ -160,6 +161,7 @@ OBJFILES = \
 	$(OBJDIR)\SOCK_Dgram.obj \
 	$(OBJDIR)\SOCK_Dgram_Bcast.obj \
 	$(OBJDIR)\SOCK_Dgram_Mcast.obj \
+	$(OBJDIR)\SOCK_Dgram_Mcast_QoS.obj \
 	$(OBJDIR)\SOCK_IO.obj \
 	$(OBJDIR)\SOCK_Stream.obj \
 	$(OBJDIR)\SPIPE.obj \
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 1033462eb48..52b2ebf0568 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -25,7 +25,7 @@ int ACE_Allocator::delete_allocator_ = 0;
 void
 ACE_Control_Block::ACE_Malloc_Header::dump (void) const
 {
-  ACE_TRACE ("ACE_Control_Block::ACE_Malloc_Header::dump");
+  ACE_TRACE ("ACE_Malloc_Header::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
@@ -94,7 +94,7 @@ ACE_Control_Block::dump (void) const
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
 {
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
 }
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
@@ -106,7 +106,7 @@ ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
     next_ (next),
     prev_ (0)
 {
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
   char *n = this->name_;
   ACE_OS::strcpy (n, name);
   if (next != 0)
@@ -115,7 +115,7 @@ ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
 
 ACE_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
 {
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
 #if !defined (ACE_PSOS)
   ACE_ASSERT (!"not implemented!");
 #endif /* ! ACE_PSOS */
@@ -145,7 +145,7 @@ ACE_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
 void
 ACE_Control_Block::ACE_Name_Node::dump (void) const
 {
-  ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump");
+  ACE_TRACE ("ACE_Name_Node");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("pointer = %x"), (const char *) this->pointer_));
diff --git a/ace/Malloc_Allocator.cpp b/ace/Malloc_Allocator.cpp
index 43827a958d7..2b6f170b5fa 100644
--- a/ace/Malloc_Allocator.cpp
+++ b/ace/Malloc_Allocator.cpp
@@ -125,7 +125,7 @@ ACE_Allocator::ACE_Allocator (void)
 void
 ACE_Static_Allocator_Base::dump (void) const
 {
-  ACE_TRACE ("ACE_Static_Allocator_Base::dump");
+  ACE_TRACE ("ACE_Static_Base_Allocator::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noffset_ = %d"), this->offset_));
@@ -148,7 +148,7 @@ ACE_Malloc_Stats::ACE_Malloc_Stats (void)
 void
 ACE_Malloc_Stats::dump (void) const
 {
-  ACE_TRACE ("ACE_Malloc_Stats::dump");
+  ACE_TRACE ("ACE_Malloc_Stats::print");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   int nblocks = this->nblocks_.value ();
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp
index a8ed0dc2679..971fa37f8e9 100644
--- a/ace/Malloc_T.cpp
+++ b/ace/Malloc_T.cpp
@@ -83,7 +83,7 @@ ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void)
 template <class MALLOC> void
 ACE_Allocator_Adapter<MALLOC>::print_stats (void) const
 {
-  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::print_stats");
+  ACE_TRACE ("ACE_Allocator_Adaptor<MALLOC>::print_stats");
   this->allocator_.print_stats ();
 }
 #endif /* ACE_HAS_MALLOC_STATS */
@@ -91,7 +91,7 @@ ACE_Allocator_Adapter<MALLOC>::print_stats (void) const
 template <class MALLOC> void
 ACE_Allocator_Adapter<MALLOC>::dump (void) const
 {
-  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::dump");
+  ACE_TRACE ("ACE_Malloc<MALLOC>::dump");
   this->allocator_.dump ();
 }
 
@@ -743,7 +743,7 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_It
     guard_ (malloc_.lock_),
     name_ (name != 0 ? ACE_OS::strdup (name) : 0)
 {
-  ACE_TRACE ("ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_Iterator_T");
+  ACE_TRACE ("ACE_Malloc_LIFO_Iterator<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_LIFO_Iterator");
   // Cheap trick to make code simple.
   // @@ Doug, this looks like trouble...
   NAME_NODE temp;
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index ea4fb3bc79b..86d0078f62b 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -176,8 +176,6 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name,
   // Only change the defaults if <options> != 0.
   if (options)
     {
-      if (options->flags_ != 0)
-        this->flags_ = options->flags_;
       if (options->use_fixed_addr_)
         {
           this->base_addr_ =
@@ -186,6 +184,8 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool (const ACE_TCHAR *backing_store_name,
         }
       this->write_each_page_ = options->write_each_page_;
       this->minimum_bytes_ = options->minimum_bytes_;
+      if (options->flags_ != 0)
+        this->flags_ = options->flags_;
       if (options->sa_ != 0)
         this->sa_ = options->sa_;
     }
@@ -674,7 +674,7 @@ int
 ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes,
                                                    off_t &offset)
 {
-  ACE_TRACE ("ACE_Shared_Memory_Pool::commit_backing_store_name");
+  ACE_TRACE ("ACE_Shared_Memory_Pool::update");
 
   size_t counter;
   SHM_TABLE *st = ACE_reinterpret_cast (SHM_TABLE *,
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 990066ebf35..ce9ae206bb0 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -248,7 +248,7 @@ ACE_Message_Block::total_length (void) const
 size_t
 ACE_Message_Block::total_capacity (void) const
 {
-  ACE_TRACE ("ACE_Message_Block::total_capacity");
+  ACE_TRACE ("ACE_Message_Block::total_size");
 
   size_t size = 0;
 
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index 4d6080417d2..62e84b40f61 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -106,7 +106,7 @@ public:
     /// High priority control messages
     MB_PRIORITY = 0x80,
     /// User-defined control messages
-    MB_USER     = 0x200
+    MB_USER     = 0x200 
   };
 
   typedef int ACE_Message_Type;
@@ -117,7 +117,7 @@ public:
     /// Don't delete the data on exit since we don't own it.
     DONT_DELETE = 01,
     /// user defined flags start here
-    USER_FLAGS = 0x1000
+    USER_FLAGS = 0x1000 
   };
 
   // = Initialization and termination.
@@ -376,24 +376,18 @@ public:
   void wr_ptr (char *ptr);
   void wr_ptr (size_t n);
 
-  /** @name Message length and size operations
-   *
-   * Message length is (wr_ptr - rd_ptr).
-   *
-   * Message size is capacity of the message, including data outside
-   * the [rd_ptr,wr_ptr] range.
+  // = Message length is <wr_ptr> - <rd_ptr>.
+  /**
+   * Get the length of the message
+   * Set the length of the message
+   * Get the length of the <Message_Block>s, including chained
+   * <Message_Block>s.
    */
-  //@{
-  /// Get the length of the message
   size_t length (void) const;
-
-  /// Set the length of the message
   void length (size_t n);
-
-  /// Get the length of the <Message_Block>s, including chained
-  /// <Message_Block>s.
   size_t total_length (void) const;
 
+  // = Set/get <Message_Block> size info.
   /// Get the total number of bytes in all <Message_Block>s, including
   /// chained <Message_Block>s.
   size_t total_size (void) const;
@@ -420,7 +414,6 @@ public:
   /// Get the number of bytes available after the <wr_ptr_> in the
   /// top-level <Message_Block>.
   size_t space (void) const;
-  //@}
 
   // = <ACE_Data_Block> methods.
 
diff --git a/ace/Message_Block.i b/ace/Message_Block.i
index 4989478c6db..19774477da1 100644
--- a/ace/Message_Block.i
+++ b/ace/Message_Block.i
@@ -73,7 +73,7 @@ ACE_Data_Block::flags (void) const
 ACE_INLINE ACE_Allocator*
 ACE_Data_Block::data_block_allocator (void) const
 {
-  ACE_TRACE ("ACE_Data_Block::data_block_allocator");
+  ACE_TRACE ("ACE_Message_Block::data_block_allocator");
   return this->data_block_allocator_;
 }
 
diff --git a/ace/Message_Block_T.cpp b/ace/Message_Block_T.cpp
index 4916fd211e7..05d483392b6 100644
--- a/ace/Message_Block_T.cpp
+++ b/ace/Message_Block_T.cpp
@@ -18,7 +18,7 @@ ACE_Locked_Data_Block<L>::~ACE_Locked_Data_Block (void)
 template<class ACE_LOCK> ACE_Data_Block *
 ACE_Locked_Data_Block<ACE_LOCK>::clone_nocopy (ACE_Message_Block::Message_Flags mask) const
 {
-  ACE_TRACE ("ACE_Locked_Data_Block::clone_nocopy");
+  ACE_TRACE ("ACE_Data_Block::clone");
 
   // You always want to clear this one to prevent memory leaks but you
   // might add some others later.
diff --git a/ace/Message_Queue.i b/ace/Message_Queue.i
index b1afcc649d2..07b15edfef5 100644
--- a/ace/Message_Queue.i
+++ b/ace/Message_Queue.i
@@ -75,7 +75,7 @@ ACE_Message_Queue_Vx::message_bytes (void)
 ACE_INLINE size_t
 ACE_Message_Queue_Vx::message_length (void)
 {
-  ACE_TRACE ("ACE_Message_Queue_Vx::message_length");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
   ACE_NOTSUP_RETURN ((size_t) -1);
 }
 
@@ -91,14 +91,14 @@ ACE_Message_Queue_Vx::message_count (void)
 ACE_INLINE void
 ACE_Message_Queue_Vx::message_bytes (size_t)
 {
-  ACE_TRACE ("ACE_Message_Queue_Vx::message_bytes");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_bytes");
   ACE_NOTSUP;
 }
 
 ACE_INLINE void
 ACE_Message_Queue_Vx::message_length (size_t)
 {
-  ACE_TRACE ("ACE_Message_Queue_Vx::message_length");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
   ACE_NOTSUP;
 }
 
@@ -148,7 +148,7 @@ ACE_Message_Queue_NT::message_bytes (void)
 ACE_INLINE size_t
 ACE_Message_Queue_NT::message_length (void)
 {
-  ACE_TRACE ("ACE_Message_Queue_NT::message_length");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
   // Accessing to size_t must be atomic.
   return this->cur_length_;
 }
@@ -164,7 +164,7 @@ ACE_Message_Queue_NT::message_count (void)
 ACE_INLINE void
 ACE_Message_Queue_NT::message_bytes (size_t new_value)
 {
-  ACE_TRACE ("ACE_Message_Queue_NT::message_bytes");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_bytes");
   ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_);
 
   this->cur_bytes_ = new_value;
@@ -173,7 +173,7 @@ ACE_Message_Queue_NT::message_bytes (size_t new_value)
 ACE_INLINE void
 ACE_Message_Queue_NT::message_length (size_t new_value)
 {
-  ACE_TRACE ("ACE_Message_Queue_NT::message_length");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::message_length");
   ACE_GUARD (ACE_Thread_Mutex, ace_mon, this->lock_);
 
   this->cur_length_ = new_value;
@@ -189,7 +189,7 @@ ACE_Message_Queue_NT::max_threads (void)
 ACE_INLINE int
 ACE_Message_Queue_NT::deactivated (void)
 {
-  ACE_TRACE ("ACE_Message_Queue_NT::deactivated");
+  ACE_TRACE ("ACE_Message_Queue_NT::ceactivated");
   // Accessing to int must be atomic.
   return this->deactivated_;
 }
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index 9ac3857896b..113c1538ac6 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -137,7 +137,7 @@ template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> int
 ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_prio (ACE_MESSAGE_TYPE *new_item,
                                                                      ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_prio");
+  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue");
 
   ACE_Message_Block *mb;
 
diff --git a/ace/Message_Queue_T.i b/ace/Message_Queue_T.i
index e8923783001..7250dc9ddd2 100644
--- a/ace/Message_Queue_T.i
+++ b/ace/Message_Queue_T.i
@@ -5,7 +5,7 @@ template <ACE_SYNCH_DECL> ACE_INLINE int
 ACE_Message_Queue<ACE_SYNCH_USE>::dequeue (ACE_Message_Block *&first_item,
                                            ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dequeue");
+  ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::notification_strategy");
   return this->dequeue_head (first_item, timeout);
 }
 
@@ -171,7 +171,7 @@ template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_INLINE int
 ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue (ACE_MESSAGE_TYPE *&first_item,
                                                                 ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::dequeue");
+  ACE_TRACE ("ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::notification_strategy");
 
   return this->queue_.dequeue (first_item, timeout);
 }
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index 91eda1b7d30..4f9e28b7a5f 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -511,7 +511,7 @@ ACE_Name_Options::database (const ACE_TCHAR *db)
 char *
 ACE_Name_Options::base_address (void)
 {
-  ACE_TRACE ("ACE_Name_Options::base_address");
+  ACE_TRACE ("ACE_Name_Options::database");
   return this->base_address_;
 }
 
diff --git a/ace/OS.cpp b/ace/OS.cpp
index ff9c038f317..f86589de11b 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -31,19 +31,6 @@ static const ACE_TCHAR *ACE_OS_CTIME_R_FMTSTR = ACE_LIB_TEXT ("%3s %3s %02d %02d
 # if defined (ACE_WIN32)
 OSVERSIONINFO ACE_OS::win32_versioninfo_;
 // Cached win32 version information.
-
-HINSTANCE ACE_OS::win32_resource_module_;
-
-#  if defined (ACE_OS_HAS_DLL) && (ACE_OS_HAS_DLL == 1) && !defined (ACE_HAS_WINCE)
-// This function is called by the OS when the ACE DLL is loaded. We
-// use it to determine the default module containing ACE's resources.
-BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID)
-{
-  if (reason == DLL_PROCESS_ATTACH)
-    ACE_OS::set_win32_resource_module(instance);
-  return TRUE;
-}
-#  endif /* ACE_OS_HAS_DLL && ACE_OS_HAS_DLL == 1 */
 # endif /* ACE_WIN32 */
 
 class ACE_OS_Thread_Mutex_Guard
@@ -1591,9 +1578,9 @@ ACE_TSS_Ref::operator== (const ACE_TSS_Ref &info) const
 // Check for inequality.
 ACE_SPECIAL_INLINE
 int
-ACE_TSS_Ref::operator != (const ACE_TSS_Ref &tss_ref) const
+ACE_TSS_Ref::operator!= (const ACE_TSS_Ref &tss_ref) const
 {
-  ACE_OS_TRACE ("ACE_TSS_Ref::operator !=");
+  ACE_OS_TRACE ("ACE_TSS_Ref::operator==");
 
   return !(*this == tss_ref);
 }
@@ -1647,9 +1634,9 @@ ACE_TSS_Info::operator== (const ACE_TSS_Info &info) const
 
 // Check for inequality.
 int
-ACE_TSS_Info::operator != (const ACE_TSS_Info &info) const
+ACE_TSS_Info::operator!= (const ACE_TSS_Info &info) const
 {
-  ACE_OS_TRACE ("ACE_TSS_Info::operator !=");
+  ACE_OS_TRACE ("ACE_TSS_Info::operator==");
 
   return !(*this == info);
 }
@@ -4495,7 +4482,7 @@ ACE_OS::write_n (ACE_HANDLE handle,
 int
 ACE_OS::writev_emulation (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n)
 {
-  ACE_OS_TRACE ("ACE_OS::writev_emulation");
+  ACE_OS_TRACE ("::writev");
 
   size_t length = 0;
   int i;
@@ -4543,7 +4530,7 @@ ACE_OS::readv_emulation (ACE_HANDLE handle,
                          ACE_READV_TYPE *iov,
                          int n)
 {
-  ACE_OS_TRACE ("ACE_OS::readv_emulation");
+  ACE_OS_TRACE ("readv");
 
   ssize_t length = 0;
   int i;
diff --git a/ace/OS.h b/ace/OS.h
index 4bd79c8deb1..5bf42bc7349 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -3252,7 +3252,7 @@ PAGE_NOACCESS
 PAGE_NOCACHE  */
 
 #   if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)
-#     include /**/ <ws2tcpip.h>
+#     include "ace/ws2tcpip.h"
 #   endif /* ACE_HAS_WINSOCK2 */
 
 // error code mapping
@@ -3638,14 +3638,6 @@ extern "C"
 #   endif /* ! VXWORKS */
 }
 #   if !defined (ACE_LACKS_TCP_H)
-#     if defined(ACE_HAS_CONFLICTING_XTI_MACROS)
-#       if defined(TCP_NODELAY)
-#         undef TCP_NODELAY
-#       endif
-#       if defined(TCP_MAXSEG)
-#         undef TCP_MAXSEG
-#       endif
-#     endif
 #     include /**/ <netinet/tcp.h>
 #   endif /* ACE_LACKS_TCP_H */
 
@@ -5269,17 +5261,6 @@ public:
   /// Return the win32 OSVERSIONINFO structure.
   static const OSVERSIONINFO &get_win32_versioninfo (void);
 
-  // = A pair of functions for modifying ACE's Win32 resource usage.
-  /// Return the handle of the module containing ACE's resources. By
-  /// default, for a DLL build of ACE this is a handle to the ACE DLL
-  /// itself, and for a static build it is a handle to the executable.
-  static HINSTANCE get_win32_resource_module (void);
-
-  /// Allow an application to modify which module contains ACE's
-  /// resources. This is mainly useful for a static build of ACE where
-  /// the required resources reside somewhere other than the executable.
-  static void set_win32_resource_module (HINSTANCE);
-
 # endif /* ACE_WIN32 */
 
   // = A set of wrappers for miscellaneous operations.
@@ -6598,8 +6579,6 @@ private:
 
   static OSVERSIONINFO win32_versioninfo_;
 
-  static HINSTANCE win32_resource_module_;
-
 # endif /* ACE_WIN32 */
 };
 
@@ -7395,8 +7374,7 @@ extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args);
 #   define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A);
 #   define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A)
 # elif defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CLEANUP)
-extern "C" ACE_OS_Export void ace_mutex_lock_cleanup_adapter (void *args);
-#   define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ace_mutex_lock_cleanup_adapter, (void *) A);
+#   define ACE_PTHREAD_CLEANUP_PUSH(A) pthread_cleanup_push (ACE_OS::mutex_lock_cleanup, (void *) A);
 #   define ACE_PTHREAD_CLEANUP_POP(A) pthread_cleanup_pop(A)
 # else
 #   define ACE_PTHREAD_CLEANUP_PUSH(A)
diff --git a/ace/OS.i b/ace/OS.i
index 6ffc6f973ac..59307f53296 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -147,7 +147,7 @@ ACE_Time_Value::operator timeval () const
 ACE_INLINE
 ACE_Time_Value::operator const timeval * () const
 {
-  ACE_OS_TRACE ("ACE_Time_Value::operator const timeval *");
+  ACE_OS_TRACE ("ACE_Time_Value::operator timeval");
   return (const timeval *) &this->tv_;
 }
 
@@ -2575,7 +2575,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, short type, const wchar_t *name, void *arg)
 ACE_INLINE int
 ACE_OS::cond_signal (ACE_cond_t *cv)
 {
-  ACE_OS_TRACE ("ACE_OS::cond_signal");
+ACE_OS_TRACE ("ACE_OS::cond_signal");
 #if defined (ACE_HAS_PACE)
   ACE_OSCALL_RETURN (::pace_pthread_cond_signal (cv), int, -1);
 # elif defined (ACE_HAS_THREADS)
@@ -2601,7 +2601,7 @@ ACE_OS::cond_signal (ACE_cond_t *cv)
 ACE_INLINE int
 ACE_OS::cond_broadcast (ACE_cond_t *cv)
 {
-  ACE_OS_TRACE ("ACE_OS::cond_broadcast");
+ACE_OS_TRACE ("ACE_OS::cond_broadcast");
 #if defined (ACE_HAS_PACE)
   ACE_OSCALL_RETURN (::pace_pthread_cond_broadcast (cv), int, -1);
 # elif defined (ACE_HAS_THREADS)
@@ -3019,7 +3019,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_OS_TRACE ("ACE_OS::recursive_mutex_unlock");
+ACE_OS_TRACE ("ACE_Recursive_Thread_Mutex::release");
 #if !defined (ACE_NDEBUG)
   ACE_thread_t t_id = ACE_OS::thr_self ();
 #endif /* ACE_NDEBUG */
@@ -4429,7 +4429,7 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw)
 ACE_INLINE int
 ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw)
 {
-  ACE_OS_TRACE ("ACE_OS::rw_trywrlock_upgrade");
+  ACE_OS_TRACE ("ACE_OS::rw_wrlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   // Some native rwlocks, such as those on Solaris and HP-UX 11, don't
@@ -5953,11 +5953,13 @@ ACE_OS::recv (ACE_HANDLE handle, char *buf, int len, int flags)
 #if defined (ACE_WIN32)
   ACE_SOCKCALL_RETURN (::recv ((ACE_SOCKET) handle, buf, len, flags), int, -1);
 #else
+
   int ace_result_;
   ace_result_ = ::recv ((ACE_SOCKET) handle, buf, len, flags);
   if (ace_result_ == -1 && errno == EAGAIN)
     errno = EWOULDBLOCK;
   return ace_result_;
+
 #endif /* defined (ACE_WIN32) */
 }
 
@@ -6009,29 +6011,11 @@ ACE_INLINE int
 ACE_OS::send (ACE_HANDLE handle, const char *buf, int len, int flags)
 {
   ACE_OS_TRACE ("ACE_OS::send");
-
-  // On UNIX, a non-blocking socket with no data to receive, this
-  // system call will return EWOULDBLOCK or EAGAIN, depending on the
-  // platform.  UNIX 98 allows either errno, and they may be the same
-  // numeric value.  So to make life easier for upper ACE layers as
-  // well as application programmers, always change EAGAIN to
-  // EWOULDBLOCK.  Rather than hack the ACE_OSCALL_RETURN macro, it's
-  // handled explicitly here.  If the ACE_OSCALL macro ever changes,
-  // this function needs to be reviewed.  On Win32, the regular macros
-  // can be used, as this is not an issue.
-#if defined (ACE_WIN32)
-  ACE_SOCKCALL_RETURN (::send ((ACE_SOCKET) handle, buf, len, flags), int, -1);
+#if defined (VXWORKS) || defined (HPUX) || defined (ACE_PSOS)
+  ACE_SOCKCALL_RETURN (::send ((ACE_SOCKET) handle, (char *) buf, len, flags), int, -1);
 #else
-  int ace_result_;
-#  if defined (VXWORKS) || defined (HPUX) || defined (ACE_PSOS)
-  ace_result_ = ::send ((ACE_SOCKET) handle, (char *) buf, len, flags);
-#  else
-  ace_result_ = ::send ((ACE_SOCKET) handle, buf, len, flags);
-#  endif /* VXWORKS */
-  if (ace_result_ == -1 && errno == EAGAIN)
-    errno = EWOULDBLOCK;
-  return ace_result_;
-#endif /* defined (ACE_WIN32) */
+  ACE_SOCKCALL_RETURN (::send ((ACE_SOCKET) handle, buf, len, flags), int, -1);
+#endif /* VXWORKS */
 }
 
 ACE_INLINE int
@@ -6794,7 +6778,6 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent,
 #   if !defined (ACE_LACKS_PWD_REENTRANT_FUNCTIONS)
 #     if defined (ACE_HAS_PTHREADS_STD) && \
       !defined (ACE_HAS_STHREADS) || \
-      defined (HPUX_11)  || \
       defined (__USLC__) // Added by Roland Gigler for SCO UnixWare 7.
   struct passwd *result;
   int status;
@@ -7737,32 +7720,13 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle,
                      int, -1);
 # elif defined (ACE_HAS_PTHREADS)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  int ace_result;
 #     if defined (ACE_LACKS_NULL_PTHREAD_STATUS)
   void *temp;
-  ACE_OSCALL (::pthread_join (thr_handle,
-                              status == 0  ?  &temp  :  status),
-              int, -1, ace_result);
+  ACE_OSCALL_RETURN (::pthread_join (thr_handle,
+    status == 0  ?  &temp  :  status), int, -1);
 #     else
-  ACE_OSCALL (::pthread_join (thr_handle, status), int, -1, ace_result);
-#     endif /* ACE_LACKS_NULL_PTHREAD_STATUS */
-  // Joinable threads need to be detached after joining on Pthreads
-  // draft 4 (at least) to reclaim thread storage.
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-#       if defined (HPUX_10)
-  // HP-UX DCE threads' pthread_detach will smash thr_id if it's just given
-  // as an argument.  Since the id is still needed, give pthread_detach
-  // a junker to scribble on.
-  ACE_thread_t  junker;
-  cma_handle_assign(&thr_handle, &junker);
-  ::pthread_detach (&junker);
-#       else
-  ::pthread_detach (&thr_handle);
-#       endif  /* HPUX_10 */
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
-
-    return ace_result;
-
+  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);
@@ -8680,7 +8644,7 @@ ACE_OS::filesize (const ACE_TCHAR *filename)
 ACE_INLINE int
 ACE_OS::closesocket (ACE_HANDLE handle)
 {
-  ACE_OS_TRACE ("ACE_OS::closesocket");
+  ACE_OS_TRACE ("ACE_OS::close");
 #if defined (ACE_WIN32)
   ACE_SOCKCALL_RETURN (::closesocket ((SOCKET) handle), int, -1);
 #elif defined (ACE_PSOS_DIAB_PPC)
@@ -9112,9 +9076,11 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   // Get the correct OS type.
 #if defined (ACE_HAS_WINCE)
   const wchar_t *symbolname = sname;
+#elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
+  char *symbolname = ACE_TEXT_ALWAYS_CHAR (sname);
 #elif defined (ACE_HAS_CHARPTR_DL)
   char *symbolname = ACE_const_cast (char *, sname);
-#elif !defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
+#else
   const char *symbolname = sname;
 #endif /* ACE_HAS_CHARPTR_DL */
 
@@ -9138,10 +9104,6 @@ ACE_OS::dlsym (ACE_SHLIB_HANDLE handle,
   ACE_OSCALL_RETURN (::dlsym (handle, symbolname), void *, 0);
 #   endif /* ACE_LACKS_POSIX_PROTOTYPES */
 
-# elif defined (ACE_WIN32) && defined (ACE_USES_WCHAR) && !defined (ACE_HAS_WINCE)
-
-  ACE_WIN32CALL_RETURN (::GetProcAddress (handle, ACE_TEXT_ALWAYS_CHAR (sname)), void *, 0);
-
 # elif defined (ACE_WIN32)
 
   ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0);
@@ -9731,27 +9693,27 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
 #if defined (ACE_HAS_PACE)
   ACE_UNUSED_ARG (buflen);
   ACE_OSCALL_RETURN (::pace_ctime_r (t, buf), ACE_TCHAR*, 0);
-#elif defined (ACE_HAS_REENTRANT_FUNCTIONS)
+# elif defined (ACE_HAS_REENTRANT_FUNCTIONS)
 #   if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
   ACE_TCHAR *result;
-#      if defined (DIGITAL_UNIX)
+#     if defined (DIGITAL_UNIX)
   ACE_OSCALL (::_Pctime_r (t, buf), ACE_TCHAR *, 0, result);
-#      else /* DIGITAL_UNIX */
+#     else /* DIGITAL_UNIX */
   ACE_OSCALL (::ctime_r (t, buf), ACE_TCHAR *, 0, result);
-#      endif /* DIGITAL_UNIX */
+#     endif /* DIGITAL_UNIX */
   if (result != 0)
     ::strncpy (buf, result, buflen);
   return buf;
 #   else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */
 
-#      if defined (ACE_CTIME_R_RETURNS_INT)
+#     if defined (ACE_CTIME_R_RETURNS_INT)
   return (::ctime_r (t, buf, buflen) == -1 ? 0 : buf);
-#      else /* ACE_CTIME_R_RETURNS_INT */
+#     else /* ACE_CTIME_R_RETURNS_INT */
   ACE_OSCALL_RETURN (::ctime_r (t, buf, buflen), ACE_TCHAR *, 0);
-#      endif /* ACE_CTIME_R_RETURNS_INT */
+#     endif /* ACE_CTIME_R_RETURNS_INT */
 
 #   endif /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */
-#else /* ACE_HAS_REENTRANT_FUNCTIONS */
+# else /* ACE_HAS_REENTRANT_FUNCTIONS */
 #   if defined(ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
    ::strncpy(buf, "ctime-return",buflen);
    return buf;
@@ -9766,8 +9728,8 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
   if (result != 0)
     ACE_OS::strncpy (buf, result, buflen);
   return buf;
-#   endif /* ACE_PSOS && !ACE_PSOS_HAS_TIME */
-#endif /* ACE_HAS_PACE */
+#    endif /* ACE_PSOS && !ACE_PSOS_HAS_TIME */
+# endif /* ACE_HAS_PACE */
 }
 #endif /* !ACE_HAS_WINCE */
 
@@ -9793,7 +9755,7 @@ ACE_OS::gmtime (const time_t *t)
 #if defined (ACE_HAS_PACE)
   ACE_OSCALL_RETURN (::pace_gmtime (t), pace_tm*, 0);
 #elif !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
-  ACE_OS_TRACE ("ACE_OS::gmtime");
+  ACE_OS_TRACE ("ACE_OS::localtime");
   ACE_OSCALL_RETURN (::gmtime (t), struct tm *, 0);
 #else
   // @@ WinCE doesn't have gmtime also.
@@ -12148,16 +12110,4 @@ ACE_OS::get_win32_versioninfo ()
 {
   return ACE_OS::win32_versioninfo_;
 }
-
-ACE_INLINE HINSTANCE
-ACE_OS::get_win32_resource_module ()
-{
-  return ACE_OS::win32_resource_module_;
-}
-
-ACE_INLINE void
-ACE_OS::set_win32_resource_module (HINSTANCE instance)
-{
-  ACE_OS::win32_resource_module_ = instance;
-}
 #endif /* ACE_WIN32 */
diff --git a/ace/OS_Dirent.inl b/ace/OS_Dirent.inl
index 0ffc2dcfe7f..19d2bc2031f 100644
--- a/ace/OS_Dirent.inl
+++ b/ace/OS_Dirent.inl
@@ -138,8 +138,7 @@ ACE_OS_Dirent::readdir_r (DIR *dirp,
                         (_FILE_OFFSET_BITS == 64))) || \
       (!defined (sun) && (defined (ACE_HAS_PTHREADS_STD) || \
                          defined (ACE_HAS_PTHREADS_DRAFT7) || \
-                         defined (__USE_POSIX) || \
-                         defined (HPUX_11)))
+                         defined (__USE_POSIX)))
 # if defined (__GNUG__) && defined (DIGITAL_UNIX)
   return readdir_r (dirp, entry, result);
 # else
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index 7b6ede3605e..28826755974 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -247,12 +247,12 @@ ACE_Object_Manager::init (void)
           ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
                                   ACE_SINGLETON_RECURSIVE_THREAD_LOCK)
           ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_THREAD_EXIT_LOCK)
-#if !defined (ACE_LACKS_ACE_TOKEN) && defined (ACE_HAS_TOKENS_LIBRARY)
+#if !defined (ACE_LACKS_ACE_TOKEN)
           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_LACKS_ACE_TOKEN && ACE_HAS_TOKENS_LIBRARY */
+#endif /* ! ACE_LACKS_ACE_TOKEN */
           ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex,
                                   ACE_PROACTOR_EVENT_LOOP_LOCK)
 #     endif /* ACE_MT_SAFE */
@@ -707,12 +707,12 @@ ACE_Object_Manager::fini (void)
       ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
                                       ACE_SINGLETON_RECURSIVE_THREAD_LOCK)
       ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex, ACE_THREAD_EXIT_LOCK)
-#if !defined (ACE_LACKS_ACE_TOKEN) && defined (ACE_HAS_TOKENS_LIBRARY)
+#if !defined (ACE_LACKS_ACE_TOKEN)
       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_LACKS_ACE_TOKEN && ACE_HAS_TOKENS_LIBRARY */
+#endif /* ! ACE_LACKS_ACE_TOKEN */
       ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex,
                                       ACE_PROACTOR_EVENT_LOOP_LOCK)
 # endif /* ACE_MT_SAFE */
diff --git a/ace/PI_Malloc.cpp b/ace/PI_Malloc.cpp
index e27f3d1f6a8..b514714875c 100644
--- a/ace/PI_Malloc.cpp
+++ b/ace/PI_Malloc.cpp
@@ -27,7 +27,7 @@ ACE_RCSID(ace, PI_Malloc, "$Id$")
 void
 ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 {
-  ACE_TRACE ("ACE_PI_Control_Block::ACE_Malloc_Header::dump");
+  ACE_TRACE ("ACE_Malloc_Header::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_));
@@ -38,7 +38,7 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const
 void
 ACE_PI_Control_Block::print_alignment_info (void)
 {
-  ACE_TRACE ("ACE_PI_Control_Block::ACE_Control_Block::print_alignment_info");
+  ACE_TRACE ("ACE_Control_Block::print_alignment_info");
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n")));
   ACE_DEBUG ((LM_DEBUG,
               ACE_LIB_TEXT ("Sizeof ptr: %d\n")
@@ -72,7 +72,7 @@ ACE_PI_Control_Block::print_alignment_info (void)
 void
 ACE_PI_Control_Block::dump (void) const
 {
-  ACE_TRACE ("ACE_PI_Control_Block::dump");
+  ACE_TRACE ("ACE_Control_Block::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Name Node:\n")));
@@ -96,7 +96,7 @@ ACE_PI_Control_Block::dump (void) const
 
 ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (void)
 {
-  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
 }
 
 ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
@@ -108,7 +108,7 @@ ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
     next_ (next),
     prev_ (0)
 {
-  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
   char *n = this->name_;
   ACE_OS::strcpy (n, name);
   if (next != 0)
@@ -117,7 +117,7 @@ ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const char *name,
 
 ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node (const ACE_Name_Node &)
 {
-  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::ACE_Name_Node");
+  ACE_TRACE ("ACE_Name_Node::ACE_Name_Node");
   ACE_ASSERT (0); // not implemented!
 }
 
@@ -143,7 +143,7 @@ ACE_PI_Control_Block::ACE_Malloc_Header::ACE_Malloc_Header (void)
 void
 ACE_PI_Control_Block::ACE_Name_Node::dump (void) const
 {
-  ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::dump");
+  ACE_TRACE ("ACE_Name_Node");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("pointer = %x"), (const char *) this->pointer_));
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
index 56a2609d04d..366fbf31a10 100644
--- a/ace/POSIX_Asynch_IO.cpp
+++ b/ace/POSIX_Asynch_IO.cpp
@@ -194,16 +194,16 @@ ACE_POSIX_Asynch_Operation::cancel (void)
   // we should call  cancel_aio (this->handle_)
   // method to cancel correctly all deferred AIOs
 
-  switch (p_impl->get_impl_type ())
+  switch ( p_impl->get_impl_type ())
   {
     case ACE_POSIX_Proactor::PROACTOR_SUN:
     case ACE_POSIX_Proactor::PROACTOR_AIOCB:
       {
         ACE_POSIX_AIOCB_Proactor * p_impl_aiocb = ACE_dynamic_cast
           (ACE_POSIX_AIOCB_Proactor *, 
-           p_impl);
+           p_impl );
 
-        if (! p_impl_aiocb)
+        if ( ! p_impl_aiocb)
            return -1;
      
         return p_impl_aiocb->cancel_aio (this->handle_);
@@ -1771,7 +1771,7 @@ ACE_POSIX_Asynch_Accept_Handler::ACE_POSIX_Asynch_Accept_Handler (ACE_Reactor* r
 
 ACE_POSIX_Asynch_Accept_Handler::~ACE_POSIX_Asynch_Accept_Handler (void)
 {
-  ACE_TRACE ("ACE_POSIX_Asynch_Accept_Handler::~ACE_POSIX_Asynch_Accept_Handler");
+  ACE_TRACE ("ACE_POSIX_Asynch_Accept_Handler::dtor");
 }
 
 int
@@ -1862,7 +1862,7 @@ ACE_POSIX_Asynch_Accept_Handler::cancel_uncompleted (int flg_notify)
 
   int retval = 0;
 
-  for (; ; retval++)
+  for ( ; ; retval++ )
   {
     ACE_POSIX_Asynch_Accept_Result* result = 0;
 
@@ -1873,7 +1873,7 @@ ACE_POSIX_Asynch_Accept_Handler::cancel_uncompleted (int flg_notify)
 
     this->reactor_->suspend_handler (result->listen_handle ());
  
-    if (! flg_notify) //if we should not notify 
+    if ( ! flg_notify ) //if we should not notify 
       delete result ;   //   we have to delete result
     else                //else notify as any cancelled AIO
       {
@@ -1916,7 +1916,7 @@ ACE_POSIX_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
   ACE_HANDLE new_handle = ACE_OS::accept (result->listen_handle (), 0, 0);
   if (new_handle == ACE_INVALID_HANDLE)
     {
-      result->set_error(errno);
+      result->set_error( errno );
       ACE_ERROR ((LM_ERROR,
                 "%N:%l:(%P | %t):%p\n",
                 "ACE_POSIX_AIOCB_Asynch_Accept_Handler::"
@@ -2001,7 +2001,7 @@ ACE_POSIX_Asynch_Accept::open (ACE_Handler &handler,
   // check for non zero accept_handler_  
   // we could not create a new handler without closing the previous
 
-  if (this->accept_handler_ != 0)
+  if ( this->accept_handler_ != 0 )
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%N:%l:ACE_POSIX_Asynch_Accept::open:"
                        "accept_handler_ not null\n"),
@@ -2059,7 +2059,7 @@ ACE_POSIX_Asynch_Accept::~ACE_POSIX_Asynch_Accept (void)
 }
 
 int
-ACE_POSIX_Asynch_Accept::close (int flg_notify)
+ACE_POSIX_Asynch_Accept::close ( int flg_notify)
 {
   // 1. It performs cancellation of all pending requests
   // 2. Stops and waits for the thread we had created
@@ -2076,16 +2076,16 @@ ACE_POSIX_Asynch_Accept::close (int flg_notify)
   //  Return codes : 0 - OK , 
   //                -1 - Errors
 
-  if (this->accept_handler_)
-    this->accept_handler_->cancel_uncompleted (flg_notify);
+  if ( this->accept_handler_ )
+    this->accept_handler_->cancel_uncompleted ( flg_notify );
 
   //stop and wait for the thread
 
-  if (grp_id_ != -1)
+  if ( grp_id_ != -1 )
     {
       reactor_.end_reactor_event_loop ();
 
-      if (ACE_Thread_Manager::instance ()->wait_grp (grp_id_) ==-1)
+      if ( ACE_Thread_Manager::instance ()->wait_grp (grp_id_) ==-1)
         ACE_ERROR ((LM_ERROR,
                    "%N:%l:Thread_Manager::wait_grp failed\n"));
       else
@@ -2094,12 +2094,12 @@ ACE_POSIX_Asynch_Accept::close (int flg_notify)
 
   //AL remove and destroy accept_handler_
 
-  if (this->accept_handler_ != 0)
+  if ( this->accept_handler_ != 0 )
     {
       this->reactor_.remove_handler
-                           (this->accept_handler_,
+                           ( this->accept_handler_,
                              ACE_Event_Handler::ALL_EVENTS_MASK
-                           | ACE_Event_Handler::DONT_CALL); 
+                           | ACE_Event_Handler::DONT_CALL ); 
  
       delete this->accept_handler_ ;
       this->accept_handler_ = 0 ;
@@ -2109,7 +2109,7 @@ ACE_POSIX_Asynch_Accept::close (int flg_notify)
   // But I am not sure with compatibility with the old programs
   // You can comment the closure of the socket
 
-  if (this->handle_ != ACE_INVALID_HANDLE)
+  if ( this->handle_ != ACE_INVALID_HANDLE )
     {
       ACE_OS::closesocket (this->handle_);
       this->handle_=ACE_INVALID_HANDLE;
@@ -2118,11 +2118,11 @@ ACE_POSIX_Asynch_Accept::close (int flg_notify)
   return 0;
 }
 
-void *
-ACE_POSIX_Asynch_Accept::thread_function (void *arg_reactor)
+void*
+ACE_POSIX_Asynch_Accept::thread_function (void* arg_reactor)
 {
   // Retrieve the reactor pointer from the argument.
-  ACE_Reactor *reactor = ACE_reinterpret_cast (ACE_Reactor *,
+  ACE_Reactor* reactor = ACE_reinterpret_cast (ACE_Reactor *,
                                                arg_reactor);
 
   // It should be valid Reactor, since we have a reactor_ ,e,ner we
@@ -2135,10 +2135,14 @@ ACE_POSIX_Asynch_Accept::thread_function (void *arg_reactor)
   // For this reactor, this thread is the owner.
   reactor->owner (ACE_OS::thr_self ());
 
-  while (reactor->reactor_event_loop_done () == 0)
-    if (reactor->handle_events () == -1)
-      return ACE_reinterpret_cast (void *, -1);
+  // Handle events.
+  int result = 0;
 
+  //while (result != -1)
+  while ( reactor->reactor_event_loop_done () == 0 )
+    {
+      result = reactor->handle_events ();
+    }
   return 0;
 }
 
@@ -2156,7 +2160,7 @@ ACE_POSIX_Asynch_Accept::cancel (void)
 
   //return ACE_POSIX_Asynch_Operation::cancel ();
 
-  if (this->accept_handler_ == 0)
+  if ( this->accept_handler_ == 0 )
     return 1 ;      // AIO_ALLDONE
 
   //cancel with notifications as POSIX should do
@@ -2165,13 +2169,14 @@ ACE_POSIX_Asynch_Accept::cancel (void)
 
   //retval contains now the number of canceled requests
   
-  if (retval == 0)
+  if ( retval == 0 )
     return 1 ;      // AIO_ALLDONE
 
-  if (retval > 0)
+  if ( retval > 0 )
     return 0;       // AIO_CANCELED
 
   return -1;
+
 }
 
 ACE_Proactor *
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index 85f84575717..8fbc3b5314f 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -110,7 +110,7 @@ ACE_Pipe::open (int buffer_size)
                        ACE_LIB_TEXT ("pipe")),
                       -1);
 
-#if !defined(__QNX__)
+#if defined(__QNX__)
   int arg = RMSGN;
 
   // Enable "msg no discard" mode, which ensures that record
diff --git a/ace/Process_Manager.cpp b/ace/Process_Manager.cpp
index f05ce1e8e1b..5d90e221e86 100644
--- a/ace/Process_Manager.cpp
+++ b/ace/Process_Manager.cpp
@@ -581,7 +581,7 @@ ACE_Process_Manager::remove (pid_t pid)
 int
 ACE_Process_Manager::remove_proc (size_t i)
 {
-  ACE_TRACE ("ACE_Process_Manager::remove_proc");
+  ACE_TRACE ("ACE_Process_Manager::remove");
 
   // If there's an exit_notify_ <Event_Handler> for this pid, call its
   // <handle_close> method.
diff --git a/ace/QoS/ACE_QoS.dsp b/ace/QoS/ACE_QoS.dsp
index d9ddb8c4c11..d00209cc740 100644
--- a/ace/QoS/ACE_QoS.dsp
+++ b/ace/QoS/ACE_QoS.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="ACE_QoS DLL" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ACE_QoS" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=ACE_QoS DLL - Win32 Debug

+CFG=ACE_QoS - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=ACE_QoS DLL - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "ACE_QoS.mak" CFG="ACE_QoS DLL - Win32 Debug"

+!MESSAGE NMAKE /f "ACE_QoS.mak" CFG="ACE_QoS - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ACE_QoS DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ACE_QoS DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ACE_QoS - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "ACE_QoS - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "ACE_QoS DLL - Win32 Release"

+!IF  "$(CFG)" == "ACE_QoS - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -39,11 +39,11 @@ RSC=rc.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Release"

+# PROP Intermediate_Dir "DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QOS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -53,10 +53,10 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /dll /pdb:"ACE_RMCast.pdb" /machine:I386 /out:"..\..\bin\ACE_QoS.dll" /libpath:".."

+# ADD LINK32 ..\..\bin\ace.lib /nologo /dll /pdb:"ACE_RMCast.pdb" /machine:I386 /out:"..\..\bin\ACE_QoS.dll" /implib:"ACE_RMCast.lib" /libpath:".."

 # SUBTRACT LINK32 /pdb:none

 

-!ELSEIF  "$(CFG)" == "ACE_QoS DLL - Win32 Debug"

+!ELSEIF  "$(CFG)" == "ACE_QoS - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -66,11 +66,11 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# PROP Intermediate_Dir ".\DLL\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" /D "_MBCS" /D "_USRDLL" /D "ACE_QOS_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QOS_EXPORTS" /YX /FD  /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -87,8 +87,8 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "ACE_QoS DLL - Win32 Release"

-# Name "ACE_QoS DLL - Win32 Debug"

+# Name "ACE_QoS - Win32 Release"

+# Name "ACE_QoS - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

diff --git a/ace/QoS/ACE_QoS_Export.h b/ace/QoS/ACE_QoS_Export.h
index 45790bbd24c..db4eba50d8f 100644
--- a/ace/QoS/ACE_QoS_Export.h
+++ b/ace/QoS/ACE_QoS_Export.h
@@ -9,15 +9,9 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS)
-# if !defined (ACE_QoS_HAS_DLL)
-#   define ACE_QoS_HAS_DLL 0
-# endif /* ! ACE_QoS_HAS_DLL */
-#else
-# if !defined (ACE_QoS_HAS_DLL)
-#   define ACE_QoS_HAS_DLL 1
-# endif /* ! ACE_QoS_HAS_DLL */
-#endif /* ACE_AS_STATIC_LIB */
+#if !defined (ACE_QoS_HAS_DLL)
+#define ACE_QoS_HAS_DLL 1
+#endif /* ! ACE_QoS_HAS_DLL */
 
 #if defined (ACE_QoS_HAS_DLL)
 #  if (ACE_QoS_HAS_DLL == 1)
diff --git a/ace/QoS/ACE_QoS_Lib.dsp b/ace/QoS/ACE_QoS_Lib.dsp
index c4facd6d3cf..822832a8d99 100644
--- a/ace/QoS/ACE_QoS_Lib.dsp
+++ b/ace/QoS/ACE_QoS_Lib.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="ACE_QoS LIB" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ACE_QoS_Lib" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

-CFG=ACE_QoS LIB - Win32 Static Debug

+CFG=ACE_QoS_Lib - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=ACE_QoS LIB - Win32 Static Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "ACE_QoS_Lib.mak" CFG="ACE_QoS LIB - Win32 Static Debug"

+!MESSAGE NMAKE /f "ACE_QoS_Lib.mak" CFG="ACE_QoS_Lib - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ACE_QoS LIB - Win32 Static Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "ACE_QoS LIB - Win32 Static Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "ACE_QoS_Lib - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "ACE_QoS_Lib - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

@@ -28,20 +28,20 @@ CFG=ACE_QoS LIB - Win32 Static Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "ACE_QoS LIB - Win32 Static Release"

+!IF  "$(CFG)" == "ACE_QoS_Lib - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

+# PROP BASE Output_Dir "ACE_QoS_Lib___Win32_Release"

+# PROP BASE Intermediate_Dir "ACE_QoS_Lib___Win32_Release"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Static_Release"

+# PROP Output_Dir "lib\Release"

+# PROP Intermediate_Dir "lib\Release"

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /D "ACE_AS_STATIC_LIBS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Release/" /Fd"DLL\Release/" /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -49,22 +49,22 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"ACE_QoSs.lib"

+# ADD LIB32 /nologo /out:"..\..\bin\ACE_QoSd.lib"

 

-!ELSEIF  "$(CFG)" == "ACE_QoS LIB - Win32 Static Debug"

+!ELSEIF  "$(CFG)" == "ACE_QoS_Lib - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "ACE_QoS LIB___Win32_Debug"

-# PROP BASE Intermediate_Dir "ACE_QoS LIB___Win32_Debug"

+# PROP BASE Output_Dir "ACE_QoS_Lib___Win32_Debug"

+# PROP BASE Intermediate_Dir "ACE_QoS_Lib___Win32_Debug"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "lib\Release"

+# PROP Intermediate_Dir "lib\Debug"

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "ACE_QoS_BUILD_DLL" /D "ACE_AS_STATIC_LIBS" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD  /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ACE_QoS_BUILD_DLL" /Fo"DLL\Debug/" /Fd"DLL\Debug/" /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -72,14 +72,14 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"ACE_QoSsd.lib"

+# ADD LIB32 /nologo /out:"..\..\bin\ACE_QoS.lib"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "ACE_QoS LIB - Win32 Static Release"

-# Name "ACE_QoS LIB - Win32 Static Debug"

+# Name "ACE_QoS_Lib - Win32 Release"

+# Name "ACE_QoS_Lib - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

diff --git a/ace/QoS/QoS_Session_Impl.cpp b/ace/QoS/QoS_Session_Impl.cpp
index d012fc2cb2d..430ec8a6c1e 100644
--- a/ace/QoS/QoS_Session_Impl.cpp
+++ b/ace/QoS/QoS_Session_Impl.cpp
@@ -39,12 +39,6 @@ rsvp_callback (rapi_sid_t sid,
                void *args
                )
 {
-  ACE_UNUSED_ARG (sid);
-  ACE_UNUSED_ARG (style_id);
-  ACE_UNUSED_ARG (filter_spec_no);
-  ACE_UNUSED_ARG (filter_spec_list);
-  ACE_UNUSED_ARG (ad_spec_no);
-  ACE_UNUSED_ARG (ad_spec_list);
 
   if (args == 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -162,8 +156,6 @@ rsvp_callback (rapi_sid_t sid,
   // Set the updated ACE_QoS for the RSVP callback argument(QoS session).
   qos_session->qos (ace_qos);
 
-  // @@ what is the meaning of the return value. RAPI docs don't say anything!
-  return 0;
 }
 
 // Constructor.
@@ -207,9 +199,7 @@ ACE_RAPI_Session::open (ACE_INET_Addr dest_addr,
 int
 ACE_RAPI_Session::close (void)
 {
-  this->rsvp_error = rapi_release(this->session_id_);
-
-  if (rsvp_error == 0)
+  if (rsvp_error = rapi_release(this->session_id_))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Can't release RSVP session:\n\t%s\n",
                        rapi_errlist[rsvp_error]),
@@ -217,7 +207,7 @@ ACE_RAPI_Session::close (void)
   else
     ACE_DEBUG ((LM_DEBUG,
                 "rapi session with id %d released successfully.\n",
-                this->session_id_));
+               this->session_id_));
   return 0;
 }
 
@@ -227,7 +217,6 @@ ACE_RAPI_Session::qos (ACE_SOCK *socket,
                        const ACE_QoS &ace_qos)
 {
   ACE_UNUSED_ARG (socket);
-  ACE_UNUSED_ARG (qos_manager);
 
   // If sender : call sending_qos ()
   // If receiver : call receiving_qos ()
diff --git a/ace/QoS/QoS_Session_Impl.i b/ace/QoS/QoS_Session_Impl.i
index c3093814ac9..d3bf61c663a 100644
--- a/ace/QoS/QoS_Session_Impl.i
+++ b/ace/QoS/QoS_Session_Impl.i
@@ -57,7 +57,7 @@ ACE_RAPI_Session::rsvp_events_handle (void)
 }
 
 // Get the End Point Type (Sender/Receiver/Both).
-ACE_INLINE ACE_QoS_Session::ACE_End_Point_Type
+ACE_INLINE ACE_End_Point_Type
 ACE_RAPI_Session::flags (void) const
 {
   return this->flags_;
diff --git a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
index 812e5fb3553..c5d7a339d41 100644
--- a/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
+++ b/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp
@@ -95,7 +95,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr,
                                          int reuse_addr,
                                          ACE_Protocol_Info *protocolinfo)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe_ifs");
 #if defined (ACE_WIN32)
   // Windows NT's winsock has trouble with multicast subscribes in the
   // presence of multiple network interfaces when the IP address is
@@ -202,7 +202,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr,
                                      u_long flags,
                                      ACE_QoS_Session *qos_session)
 {
-  ACE_TRACE ("ACE_SOCK_Dgram_Mcast_QoS::subscribe");
+  ACE_TRACE ("ACE_SOCK_Dgram_Mcast::subscribe");
 
   if (this->open (mcast_addr,
                   qos_params,
diff --git a/ace/QoS/makefile.bor b/ace/QoS/makefile.bor
deleted file mode 100644
index 38f51736acf..00000000000
--- a/ace/QoS/makefile.bor
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for building the ACE QoS library with Borland C++Builder
-#
-
-NAME = ACE_QoS
-
-OBJFILES = \
-       $(OBJDIR)\QoS_Decorator.obj \
-       $(OBJDIR)\QoS_Manager.obj \
-       $(OBJDIR)\QoS_Session_Factory.obj \
-       $(OBJDIR)\QoS_Session_Impl.obj \
-       $(OBJDIR)\SOCK_Dgram_Mcast_QoS.obj
-
-CFLAGS = $(ACE_CFLAGS) $(ACE_QOS_CFLAGS) -DACE_QoS_BUILD_DLL
-
-LIBFILES = $(ACE_LIB)
-
-CPPDIR = .
-
-INCDIR_NAME = ace\QoS
-INCLUDES = *.h *.i
-
-!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
-
diff --git a/ace/QtReactor.cpp b/ace/QtReactor.cpp
index 1753b35fd51..15d6a7d3acc 100644
--- a/ace/QtReactor.cpp
+++ b/ace/QtReactor.cpp
@@ -28,11 +28,6 @@ ACE_QtReactor::ACE_QtReactor (QApplication *qapp,
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   this->notify_handler_->close ();
-
-  // Patch for MS Windows: close and open doesn't clear the read
-  // fd_set, so reset it manually
-  this->wait_set_.rd_mask_.reset ();
-
   this->notify_handler_->open (this, 0);
 #endif /* ACE_MT_SAFE */
 }
@@ -99,7 +94,7 @@ ACE_QtReactor::read_event (int handle)
   // Send read event
   ACE_Select_Reactor_Handle_Set dispatch_set;
 
-  dispatch_set.rd_mask_.set_bit (ACE_HANDLE(handle));
+  dispatch_set.rd_mask_.set_bit (handle);
   this->dispatch (1, dispatch_set);
 }
 
@@ -109,7 +104,7 @@ ACE_QtReactor::write_event (int handle)
   // Send write event
   ACE_Select_Reactor_Handle_Set dispatch_set;
 
-  dispatch_set.wr_mask_.set_bit (ACE_HANDLE(handle));
+  dispatch_set.wr_mask_.set_bit (handle);
   this->dispatch (1, dispatch_set);
 }
 
@@ -119,7 +114,7 @@ ACE_QtReactor::exception_event (int handle)
   // Send exception event
   ACE_Select_Reactor_Handle_Set dispatch_set;
 
-  dispatch_set.ex_mask_.set_bit(ACE_HANDLE(handle));
+  dispatch_set.ex_mask_.set_bit(handle);
   dispatch (1, dispatch_set);
 }
 
@@ -188,7 +183,7 @@ ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
         }
       
       ACE_NEW_RETURN (qsock_read_notifier,
-                      QSocketNotifier (int(handle), QSocketNotifier::Read),
+                      QSocketNotifier (handle, QSocketNotifier::Read),
                       -1);
       
       this->read_notifier_.bind (handle,
@@ -222,7 +217,7 @@ ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
         }
       
       ACE_NEW_RETURN (qsock_write_notifier,
-                      QSocketNotifier (int(handle), QSocketNotifier::Write),
+                      QSocketNotifier (handle, QSocketNotifier::Write),
                       -1);
       
       this->write_notifier_.bind (handle,
@@ -255,7 +250,7 @@ ACE_QtReactor::register_handler_i (ACE_HANDLE handle ,
         }
       
       ACE_NEW_RETURN (qsock_excpt_notifier,
-                      QSocketNotifier (int(handle), QSocketNotifier::Exception),
+                      QSocketNotifier (handle, QSocketNotifier::Exception),
                       -1);
       
       this->exception_notifier_.bind (handle,
@@ -283,7 +278,7 @@ ACE_QtReactor::register_handler_i (const ACE_Handle_Set &handles,
 int ACE_QtReactor::remove_handler_i (ACE_HANDLE handle ,
                                      ACE_Reactor_Mask mask   )
 {
-  ACE_TRACE ("ACE_QtReactor::remove_handler_i");
+  ACE_TRACE ("ACE_XtReactor::remove_handler_i");
 
   QSocketNotifier *qsock_notifier = 0;
 
@@ -366,7 +361,7 @@ ACE_QtReactor::schedule_timer (ACE_Event_Handler *handler,
                                const ACE_Time_Value &delta_time,
                                const ACE_Time_Value &interval)
 {
-  ACE_TRACE ("ACE_QtReactor::schedule_timer");
+  ACE_TRACE ("ACE_XtReactor::schedule_timer");
   ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, 
                             ace_mon, 
                             this->token_, 
@@ -389,7 +384,7 @@ int
 ACE_QtReactor::cancel_timer (ACE_Event_Handler *handler,
                              int dont_call_handle_close)
 {
-  ACE_TRACE ("ACE_QtReactor::cancel_timer");
+  ACE_TRACE ("ACE_XtReactor::cancel_timer");
 
   if (ACE_Select_Reactor::cancel_timer (handler, 
                                         dont_call_handle_close ) == -1 ) 
@@ -405,7 +400,7 @@ int ACE_QtReactor::cancel_timer (long  timer_id,
                                  const void **arg,
                                  int dont_call_handle_close )
 {
-  ACE_TRACE( "ACE_QtReactor::cancel_timer" ) ;
+  ACE_TRACE( "ACE_XtReactor::cancel_timer" ) ;
 
   if (ACE_Select_Reactor::cancel_timer (timer_id, 
                                         arg, 
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 12e127f7a00..22a2a4ef3d6 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -348,13 +348,6 @@ public:
   /// Return reverse iterator positioned at first node in tree.
   ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rend (void);
 
-  /// Recursively tests the invariant red-black properties at each
-  /// node of the tree.  Returns 0 if invariant holds, else -1.
-  /// This method is computationally expensive, and should only be
-  /// called for testing purposes, and not in code that depends on the
-  /// algorithmic complexity bounds provided by the other methods.
-  int test_invariant (void);
-
   // = DEPRECATED methods.
   //   Please migrate your code to use the new methods instead
 
@@ -394,6 +387,10 @@ public:
   /// @deprecated
   void clear (void);
 
+  /// Recursively tests the invariant red-black properties at each
+  /// node of the tree.  Returns 0 if invariant holds, else -1.
+  int test_invariant (void);
+
 protected:
 
   // = Protected methods. These should only be called with locks held.
@@ -442,8 +439,8 @@ protected:
    * RIGHT if the node is to the right of the node to be inserted,
    * or EXACT if an exactly matching node already exists.
    */
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *find_node (const EXT_ID &k,
-                                               ACE_RB_Tree_Base::RB_SearchResult &result);
+  ACE_RB_Tree_Node<EXT_ID, INT_ID> *
+    find_node (const EXT_ID &k, RB_SearchResult &result);
 
   /// Rebalance the tree after insertion of a node.
   void RB_rebalance (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x);
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index 4c463f14f94..fd8a4854c6b 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -191,7 +191,8 @@ 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::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 &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);
 
@@ -210,7 +211,8 @@ 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::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;
@@ -235,7 +237,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_
                                                               INT_ID &int_id,
                                                               ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree::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_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -261,7 +264,8 @@ 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::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;
@@ -287,7 +291,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              const INT_ID &int_id,
                                                              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree::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_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -315,8 +320,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              const INT_ID &int_id,
                                                              INT_ID &old_int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree::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;
@@ -344,7 +349,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              INT_ID &old_int_id,
                                                              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree::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,"
              "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);
 
@@ -377,7 +383,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              EXT_ID &old_ext_id,
                                                              INT_ID &old_int_id)
 {
-  ACE_TRACE ("ACE_RB_Tree::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,"
              "EXT_ID &old_ext_id, INT_ID &old_int_id)");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
@@ -408,7 +415,8 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i
                                                              INT_ID &old_int_id,
                                                              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
 {
-  ACE_TRACE ("ACE_RB_Tree::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, "
              "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);
@@ -435,7 +443,8 @@ 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::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;
@@ -457,7 +466,8 @@ 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::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);
@@ -508,7 +518,8 @@ 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::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);
diff --git a/ace/RMCast/RMCast_Export.h b/ace/RMCast/RMCast_Export.h
index 51257c4d682..665d4ecf229 100644
--- a/ace/RMCast/RMCast_Export.h
+++ b/ace/RMCast/RMCast_Export.h
@@ -9,10 +9,6 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
-#  define ACE_RMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
-
 #if !defined (ACE_RMCAST_HAS_DLL)
 #define ACE_RMCAST_HAS_DLL 1
 #endif /* ! ACE_RMCAST_HAS_DLL */
diff --git a/ace/RW_Process_Mutex.cpp b/ace/RW_Process_Mutex.cpp
index 670965810b6..096c46e7ae1 100644
--- a/ace/RW_Process_Mutex.cpp
+++ b/ace/RW_Process_Mutex.cpp
@@ -25,7 +25,7 @@ ACE_RW_Process_Mutex::ACE_RW_Process_Mutex (const ACE_TCHAR *name,
 
 ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex (void)
 {
-// ACE_TRACE ("ACE_RW_Process_Mutex::~ACE_RW_Process_Mutex");
+// ACE_TRACE ("ACE_RW_Process_Mutex::ACE_RW_Process_Mutex");
 }
 
 void
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index bf81a924f52..2ca9ee60593 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -242,7 +242,7 @@ ACE_Reactor::reactor_event_loop_done (void)
 void
 ACE_Reactor::reset_reactor_event_loop (void)
 {
-  ACE_TRACE ("ACE_Reactor::reset_reactor_event_loop");
+  ACE_TRACE ("ACE_Reactor::reset_event_loop");
 
   this->implementation_->deactivate (0);
 }
diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp
index 2b88461446e..f232eb9f6b2 100644
--- a/ace/Read_Buffer.cpp
+++ b/ace/Read_Buffer.cpp
@@ -99,8 +99,13 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace)
       // Don't insert EOF into the buffer...
       if (c == EOF)
         {
-          ungetc (c, this->stream_);
-          break;
+          if (slot == 0)
+            return 0;
+          else
+            {
+              ungetc (c, this->stream_);
+              break;
+            }
         }
       else if (c == term)
         done = 1;
@@ -124,10 +129,6 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace)
   // Increment the number of bytes.
   this->size_ += slot;
 
-  // Don't bother going any farther if the total size is 0.
-  if (this->size_ == 0)
-    return 0;
-
   char *result;
 
   // Recurse, when the recursion bottoms out, allocate the result
@@ -144,7 +145,7 @@ ACE_Read_Buffer::rec_read (int term, int search, int replace)
           return 0;
         }
       result += this->size_;
-
+	  
       // Null terminate the buffer.
       *result = '\0';
     }
diff --git a/ace/Remote_Name_Space.cpp b/ace/Remote_Name_Space.cpp
index d376729ff23..a7e7e754b98 100644
--- a/ace/Remote_Name_Space.cpp
+++ b/ace/Remote_Name_Space.cpp
@@ -216,7 +216,7 @@ int
 ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set,
                                           const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Remote_Name_Space::list_name_entries");
+  ACE_TRACE ("ACE_Remote_Name_Space::list_names");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
   ACE_Name_Request request (ACE_Name_Request::LIST_NAME_ENTRIES,
                             pattern_urep.get (),
@@ -255,7 +255,7 @@ int
 ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set,
                                            const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Remote_Name_Space::list_value_entries");
+  ACE_TRACE ("ACE_Remote_Name_Space::list_values");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
   ACE_Name_Request request (ACE_Name_Request::LIST_VALUE_ENTRIES,
                             pattern_urep.get (),
@@ -294,7 +294,7 @@ int
 ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set,
                                           const ACE_WString &pattern)
 {
-  ACE_TRACE ("ACE_Remote_Name_Space::list_type_entries");
+  ACE_TRACE ("ACE_Remote_Name_Space::list_types");
   ACE_Auto_Basic_Array_Ptr<ACE_USHORT16> pattern_urep (pattern.ushort_rep ());
   ACE_Name_Request request (ACE_Name_Request::LIST_TYPE_ENTRIES,
                             pattern_urep.get (),
diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index 86aec7547d8..504b6319e65 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -8,8 +8,6 @@
 #include "ace/Remote_Tokens.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(ace, Remote_Tokens, "$Id$")
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
@@ -384,7 +382,7 @@ ACE_Remote_Token_Proxy::owner_id (void)
 void
 ACE_Remote_Token_Proxy::dump (void) const
 {
-  ACE_TRACE ("ACE_Remote_Token_Proxy::dump");
+  ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("ACE_Tokens::dump:\n")
               ACE_LIB_TEXT (" ignore_shadow_deadlock_ = %d\n"),
@@ -434,5 +432,3 @@ template class ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX>;
 #pragma instantiate ACE_TSS <ACE_SOCK_Stream>
 #pragma instantiate ACE_Singleton <ACE_TSS_Connection, ACE_TSS_CONNECTION_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Remote_Tokens.h b/ace/Remote_Tokens.h
index 6ec934027cb..54c486d4723 100644
--- a/ace/Remote_Tokens.h
+++ b/ace/Remote_Tokens.h
@@ -11,6 +11,7 @@
  */
 //=============================================================================
 
+
 #ifndef ACE_REMOTE_MUTEX_H
 #define ACE_REMOTE_MUTEX_H
 #include "ace/pre.h"
@@ -27,8 +28,6 @@
 #include "ace/Local_Tokens.h"
 #include "ace/Token_Request_Reply.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 /**
  * @class ACE_Remote_Token_Proxy
  *
@@ -306,8 +305,6 @@ private:
   void operator= (const ACE_TSS_Connection &);
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
-
 #if defined (__ACE_INLINE__)
 #include "ace/Remote_Tokens.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Remote_Tokens.i b/ace/Remote_Tokens.i
index 01fee89af45..bbd2b2613e7 100644
--- a/ace/Remote_Tokens.i
+++ b/ace/Remote_Tokens.i
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
+// Remote_Tokens.i
 
 ACE_INLINE
 ACE_Remote_Mutex::ACE_Remote_Mutex (void)
@@ -94,5 +94,3 @@ ACE_Remote_WLock::clone (void) const
 			       ignore_deadlock_,
 			       debug_);
 }
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/SOCK_Dgram.i b/ace/SOCK_Dgram.i
index 8a7c094f8a5..723a3d3b9d8 100644
--- a/ace/SOCK_Dgram.i
+++ b/ace/SOCK_Dgram.i
@@ -90,7 +90,7 @@ ACE_SOCK_Dgram::recv (iovec buffers[],
                       ACE_OVERLAPPED *overlapped,
                       ACE_OVERLAPPED_COMPLETION_FUNC func) const
 {
-  ACE_TRACE ("ACE_SOCK_Dgram::recv");
+  ACE_TRACE ("ACE_SOCK_IO::recv");
   sockaddr *saddr = (sockaddr *) addr.get_addr ();
   int addr_len = addr.get_size ();
 
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 9ec50735a6d..63c211b4811 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -68,17 +68,21 @@ ACE_SOCK_Dgram_Mcast::open (const ACE_Addr &mcast_addr,
         return -1;
 #endif /* SO_REUSEPORT */
 
-      // Create an address to bind the socket to.
-      ACE_INET_Addr local;
-
-#if defined (linux)
-      local = this->mcast_addr_;
-#else /* linux */
-      if (local.set (this->mcast_addr_.get_port_number ()) == -1)
-        return -1;
-#endif /* linux */
+#if 0
+      // @@ Revert this code if the following call to shared_open() fails...
+       // Create an address to bind the socket to.
+       ACE_INET_Addr local;
+ 
+       if (local.set (this->mcast_addr_.get_port_number ()) == -1)
+         return -1;
+       else if (ACE_SOCK_Dgram::shared_open (local,
+                                             protocol_family) == -1)
+         return -1;
+      }
+#endif /* 0 */
 
-      if (ACE_SOCK_Dgram::shared_open (local,
+      // Create an address to bind the socket to.
+      if (ACE_SOCK_Dgram::shared_open (this->mcast_addr_,
                                        protocol_family) == -1)
         return -1;
     }
diff --git a/ace/SSL/SSL_Export.h b/ace/SSL/SSL_Export.h
index ec478095d18..3adaae9798a 100644
--- a/ace/SSL/SSL_Export.h
+++ b/ace/SSL/SSL_Export.h
@@ -9,10 +9,6 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SSL_HAS_DLL)
-#  define ACE_SSL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_SSL_HAS_DLL */
-
 #if !defined (ACE_SSL_HAS_DLL)
 #define ACE_SSL_HAS_DLL 1
 #endif /* ! ACE_SSL_HAS_DLL */
diff --git a/ace/SString.cpp b/ace/SString.cpp
index e55458d26d1..62e2a46cc41 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -683,7 +683,7 @@ ACE_WString::char_rep (void) const
 ACE_USHORT16 *
 ACE_WString::ushort_rep (void) const
 {
-  ACE_TRACE ("ACE_WString::ushort_rep");
+  ACE_TRACE ("ACE_WString::char_rep");
   if (this->len_ <= 0)
     return 0;
   else
diff --git a/ace/SString.h b/ace/SString.h
index 9bbe672886c..af2194eadb8 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -151,15 +151,15 @@ public:
   int strstr (const ACE_CString &s) const;
 
   /// Find <str> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (const ACE_CString &str, int pos = 0) const;
 
   /// Find <s> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (const char *s, int pos = 0) const;
 
   /// Find <c> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (char c, int pos = 0) const;
 
   /// Find <c> starting at pos (counting from the end).  Returns the
@@ -328,15 +328,15 @@ public:
   int strstr (const ACE_WString &s) const;
 
   /// Find <str> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (const ACE_WString &str, int pos = 0) const;
 
   /// Find <s> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (const ACE_WSTRING_TYPE *s, int pos = 0) const;
 
   /// Find <c> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (ACE_WSTRING_TYPE c, int pos = 0) const;
 
   /// Find <c> starting at pos (counting from the end).  Returns the
@@ -485,15 +485,15 @@ public:
   int strstr (const ACE_SString &s) const;
 
   /// Find <str> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (const ACE_SString &str, int pos = 0) const;
 
   /// Find <s> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (const char *s, int pos = 0) const;
 
   /// Find <c> starting at pos.  Returns the slot of the first
-  /// location that matches (will be >= pos), else npos.
+  /// location that matches, else npos.
   int find (char c, int pos = 0) const;
 
   /// Find <c> starting at pos (counting from the end).  Returns the
diff --git a/ace/SString.i b/ace/SString.i
index 8d16e280e93..7c8d48bff16 100644
--- a/ace/SString.i
+++ b/ace/SString.i
@@ -265,7 +265,7 @@ ACE_CString::find (const char *s, int pos) const
   if (pointer == 0)
     return ACE_CString::npos;
   else
-    return pointer - this->rep_;
+    return pointer - substr;
 }
 
 ACE_INLINE int
@@ -276,7 +276,7 @@ ACE_CString::find (char c, int pos) const
   if (pointer == 0)
     return ACE_CString::npos;
   else
-    return pointer - this->rep_;
+    return pointer - substr;
 }
 
 ACE_INLINE int
@@ -444,7 +444,7 @@ ACE_SString::find (const char *s, int pos) const
   if (pointer == 0)
     return ACE_SString::npos;
   else
-    return pointer - this->rep_;
+    return pointer - substr;
 }
 
 ACE_INLINE int
@@ -455,7 +455,7 @@ ACE_SString::find (char c, int pos) const
   if (pointer == 0)
     return ACE_SString::npos;
   else
-    return pointer - this->rep_;
+    return pointer - substr;
 }
 
 ACE_INLINE int
@@ -632,7 +632,7 @@ ACE_WString::find (const ACE_WSTRING_TYPE *s, int pos) const
   if (pointer == 0)
     return ACE_WString::npos;
   else
-    return pointer - this->rep_;
+    return pointer - substr;
 }
 
 ACE_INLINE int
diff --git a/ace/SUN_Proactor.cpp b/ace/SUN_Proactor.cpp
index 8fc63accb47..319681a22f5 100644
--- a/ace/SUN_Proactor.cpp
+++ b/ace/SUN_Proactor.cpp
@@ -282,7 +282,7 @@ ACE_SUN_Proactor::start_aio (ACE_POSIX_Asynch_Result *result)
 int
 ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result)
 {
-  ACE_TRACE ("ACE_SUN_Proactor::cancel_aiocb");
+  ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::cancel_aiocb");
   int rc = ::aiocancel (& result->aio_resultp);
   
   if (rc == 0)    //  AIO_CANCELED
@@ -294,7 +294,7 @@ ACE_SUN_Proactor::cancel_aiocb (ACE_POSIX_Asynch_Result *result)
 int
 ACE_SUN_Proactor::cancel_aio (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_SUN_Proactor::cancel_aio");
+  ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::cancel_aio");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->mutex_, -1));
         
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index c398a82c620..e3ac7b8f0e9 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -739,7 +739,7 @@ int
 ACE_Select_Reactor_Notify::dispatch_notifications (int &number_of_active_handles,
                                                    ACE_Handle_Set &rd_mask)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Notify::dispatch_notifications");
+  ACE_TRACE ("ACE_Select_Reactor_Notify::handle_notification");
 
   ACE_HANDLE read_handle =
     this->notification_pipe_.read_handle ();
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index fb6149ebda5..8f12abd2edd 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -187,7 +187,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::renew (void)
 template <class ACE_SELECT_REACTOR_MUTEX> void
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::dump (void) const
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token_T::dump");
+  ACE_TRACE ("ACE_Select_Reactor_Token::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n")));
@@ -199,20 +199,20 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::ACE_Select_Reactor_Token_T
   (ACE_Select_Reactor_Impl &r)
     : select_reactor_ (&r)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token");
+  ACE_TRACE ("ACE_Select_Reactor_Token::ACE_Select_Reactor_Token");
 }
 
 template <class ACE_SELECT_REACTOR_MUTEX>
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::ACE_Select_Reactor_Token_T (void)
   : select_reactor_ (0)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token_T::ACE_Select_Reactor_Token");
+  ACE_TRACE ("ACE_Select_Reactor_Token::ACE_Select_Reactor_Token");
 }
 
 template <class ACE_SELECT_REACTOR_MUTEX>
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::~ACE_Select_Reactor_Token_T (void)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token_T::~ACE_Select_Reactor_Token_T");
+  ACE_TRACE ("ACE_Select_Reactor_Token::~ACE_Select_Reactor_Token");
 }
 
 template <class ACE_SELECT_REACTOR_MUTEX> ACE_Select_Reactor_Impl &
@@ -233,7 +233,7 @@ ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::select_reactor
 template <class ACE_SELECT_REACTOR_MUTEX> void
 ACE_Select_Reactor_Token_T<ACE_SELECT_REACTOR_MUTEX>::sleep_hook (void)
 {
-  ACE_TRACE ("ACE_Select_Reactor_Token_T::sleep_hook");
+  ACE_TRACE ("ACE_Select_Reactor_Token::sleep_hook");
   if (this->select_reactor_->notify () == -1)
     ACE_ERROR ((LM_ERROR,
                 ACE_LIB_TEXT ("%p\n"),
@@ -869,7 +869,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i
 template <class ACE_SELECT_REACTOR_TOKEN> int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::resume_i (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_Select_Reactor_T::resume_i");
+  ACE_TRACE ("ACE_Select_Reactor_T::resume");
   if (this->handler_rep_.find (handle) == 0)
     return -1;
 
diff --git a/ace/Select_Reactor_T.i b/ace/Select_Reactor_T.i
index 8d0054a6219..6241c735589 100644
--- a/ace/Select_Reactor_T.i
+++ b/ace/Select_Reactor_T.i
@@ -58,8 +58,8 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler (int signum,
 {
   ACE_TRACE ("ACE_Select_Reactor_T::register_handler");
   return this->signal_handler_->register_handler (signum,
-                                                  new_sh, new_disp,
-                                                  old_sh, old_disp);
+						  new_sh, new_disp,
+						  old_sh, old_disp);
 }
 
 #if defined (ACE_WIN32)
@@ -136,8 +136,8 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::cancel_timer (long timer_id,
 {
   ACE_TRACE ("ACE_Select_Reactor_T::cancel_timer");
   return this->timer_queue_->cancel (timer_id,
-                                     arg,
-                                     dont_call_handle_close);
+				     arg,
+				     dont_call_handle_close);
 }
 
 // Performs operations on the "ready" bits.
@@ -224,14 +224,12 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::alertable_handle_events (ACE_Tim
 template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ int
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivated (void)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_, -1));
   return this->deactivated_;
 }
 
 template <class ACE_SELECT_REACTOR_TOKEN> /* ACE_INLINE */ void
 ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::deactivate (int do_stop)
 {
-  ACE_MT (ACE_GUARD (ACE_SELECT_REACTOR_TOKEN, ace_mon, this->token_));
   this->deactivated_ = do_stop;
   this->wakeup_all_threads ();
 }
diff --git a/ace/Service_Object.i b/ace/Service_Object.i
index 7b735cf6c1f..85e4d64278f 100644
--- a/ace/Service_Object.i
+++ b/ace/Service_Object.i
@@ -82,6 +82,6 @@ ACE_Service_Type::active (int turnon)
 ACE_INLINE int
 ACE_Service_Type::fini_called (void) const
 {
-  ACE_TRACE ("ACE_Service_Type::fini_called");
+  ACE_TRACE ("ACE_Service_TYpe::fini_called");
   return this->fini_already_called_;
 }
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 3525df3b7af..a73c576236d 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -37,7 +37,7 @@ ACE_Service_Repository::ACE_Service_Repository (void)
 ACE_Service_Repository *
 ACE_Service_Repository::instance (int size /* = ACE_Service_Repository::DEFAULT_SIZE */)
 {
-  ACE_TRACE ("ACE_Service_Repository::instance");
+  ACE_TRACE ("ACE_Service_Config::instance");
 
   if (ACE_Service_Repository::svc_rep_ == 0)
     {
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index ed2c81f53f8..623384a46a3 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -18,7 +18,7 @@ ACE_RCSID(ace, Signal, "$Id$")
 extern "C" void
 ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 {
-  ACE_TRACE ("ace_sig_handler_dispatch");
+  ACE_TRACE ("ace_signal_handler_dispatch");
   ACE_Sig_Handler::dispatch (signum, info, context);
 }
 
@@ -28,7 +28,7 @@ ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 extern "C" void
 ace_sig_handlers_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 {
-  ACE_TRACE ("ace_sig_handlers_dispatch");
+  ACE_TRACE ("ace_signal_handlers_dispatch");
   ACE_Sig_Handlers::dispatch (signum, info, context);
 }
 
diff --git a/ace/Signal.i b/ace/Signal.i
index e2ca95be130..35c6016c8d4 100644
--- a/ace/Signal.i
+++ b/ace/Signal.i
@@ -165,7 +165,7 @@ ACE_Sig_Action::sigaction (void)
 ACE_INLINE void
 ACE_Sig_Action::sigaction (ACE_SignalHandler handler)
 {
-  ACE_TRACE ("ACE_Sig_Action::sigaction");
+  ACE_TRACE ("ACE_Sig_Action::handler");
   this->sa_.sa_sigaction = (void (*)()) ACE_SignalHandlerV (handler);
 }
 #endif /* 0 */
diff --git a/ace/Sock_Connect.cpp b/ace/Sock_Connect.cpp
index d39a3fd073f..f5e094a52ab 100644
--- a/ace/Sock_Connect.cpp
+++ b/ace/Sock_Connect.cpp
@@ -305,7 +305,7 @@ ACE_Sock_Connect::get_bcast_addr (ACE_UINT32 &bcast_addr,
 
 int
 ACE_Sock_Connect::get_ip_interfaces (size_t &count,
-                                     ACE_INET_Addr *&addrs)
+                        ACE_INET_Addr *&addrs)
 {
   ACE_TRACE ("ACE_Sock_Connect::get_ip_interfaces");
 
@@ -324,9 +324,9 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
   defined (_MSC_VER) && (_MSC_VER >= 1100)
 #endif /* 0 */
 
-  int i, n_interfaces, status;
-
+    int i, n_interfaces, status;
   INTERFACE_INFO info[64];
+  LPINTERFACE_INFO lpii;
   SOCKET sock;
 
   // Get an (overlapped) DGRAM socket to test with
@@ -337,10 +337,8 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
   DWORD bytes;
   status = WSAIoctl(sock,
                     SIO_GET_INTERFACE_LIST,
-                    0, 
-                    0,
-                    info, 
-                    sizeof(info),
+                    0, 0,
+                    info, sizeof(info),
                     &bytes,
                     0,
                     0);
@@ -360,7 +358,6 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
   // because they're down or don't have an IP address.
   for (count = 0, i = 0; i < n_interfaces; i++)
     {
-      LPINTERFACE_INFO lpii;
       struct sockaddr_in *addrp;
 
       lpii = &info[i];
@@ -373,7 +370,7 @@ ACE_Sock_Connect::get_ip_interfaces (size_t &count,
         continue;
 
       // Set the address for the caller.
-      addrs[count].set(addrp, sizeof(sockaddr_in));
+      addrs[count].set(addrp, sizeof(lpii->iiAddress));
       ++count;
     }
 
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index d14b6228b72..2b9ad997a00 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -90,10 +90,9 @@ extern int ace_yyleng;
 extern ACE_Obstack *ace_obstack;
 // Efficient memory allocation technique
 
-extern ACE_Export ACE_Service_Type_Impl *
-    ace_create_service_type (const ACE_TCHAR *, int,
-                             void *, unsigned int,
-                             ACE_Service_Object_Exterminator = 0);
+ACE_Service_Type_Impl *ace_create_service_type (const ACE_TCHAR *, int,
+                                                void *, unsigned int,
+                                                ACE_Service_Object_Exterminator = 0);
 // Factory that creates a new ACE_Service_Type_Impl.
 
 typedef union
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index 2d5a78e0423..89f8e6a8d29 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -32,7 +32,7 @@ template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *,
                                                           void *)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (NOOP, 2 parameters)");
+  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::delete (NOOP, 2 parameters)");
   return;
 }
 #endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
@@ -81,7 +81,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void)
 template <PR_ST_1, ACE_SYNCH_DECL> void
 ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete (void *obj)
 {
-  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::operator delete");
+  ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::delete");
   // You cannot delete a 'void*' (X3J16/95-0087 5.3.5.3), but we know
   // the pointer was created using new char[] (see operator new code),
   // so we use a cast:
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index 0f6ff94e0f7..a8cc5775964 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -626,7 +626,7 @@ int
 ACE_Condition_Thread_Mutex::wait (ACE_Thread_Mutex &mutex,
                                   const ACE_Time_Value *abstime)
 {
-// ACE_TRACE ("ACE_Condition_Thread_Mutex::wait");
+// ACE_TRACE ("ACE_Condition<MUTEX>::wait");
   return ACE_OS::cond_timedwait (&this->cond_,
                                  &mutex.lock_,
                                  (ACE_Time_Value *) abstime);
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index fed6d3dfd0a..6cd43897ca1 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -43,7 +43,7 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::~ACE_Reverse_Lock (void)
 template <class ACE_LOCK, class TYPE> ACE_LOCK &
 ACE_Atomic_Op<ACE_LOCK, TYPE>::mutex (void)
 {
-// ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::mutex");
+// ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::lock");
   return this->mutex_;
 }
 
@@ -676,7 +676,7 @@ ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard (void)
 template <class ACE_LOCK> void
 ACE_TSS_Guard<ACE_LOCK>::cleanup (void *ptr)
 {
-// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::cleanup");
+// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::dump");
 
   // Destructor releases lock.
   delete (ACE_Guard<ACE_LOCK> *) ptr;
diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp
index 300a0d1c135..6957e50a8e9 100644
--- a/ace/TP_Reactor.cpp
+++ b/ace/TP_Reactor.cpp
@@ -87,22 +87,22 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time)
   // Update the countdown to reflect time waiting for the token.
   countdown.update ();
 
-  // Check for timeouts and errors.
-  if (result == -1)
+  switch (result)
     {
+    case 2:
+      ACE_MT (this->token_.release ());
+      return 0;
+    case -1:
       if (errno == ETIME)
         return 0;
-      else
-        return -1;
+      return -1;
     }
 
-  // After acquiring the lock, check if we have been deactivated.  If
-  // we are deactivated, simply return without handling further
-  // events.
+  // After acquiring the lock, check if we have been deactivated.
   if (this->deactivated_)
     {
       ACE_MT (this->token_.release ());
-      return 0;
+      return -1;
     }
 
   // We got the lock, lets handle some events.  Note: this method will
@@ -143,6 +143,7 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time)
     }
 
   return result;
+
 }
 
 int
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index dab47eedda7..4f5b8d76d7b 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -166,6 +166,9 @@ public:
   /// Called from handle events
   static void no_op_sleep_hook (void *);
 
+  /// Wake up all threads in waiting in the event loop
+  virtual void wakeup_all_threads (void);
+
   // = Any thread can perform a <handle_events>, override the owner()
   //   methods to avoid the overhead of setting the owner thread.
 
diff --git a/ace/TP_Reactor.i b/ace/TP_Reactor.i
index 091124adbef..64b5ad0c0ea 100644
--- a/ace/TP_Reactor.i
+++ b/ace/TP_Reactor.i
@@ -16,6 +16,18 @@ ACE_TP_Reactor::mask_ops (ACE_Event_Handler *eh,
 }
 
 ACE_INLINE void
+ACE_TP_Reactor::wakeup_all_threads (void)
+{
+  ACE_MT (this->token_.signal_all_threads (););
+
+  // Send a notification, but don't block if there's no one to receive
+  // it.
+  this->notify (0,
+                ACE_Event_Handler::NULL_MASK,
+                (ACE_Time_Value *) &ACE_Time_Value::zero);
+}
+
+ACE_INLINE void
 ACE_TP_Reactor::notify_handle (ACE_HANDLE,
                                ACE_Reactor_Mask,
                                ACE_Handle_Set &,
diff --git a/ace/Thread_Adapter.cpp b/ace/Thread_Adapter.cpp
index 91357bfc58f..76bf66710ee 100644
--- a/ace/Thread_Adapter.cpp
+++ b/ace/Thread_Adapter.cpp
@@ -34,7 +34,7 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
         )
   , thr_mgr_ (tm)
 {
-  ACE_OS_TRACE ("ACE_Thread_Adapter::ACE_Thread_Adapter");
+  ACE_OS_TRACE ("Ace_Thread_Adapter::Ace_Thread_Adapter");
 }
 
 ACE_Thread_Adapter::~ACE_Thread_Adapter (void)
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index a9578efc99b..0dacdf7bc55 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -113,7 +113,7 @@ void
 ACE_Thread_Descriptor::do_at_exit ()
 
 {
-  ACE_TRACE ("ACE_Thread_Descriptor::do_at_exit");
+  ACE_TRACE ("ACE_Thread_Descriptor::at_exit");
   while (at_exit_list_!=0)
     this->at_pop ();
 }
@@ -952,6 +952,20 @@ ACE_Thread_Manager::join_thr (ACE_Thread_Descriptor *td, int)
   return ACE_Thread::join (td->thr_handle_);
 #else
   int result = ACE_Thread::join (td->thr_handle_);
+
+# if defined (ACE_HAS_PTHREADS_DRAFT4)  &&  defined (ACE_LACKS_SETDETACH)
+#   if defined (HPUX_10)
+  // HP-UX DCE threads' pthread_detach will smash thr_id if it's just given
+  // as an argument.  Since the id is still needed, give pthread_detach
+  // a junker to scribble on.
+  ACE_thread_t  junker;
+  cma_handle_assign(&td->thr_handle_, &junker);
+  ::pthread_detach (&junker);
+#   else
+  ::pthread_detach (&td->thr_handle_);
+#   endif  /* HPUX_10 */
+# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */
+
   if (result != 0)
     {
       // Since the thread are being joined, we should
@@ -1293,7 +1307,7 @@ ACE_Thread_Manager::kill_grp (int grp_id, int signum)
 int
 ACE_Thread_Manager::cancel_grp (int grp_id, int async_cancel)
 {
-  ACE_TRACE ("ACE_Thread_Manager::cancel_grp");
+  ACE_TRACE ("ACE_Thread_Manager::resume_grp");
   return this->apply_grp (grp_id,
                           ACE_THR_MEMBER_FUNC (&ACE_Thread_Manager::cancel_thr),
                           async_cancel);
@@ -2146,7 +2160,7 @@ ACE_Thread_Manager::hthread_grp_list (int grp_id,
                                       ACE_hthread_t hthread_list[],
                                       size_t n)
 {
-  ACE_TRACE ("ACE_Thread_Manager::hthread_grp_list");
+  ACE_TRACE ("ACE_Thread_Manager::hthread_list");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
 
   size_t hthread_count = 0;
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 4b8e06518ec..d1b2171e208 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -181,14 +181,14 @@ public:
   int operator!= (const ACE_Thread_Descriptor_Base &rhs) const;
 
   /// Group ID.
-  int grp_id (void) const;
+  int grp_id (void);
 
   /// Current state of the thread.
-  ACE_UINT32 state (void) const;
- 
+  ACE_UINT32 state (void);
+
   /// Return the pointer to an <ACE_Task_Base> or NULL if there's no
   /// <ACE_Task_Base> associated with this thread.;
-  ACE_Task_Base *task (void) const; 
+  ACE_Task_Base *task (void);
 
 protected:
   /// Reset this base thread descriptor.
@@ -236,7 +236,7 @@ public:
 
   // = Accessor methods.
   /// Unique thread id.
-  ACE_thread_t self (void) const;
+  ACE_thread_t self (void);
 
   /// Unique handle to thread (used by Win32 and AIX).
   void self (ACE_hthread_t &);
@@ -299,7 +299,7 @@ public:
    * of g++ couldn't grok this code without it.
    */
   ACE_INLINE_FOR_GNUC void set_next (ACE_Thread_Descriptor *td);
-  ACE_INLINE_FOR_GNUC ACE_Thread_Descriptor *get_next (void) const;
+  ACE_INLINE_FOR_GNUC ACE_Thread_Descriptor *get_next (void);
 
 private:
   /// Reset this thread descriptor.
diff --git a/ace/Thread_Manager.i b/ace/Thread_Manager.i
index 36b808b7e9c..604f99aba40 100644
--- a/ace/Thread_Manager.i
+++ b/ace/Thread_Manager.i
@@ -5,7 +5,7 @@
 
 #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT)
 ACE_INLINE
-ACE_At_Thread_Exit::ACE_At_Thread_Exit (void)
+ACE_At_Thread_Exit::ACE_At_Thread_Exit()
   : next_ (0),
     td_ (0),
     was_applied_ (0),
@@ -21,60 +21,72 @@ ACE_At_Thread_Exit::was_applied() const
 }
 
 ACE_INLINE int
-ACE_At_Thread_Exit::was_applied (int applied)
+ACE_At_Thread_Exit::was_applied(int applied)
+
 {
-  was_applied_ = applied;
-  if (was_applied_)
+   was_applied_ = applied;
+   if (was_applied_)
     td_ = 0;
-  return was_applied_;
+   return was_applied_;
 }
 
 ACE_INLINE int
 ACE_At_Thread_Exit::is_owner() const
+
 {
-  return is_owner_;
+   return is_owner_;
 }
 
 ACE_INLINE int
-ACE_At_Thread_Exit::is_owner (int owner)
+ACE_At_Thread_Exit::is_owner(int owner)
+
 {
-  is_owner_ = owner;
-  return is_owner_;
+   is_owner_ = owner;
+   return is_owner_;
 }
 
 ACE_INLINE void
-ACE_At_Thread_Exit::do_apply (void)
+ACE_At_Thread_Exit::do_apply()
+
 {
-  if (!this->was_applied_ && this->is_owner_)
-    td_->at_pop();
+   if (!this->was_applied_ && this->is_owner_)
+    {
+      td_->at_pop();
+    }
 }
 
 ACE_INLINE
-ACE_At_Thread_Exit::~ACE_At_Thread_Exit (void)
+ACE_At_Thread_Exit::~ACE_At_Thread_Exit()
+
 {
-  this->do_apply ();
+   this->do_apply();
 }
 
 ACE_INLINE
-ACE_At_Thread_Exit_Func::ACE_At_Thread_Exit_Func (void *object,
-                                                  ACE_CLEANUP_FUNC func,
-                                                  void *param)
+ACE_At_Thread_Exit_Func::ACE_At_Thread_Exit_Func (
+  void* object,
+  ACE_CLEANUP_FUNC func,
+  void* param
+)
   : object_(object),
     func_(func),
     param_(param)
+
 {
 }
 
 ACE_INLINE
-ACE_At_Thread_Exit_Func::~ACE_At_Thread_Exit_Func (void)
+ACE_At_Thread_Exit_Func::~ACE_At_Thread_Exit_Func()
+
 {
-  this->do_apply ();
+   this->do_apply();
 }
 
 ACE_INLINE void
-ACE_At_Thread_Exit_Func::apply ()
+ACE_At_Thread_Exit_Func::apply()
+
 {
-  func_ (object_, param_);
+   func_(object_, param_);
 }
 #endif /* ! ACE_USE_ONE_SHOT_AT_THREAD_EXIT */
 
@@ -110,7 +122,7 @@ ACE_Thread_Descriptor_Base::operator!=(const ACE_Thread_Descriptor_Base &rhs) co
 }
 
 ACE_INLINE ACE_Task_Base *
-ACE_Thread_Descriptor_Base::task (void) const
+ACE_Thread_Descriptor_Base::task (void)
 {
   ACE_TRACE ("ACE_Thread_Descriptor_Base::task");
   return this->task_;
@@ -119,7 +131,7 @@ ACE_Thread_Descriptor_Base::task (void) const
 // Group ID.
 
 ACE_INLINE int
-ACE_Thread_Descriptor_Base::grp_id (void) const
+ACE_Thread_Descriptor_Base::grp_id (void)
 {
   ACE_TRACE ("ACE_Thread_Descriptor_Base::grp_id");
   return grp_id_;
@@ -127,7 +139,7 @@ ACE_Thread_Descriptor_Base::grp_id (void) const
 
 // Current state of the thread.
 ACE_INLINE ACE_UINT32
-ACE_Thread_Descriptor_Base::state (void) const
+ACE_Thread_Descriptor_Base::state (void)
 {
   ACE_TRACE ("ACE_Thread_Descriptor_Base::state");
   return thr_state_;
@@ -148,7 +160,7 @@ ACE_Thread_Descriptor_Base::reset (void)
 
 // Unique thread id.
 ACE_INLINE ACE_thread_t
-ACE_Thread_Descriptor::self (void) const
+ACE_Thread_Descriptor::self (void)
 {
   ACE_TRACE ("ACE_Thread_Descriptor::self");
   return this->thr_id_;
@@ -165,7 +177,7 @@ ACE_Thread_Descriptor::self (ACE_hthread_t &handle)
 
 #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT)
 ACE_INLINE void
-ACE_Thread_Descriptor::log_msg_cleanup (ACE_Log_Msg* log_msg)
+ACE_Thread_Descriptor::log_msg_cleanup(ACE_Log_Msg* log_msg)
 
 {
   log_msg_ = log_msg;
@@ -182,11 +194,10 @@ ACE_Thread_Descriptor::set_next (ACE_Thread_Descriptor *td)
 
 // Get the <next_> pointer
 ACE_INLINE ACE_Thread_Descriptor *
-ACE_Thread_Descriptor::get_next (void) const
+ACE_Thread_Descriptor::get_next (void)
 {
   ACE_TRACE ("ACE_Thread_Descriptor::get_next");
-  return ACE_static_cast (ACE_Thread_Descriptor * ACE_CAST_CONST,
-                          this->next_);
+  return ACE_static_cast (ACE_Thread_Descriptor *, this->next_);
 }
 
 // Reset this thread descriptor
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index 589138fdc04..fac86848441 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -22,7 +22,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_Iterator_T (ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK> &heap)
   : timer_heap_ (heap)
 {
-  ACE_TRACE ("ACE_Timer_Heap_Iterator_T::ACE_Timer_Heap_Iterator");
+  ACE_TRACE ("ACE_Timer_Heap_Iterator::ACE_Timer_Heap_Iterator");
   this->first();
 }
 
@@ -161,7 +161,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::ACE_Timer_Heap_T (FUNCTOR *upcall_fun
 template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::~ACE_Timer_Heap_T");
+  ACE_TRACE ("ACE_Timer_Heap::~ACE_Timer_Heap");
 
   delete iterator_;
 
@@ -193,7 +193,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_Heap_T (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::pop_freelist");
+  ACE_TRACE ("ACE_Timer_Heap::pop_freelist");
 
   // We need to truncate this to <int> for backwards compatibility.
   int new_id = ACE_static_cast (int,
@@ -210,7 +210,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::pop_freelist (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::push_freelist (int old_id)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::push_freelist");
+  ACE_TRACE ("ACE_Timer_Heap::push_freelist");
 
   // The freelist values in the <timer_ids_> are negative, so we need
   // to negate them to get the next freelist "pointer."
@@ -221,7 +221,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::push_freelist (int old_id)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::timer_id (void)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::timer_id");
+  ACE_TRACE ("ACE_Timer_Heap::timer_id");
 
   // Return the next item off the freelist and use it as the timer id.
   return this->pop_freelist ();
@@ -232,7 +232,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::timer_id (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::is_empty (void) const
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::is_empty");
+  ACE_TRACE ("ACE_Timer_Heap::is_empty");
   return this->cur_size_ == 0;
 }
 
@@ -248,14 +248,14 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::iter (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> const ACE_Time_Value &
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::earliest_time (void) const
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::earliest_time");
+  ACE_TRACE ("ACE_Timer_Heap::earliest_time");
   return this->heap_[0]->get_timer_value ();
 }
 
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::dump");
+  ACE_TRACE ("ACE_Timer_Heap::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_size_ = %d"), this->max_size_));
@@ -501,7 +501,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 template <class TYPE, class FUNCTOR, class ACE_LOCK> void
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::reschedule (ACE_Timer_Node_T<TYPE> *expired)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::reschedule");
+  ACE_TRACE ("ACE_Timer_Heap::reschedule");
 
   // If we are rescheduling then we have freed our timer id so we need
   // to reacquire it.  NOTE: we rely on the fact that we will get the
@@ -565,7 +565,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
                                                      const ACE_Time_Value &future_time,
                                                      const ACE_Time_Value &interval)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::schedule");
+  ACE_TRACE ("ACE_Timer_Heap::schedule");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
@@ -602,7 +602,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
                                                    const void **act,
                                                    int dont_call)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::cancel");
+  ACE_TRACE ("ACE_Timer_Heap::cancel");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Locate the ACE_Timer_Node that corresponds to the timer_id.
@@ -682,7 +682,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
                                                    int dont_call)
 {
-  ACE_TRACE ("ACE_Timer_Heap_T::cancel");
+  ACE_TRACE ("ACE_Timer_Heap::cancel");
   ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   int number_of_cancellations = 0;
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
index 68fe024b63b..adc3ff9922a 100644
--- a/ace/TkReactor.cpp
+++ b/ace/TkReactor.cpp
@@ -294,7 +294,7 @@ ACE_TkReactor::remove_handler_i (ACE_HANDLE handle,
 void
 ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_TkReactor::remove_TkFileHandler");
+  ACE_TRACE ("ACE_TkReactor::remove_TkInput");
 
   ACE_TkReactorID *TkID = this->ids_;
 
diff --git a/ace/Token.cpp b/ace/Token.cpp
index 28b3f52adc5..c51629f549b 100644
--- a/ace/Token.cpp
+++ b/ace/Token.cpp
@@ -88,7 +88,7 @@ ACE_Token::ACE_Token_Queue::ACE_Token_Queue (void)
 void
 ACE_Token::ACE_Token_Queue::remove_entry (ACE_Token::ACE_Token_Queue_Entry *entry)
 {
-  ACE_TRACE ("ACE_Token::ACE_Token_Queue::remove_entry");
+  ACE_TRACE ("ACE_Token::remove_entry");
   ACE_Token_Queue_Entry *curr = 0;
   ACE_Token_Queue_Entry *prev = 0;
 
@@ -165,6 +165,7 @@ ACE_Token::ACE_Token (const ACE_TCHAR *name, void *any)
     in_use_ (0),
     waiters_ (0),
     nesting_level_ (0),
+    signal_all_threads_ (0),
     attributes_ (USYNC_THREAD)
 {
 //  ACE_TRACE ("ACE_Token::ACE_Token");
@@ -317,6 +318,9 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *),
   // If this is a normal wakeup, this thread should be runnable.
   ACE_ASSERT (my_entry.runable_);
 
+  if (this->signal_all_threads_ != 0)
+    return 2;
+
   return ret;
 }
 
@@ -469,6 +473,9 @@ ACE_Token::renew (int requeue_position,
   // Reinstate nesting level.
   this->nesting_level_ = save_nesting_level_;
 
+  if (this->signal_all_threads_ != 0)
+    return 2;
+
   return 0;
 }
 
@@ -517,6 +524,7 @@ ACE_Token::wakeup_next_waiter (void)
       this->readers_.head_ == 0)
     {
       // No more waiters...
+      this->signal_all_threads_ = 0;
       return;
     }
 
@@ -542,6 +550,17 @@ ACE_Token::wakeup_next_waiter (void)
   this->owner_ = queue->head_->thread_id_;
 }
 
+int
+ACE_Token::signal_all_threads (void)
+{
+  ACE_TRACE ("ACE_Token::release");
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1);
+
+  if (this->waiters_ != 0)
+      this->signal_all_threads_ = 1;
+  return this->waiters_;
+}
+
 #endif /* ACE_HAS_THREADS */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/ace/Token.h b/ace/Token.h
index c4fc805061b..54835a1ef1f 100644
--- a/ace/Token.h
+++ b/ace/Token.h
@@ -169,6 +169,19 @@ public:
   /// Return the id of the current thread that owns the token.
   ACE_thread_t current_owner (void);
 
+  /**
+   * Force all threads waiting to acquire the token to return one by
+   * one.  The method sets the <signal_all_thread_> to non-zero if
+   * there're threads waiting, and returns the number of threads
+   * waiting.  If there's no thread waiting for the token, the call
+   * returns 0 and doesn't do anything.  The last thread releases the
+   * token also reset the <singal_all_thread_> flag to 0.  This means,
+   * any threads that try to acquire the token after the call is
+   * issued will also get "signaled" and the number of threads waiting
+   * the token is only a snapshot.
+   */
+  int signal_all_threads (void);
+
   /// Dump the state of an object.
   void dump (void) const;
 
@@ -269,6 +282,9 @@ private:
   /// Current nesting level.
   int nesting_level_;
 
+  /// Whether we are "signaling" all threads or not.
+  int signal_all_threads_;
+
   /// The attributes for the condition variables, optimizes lock time.
   ACE_Condition_Attributes attributes_;
 };
diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index a899c5e38bc..e94426b0144 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -1,3 +1,4 @@
+// Token_Collection.cpp
 // $Id$
 
 #include "ace/Token_Collection.h"
@@ -6,8 +7,6 @@
 #include "ace/Token_Collection.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(ace, Token_Collection, "$Id$")
 
 ACE_Token_Collection::ACE_Token_Collection (int debug,
@@ -301,5 +300,3 @@ template class ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>;
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Token_Proxy *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Entry<ACE_Token_Name, ACE_Token_Proxy *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Collection.h b/ace/Token_Collection.h
index 3c6e4297214..c0fc0bbc531 100644
--- a/ace/Token_Collection.h
+++ b/ace/Token_Collection.h
@@ -20,6 +20,7 @@
  */
 //=============================================================================
 
+
 #ifndef ACE_TOKEN_COLLECTION_H
 #define ACE_TOKEN_COLLECTION_H
 #include "ace/pre.h"
@@ -33,8 +34,6 @@
 #include "ace/Local_Tokens.h"
 #include "ace/SString.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 /**
  * @class ACE_Token_Collection
  *
@@ -224,8 +223,6 @@ protected:
   virtual ACE_Tokens *create_token (const ACE_TCHAR *name);
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
-
 #if defined (__ACE_INLINE__)
 #include "ace/Token_Collection.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Token_Collection.i b/ace/Token_Collection.i
index fcab4df9b09..e5f83852713 100644
--- a/ace/Token_Collection.i
+++ b/ace/Token_Collection.i
@@ -1,12 +1,10 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
+// Token_Collection.i
 
 ACE_INLINE const ACE_TCHAR *
 ACE_Token_Collection::name (void) const
 {
   return name_;
 }
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Invariants.cpp b/ace/Token_Invariants.cpp
index e709e1ea65b..7ad59665b0e 100644
--- a/ace/Token_Invariants.cpp
+++ b/ace/Token_Invariants.cpp
@@ -1,10 +1,9 @@
+// Token_Invariants.cpp
 // $Id$
 
 #include "ace/Token_Invariants.h"
 #include "ace/Object_Manager.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(ace, Token_Invariants, "$Id$")
 
 ACE_Token_Invariant_Manager *ACE_Token_Invariant_Manager::instance_ = 0;
@@ -364,5 +363,3 @@ template class ACE_Map_Entry<ACE_Token_Name, ACE_RWLock_Invariants *>;
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_RWLock_Invariants *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Entry<ACE_Token_Name, ACE_RWLock_Invariants *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Invariants.h b/ace/Token_Invariants.h
index e5c10ebaed6..2be2d194017 100644
--- a/ace/Token_Invariants.h
+++ b/ace/Token_Invariants.h
@@ -16,6 +16,7 @@
  */
 //=============================================================================
 
+
 #ifndef ACE_TOKEN_INVARIANTS_H
 #define ACE_TOKEN_INVARIANTS_H
 #include "ace/pre.h"
@@ -29,8 +30,6 @@
 #include "ace/Map_Manager.h"
 #include "ace/Local_Tokens.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 /**
  * @class ACE_Mutex_Invariants
  *
@@ -222,7 +221,5 @@ protected:
   static ACE_Token_Invariant_Manager *instance_;
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
-
 #include "ace/post.h"
 #endif /* ACE_TOKEN_INVARIANTS_H */
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp
index 13e21c361fc..8ce44b15042 100644
--- a/ace/Token_Manager.cpp
+++ b/ace/Token_Manager.cpp
@@ -1,3 +1,4 @@
+// Token_Manager.cpp
 // $Id$
 
 #include "ace/Token_Manager.h"
@@ -7,8 +8,6 @@
 #include "ace/Token_Manager.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(ace, Token_Manager, "$Id$")
 
 // singleton token manager
@@ -39,7 +38,7 @@ ACE_Token_Manager::~ACE_Token_Manager ()
 ACE_Token_Manager *
 ACE_Token_Manager::instance (void)
 {
-  ACE_TRACE ("ACE_Token_Manager::instance");
+  ACE_TRACE ("ACE_Token_Manager::token_manager");
 
   // This first check is to avoid acquiring the mutex in the common
   // case.  Double-Check pattern rules.
@@ -69,7 +68,7 @@ void
 ACE_Token_Manager::get_token (ACE_Token_Proxy *proxy,
                               const ACE_TCHAR *token_name)
 {
-  ACE_TRACE ("ACE_Token_Manager::get_token");
+  ACE_TRACE ("ACE_Token_Manager::get");
   // Hmm.  I think this makes sense.  We perform our own locking here
   // (see safe_acquire.)  We have to make sure that only one thread
   // uses the collection at a time.
@@ -212,7 +211,7 @@ ACE_Token_Manager::token_waiting_for (const ACE_TCHAR *client_id)
 void
 ACE_Token_Manager::release_token (ACE_Tokens *&token)
 {
-  ACE_TRACE ("ACE_Token_Manager::release_token");
+  ACE_TRACE ("ACE_Token_Manager::release");
   // again, let's perform our own locking here.
 
   ACE_GUARD (ACE_TOKEN_CONST::MUTEX, ace_mon, this->lock_);
@@ -276,5 +275,3 @@ template class ACE_Map_Entry <ACE_Token_Name, ACE_Tokens *>;
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Token_Name, ACE_Tokens *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Entry <ACE_Token_Name, ACE_Tokens *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Manager.h b/ace/Token_Manager.h
index aec44e08ae3..56fb63db6a0 100644
--- a/ace/Token_Manager.h
+++ b/ace/Token_Manager.h
@@ -10,6 +10,7 @@
  */
 //=============================================================================
 
+
 #ifndef ACE_TOKEN_MANAGER_H
 #define ACE_TOKEN_MANAGER_H
 #include "ace/pre.h"
@@ -23,8 +24,6 @@
 #include "ace/Map_Manager.h"
 #include "ace/Local_Tokens.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 class ACE_Local_Mutex;
 class ACE_Mutex_Token;
 
@@ -125,8 +124,6 @@ private:
   COLLECTION collection_;
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
-
 #if defined (__ACE_INLINE__)
 #include "ace/Token_Manager.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Token_Manager.i b/ace/Token_Manager.i
index 2ef2d7e1f53..572d439f289 100644
--- a/ace/Token_Manager.i
+++ b/ace/Token_Manager.i
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
+// Token_Manager.i
 
 ACE_INLINE ACE_TOKEN_CONST::MUTEX &
 ACE_Token_Manager::mutex (void)
@@ -17,4 +17,3 @@ ACE_Token_Manager::debug (int d)
   debug_ = d;
 }
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp
index 9fecb01e443..dca95183e83 100644
--- a/ace/Token_Request_Reply.cpp
+++ b/ace/Token_Request_Reply.cpp
@@ -1,3 +1,4 @@
+// Token_Request_Reply.cpp
 // $Id$
 
 #include "ace/Token_Request_Reply.h"
@@ -6,8 +7,6 @@
 #include "ace/Token_Request_Reply.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(ace, Token_Request_Reply, "$Id$")
 
 // Default "do nothing" constructor.
@@ -174,5 +173,3 @@ ACE_Token_Reply::dump (void) const
 	     this->length (), this->errnum ()));
   ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("arg = %d"), this->arg ()));
 }
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Token_Request_Reply.h b/ace/Token_Request_Reply.h
index 1c3aa88d09c..f1f10b93ba9 100644
--- a/ace/Token_Request_Reply.h
+++ b/ace/Token_Request_Reply.h
@@ -28,8 +28,6 @@
 
 #include "ace/Time_Value.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 // Specifies the size of the fixed length portion of
 // the Transfer structure in ACE_Token_Request
 #define ACE_TOKEN_REQUEST_HEADER_SIZE 40
@@ -237,8 +235,6 @@ private:
   } transfer_;
 };
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
-
 #if defined (__ACE_INLINE__)
 #include "ace/Token_Request_Reply.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Token_Request_Reply.i b/ace/Token_Request_Reply.i
index e1c8ace3ad5..999677a664f 100644
--- a/ace/Token_Request_Reply.i
+++ b/ace/Token_Request_Reply.i
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
+// Token_Request_Reply.i
 
 // = Set/get the length of the encoded/decoded message.
 
@@ -193,4 +193,3 @@ ACE_Token_Reply::arg (ACE_UINT32 arg)
   this->transfer_.arg_ = htonl (arg);
 }
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/ace/Version.h b/ace/Version.h
index 66ff4829f82..a9f45146d81 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -3,5 +3,5 @@
 
 #define ACE_MAJOR_VERSION 5
 #define ACE_MINOR_VERSION 1
-#define ACE_BETA_VERSION 13
-#define ACE_VERSION "5.1.13"
+#define ACE_BETA_VERSION 12
+#define ACE_VERSION "5.1.12"
diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc
index b0af1be3411..31629f831a7 100644
--- a/ace/ace-dll.icc
+++ b/ace/ace-dll.icc
@@ -1 +1,519 @@
-// $Id$//// Configuration file to build ACE shared library (aka DLL) on both Win32// and AIX using Visual Age C++ 4 (or later)if $__TOS_WIN__ {        option PlatformOptions =                 define ("ACE_HAS_DLL","0"),                 define ("ACE_HAS_WINSOCK2","1"),                 define ("ACE_HAS_WCHAR_TYPEDEFS_CHAR","1"),                 define ("_stricmp", "stricmp"),                 define ("_strnicmp", "strnicmp"),                 define ("_O_TEMPORARY", 0x08),                 define ("_O_CREAT", "O_CREAT"),                 define ("_O_TRUNC", "O_TRUNC"),                 define ("_O_EXCL", "O_EXCL"),                 define ("WIN32","1"),                 define ("_WINDOWS","1"),                 define ("_INTEGRAL_MAX_BITS", 64)        TargetType = "dll"        TargetName = "aced.dll"}if $__TOS_AIX__ {        option PlatformOptions =                defaults(xlC_r),                gen(check,bounds,no),                link(typecheck,yes),                opt(level, 3),                gen(enumsize, small),                report (disable, "CPPC1125")        TargetType = "shr"        TargetName = "libACE.o"        run after targets("libACE.o") "ar -r -u libACE.a libACE.o"        run cleanup targets("libACE.o") "rm -rf libACE.a libACE.o"}option         PlatformOptions,         link(exportAll),         link(linkwithsharedlib),         link(linkWithMultiThreadLib,yes),         incl(searchpath, "..")         {               target type ( TargetType ) TargetName                {                       option macros(global)                        {                             source type(hpp) 'wchar.h'                             source type(hpp) 'wcstr.h'                             if $__TOS_WIN__ {                                 source type(hpp)                                              'config-win32-common.h',                                              'config-win32-visualage.h',                                              'config-visualage.h',                                              'config-win32.h',                             }                             source type(hpp)                                              'Acceptor.h',                                              'ACE.h',                                              'Activation_Queue.h',                                              'Active_Map_Manager.h',                                              'Active_Map_Manager_T.h',                                              'Addr.h',                                              'ARGV.h',                                              'Arg_Shifter.h',                                              'Array.h',                                              'Asynch_Acceptor.h',                                              'Asynch_IO.h',                                              'Asynch_IO_Impl.h',                                              'ATM_Addr.h',                                              'Auto_Ptr.h',                                              'Base_Thread_Adapter.h',                                              'Based_Pointer_Repository.h',                                              'Basic_Stats.h',                                              'Basic_Types.h',                                              'Cached_Connect_Strategy_T.h',                                              'Cache_Map_Manager_T.h',                                              'Caching_Strategies_T.h',                                              'Caching_Utility_T.h',                                              'Capabilities.h',                                              'CDR_Base.h',                                              'CDR_Stream.h',                                              'Cleanup_Strategies_T.h',                                              'Codeset_IBM1047.h',                                              'config.h',                                              'Connector.h',                                              'Containers.h',                                              'Containers_T.h',                                              'CORBA_Handler.h',                                              'CORBA_macros.h',                                              'CORBA_Ref.h',                                              'Date_Time.h',                                              'DEV.h',                                              'DEV_Addr.h',                                              'DEV_Connector.h',                                              'DEV_IO.h',                                              'Dirent.h',                                              'DLL.h',                                              'Dump.h',                                              'Dump_T.h',                                              'Dynamic.h',                                              'Dynamic_Service.h',                                              'Env_Value_T.h',                                              'Event_Handler.h',                                              'Event_Handler_T.h',                                              'FIFO.h',                                              'FIFO_Recv.h',                                              'FIFO_Recv_Msg.h',                                              'FIFO_Send.h',                                              'FIFO_Send_Msg.h',                                              'FILE.h',                                              'Filecache.h',                                              'FILE_Addr.h',                                              'FILE_Connector.h',                                              'FILE_IO.h',                                              'Flag_Manip.h',                                              'FlReactor.h',                                              'Free_List.h',                                              'Functor.h',                                              'Functor_T.h',                                              'Future.h',                                              'Future_Set.h',                                              'Get_Opt.h',                                              'Handle_Gobbler.h',                                              'Handle_Ops.h',                                              'Handle_Set.h',                                              'Hash_Cache_Map_Manager_T.h',                                              'Hash_Map_Manager.h',                                              'Hash_Map_Manager_T.h',                                              'Hash_Map_With_Allocator_T.h',                                              'High_Res_Timer.h',                                              'config-all.h',                                              'INET_Addr.h',                                              'Init_ACE.h',                                              'iosfwd.h',                                              'IOStream.h',                                              'IOStream_T.h',                                              'IO_Cntl_Msg.h',                                              'IO_SAP.h',                                              'IPC_SAP.h',                                              'Lib_Find.h',                                              'Local_Name_Space.h',                                              'Local_Name_Space_T.h',                                              'Local_Tokens.h',                                              'LOCK_SOCK_Acceptor.h',                                              'Log_Msg.h',                                              'Log_Msg_Backend.h',                                              'Log_Msg_IPC.h',                                              'Log_Priority.h',                                              'Log_Record.h',                                              'LSOCK.h',                                              'LSOCK_Acceptor.h',                                              'LSOCK_CODgram.h',                                              'LSOCK_Connector.h',                                              'LSOCK_Dgram.h',                                              'LSOCK_Stream.h',                                              'Malloc.h',                                              'Malloc_Allocator.h',                                              'Malloc_Base.h',                                              'Malloc_T.h',                                              'Managed_Object.h',                                              'Map.h',                                              'Map_Manager.h',                                              'Map_T.h',                                              'Memory_Pool.h',                                              'Mem_Map.h',                                              'Message_Block.h',                                              'Message_Block_T.h',                                              'Message_Queue.h',                                              'Message_Queue_T.h',                                              'Method_Object.h',                                              'Method_Request.h',                                              'Module.h',                                              'Msg_WFMO_Reactor.h',                                              'Name_Proxy.h',                                              'Name_Request_Reply.h',                                              'Name_Space.h',                                              'Naming_Context.h',                                              'NT_Service.h',                                              'Object_Manager.h',                                              'Obstack.h',                                              'OS.h',                                              'OS_Dirent.h',                                              'OS_Errno.h',                                              'OS_Log_Msg_Attributes.h',                                              'OS_Memory.h',                                              'OS_String.h',                                              'OS_Thread_Adapter.h',                                              'OS_TLI.h',                                              'PI_Malloc.h',                                              'POSIX_Asynch_IO.h',                                              'POSIX_Proactor.h',                                              'Pair.h',                                              'Pair_T.h',                                              'Parse_Node.h',                                              'Pipe.h',                                              'Priority_Reactor.h',                                              'Proactor.h',                                              'Proactor_Impl.h',                                              'Process.h',                                              'Process_Manager.h',                                              'Profile_Timer.h',                                              'RB_Tree.h',                                              'Reactor.h',                                              'Reactor_Impl.h',                                              'Read_Buffer.h',                                              'Registry.h',                                              'Registry_Name_Space.h',                                              'Remote_Name_Space.h',                                              'Remote_Tokens.h',                                              'Sched_Params.h',                                              'Select_Reactor.h',                                              'Select_Reactor_Base.h',                                              'Select_Reactor_T.h',                                              'Service_Config.h',                                              'Service_Manager.h',                                              'Service_Object.h',                                              'Service_Repository.h',                                              'Service_Types.h',                                              'Shared_Memory.h',                                              'Shared_Memory_MM.h',                                              'Shared_Memory_SV.h',                                              'Shared_Object.h',                                              'Signal.h',                                              'Singleton.h',                                              'SOCK.h',                                              'SOCK_Acceptor.h',                                              'SOCK_CODgram.h',                                              'SOCK_Connector.h',                                              'SOCK_Dgram.h',                                              'SOCK_Dgram_Bcast.h',                                              'SOCK_Dgram_Mcast.h',                                              'SOCK_IO.h',                                              'SOCK_Stream.h',                                              'Sock_Connect.h',                                              'SPIPE.h',                                              'SPIPE_Acceptor.h',                                              'SPIPE_Addr.h',                                              'SPIPE_Connector.h',                                              'SPIPE_Stream.h',                                              'SString.h',                                              'Stats.h',                                              'Strategies.h',                                              'Strategies_T.h',                                              'Stream.h',                                              'streams.h',                                              'Stream_Modules.h',                                              'Svc_Conf.h',                                              'Svc_Conf_Tokens.h',                                              'Svc_Handler.h',                                              'SV_Message.h',                                              'SV_Message_Queue.h',                                              'SV_Semaphore_Complex.h',                                              'SV_Semaphore_Simple.h',                                              'SV_Shared_Memory.h',                                              'Synch.h',                                              'Process_Semaphore.h',                                              'Process_Mutex.h',                                              'RW_Process_Mutex.h',                                              'File_Lock.h',                                              'Synch_Options.h',                                              'Synch_T.h',                                              'System_Time.h',                                              'Task.h',                                              'Task_T.h',                                              'Thread.h',                                              'Thread_Adapter.h',                                              'Thread_Control.h',                                              'Thread_Exit.h',                                              'Thread_Manager.h',                                              'Timeprobe.h',                                              'Timeprobe_T.h',                                              'Timer_Hash.h',                                              'Timer_Hash_T.h',                                              'Timer_Heap.h',                                              'Timer_Heap_T.h',                                              'Timer_List.h',                                              'Timer_List_T.h',                                              'Timer_Queue.h',                                              'Timer_Queue_Adapters.h',                                              'Timer_Queue_T.h',                                              'Timer_Wheel.h',                                              'Timer_Wheel_T.h',                                              'Time_Request_Reply.h',                                              'Time_Value.h',                                              'TkReactor.h',                                              'TLI.h',                                              'TLI_Acceptor.h',                                              'TLI_Connector.h',                                              'TLI_Stream.h',                                              'Token.h',                                              'Token_Collection.h',                                              'Token_Invariants.h',                                              'Token_Manager.h',                                              'Token_Request_Reply.h',                                              'TP_Reactor.h',                                              'Trace.h',                                              'TTY_IO.h',                                              'Typed_SV_Message.h',                                              'Typed_SV_Message_Queue.h',                                              'UNIX_Addr.h',                                              'UPIPE_Acceptor.h',                                              'UPIPE_Addr.h',                                              'UPIPE_Connector.h',                                              'UPIPE_Stream.h',                                              'Version.h',                                              'WFMO_Reactor.h',                                              'WIN32_Asynch_IO.h',                                              'WIN32_Proactor.h',                                              'XtReactor.h'                        }                 source type(cpp) "Log_Msg.cpp"                 source type(cpp) "ACE.cpp"                 source type(cpp) "Activation_Queue.cpp"                 source type(cpp) "Active_Map_Manager.cpp"                 source type(cpp) "Addr.cpp"                 source type(cpp) "Arg_Shifter.cpp"                 source type(cpp) "ARGV.cpp"                 source type(cpp) "Asynch_IO.cpp"                 source type(cpp) "Asynch_IO_Impl.cpp"                 source type(cpp) "Base_Thread_Adapter.cpp"                 source type(cpp) "Based_Pointer_Repository.cpp"                 source type(cpp) "Basic_Stats.cpp"                 source type(cpp) "Basic_Types.cpp"                 source type(cpp) "Capabilities.cpp"                 source type(cpp) "CDR_Base.cpp"                 source type(cpp) "CDR_Stream.cpp"                 source type(cpp) "Containers.cpp"                 source type(cpp) "CORBA_Handler.cpp"                 source type(cpp) "CORBA_Ref.cpp"                 source type(cpp) "Date_Time.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) "Dirent.cpp"                 source type(cpp) "DLL.cpp"                 source type(cpp) "Dump.cpp"                 source type(cpp) "Dynamic.cpp"                 source type(cpp) "Dynamic_Service.cpp"                 source type(cpp) "Event_Handler.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) "Filecache.cpp"                 source type(cpp) "Flag_Manip.cpp"                 source type(cpp) "Functor.cpp"                 source type(cpp) "Future.cpp"                 source type(cpp) "Get_Opt.cpp"                 source type(cpp) "Handle_Ops.cpp"                 source type(cpp) "Handle_Set.cpp"                 source type(cpp) "Hash_Map_Manager.cpp"                 source type(cpp) "High_Res_Timer.cpp"                 source type(cpp) "INET_Addr.cpp"                 source type(cpp) "Init_ACE.cpp"                 source type(cpp) "IO_Cntl_Msg.cpp"                 source type(cpp) "IO_SAP.cpp"                 source type(cpp) "IOStream.cpp"                 source type(cpp) "IPC_SAP.cpp"                 source type(cpp) "Lib_Find.cpp"                 source type(cpp) "Local_Name_Space.cpp"                 source type(cpp) "Local_Tokens.cpp"                 source type(cpp) "Log_Msg_Backend.cpp"                 source type(cpp) "Log_Msg_IPC.cpp"                 source type(cpp) "Log_Record.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) "Malloc.cpp"                 source type(cpp) "Malloc_Allocator.cpp"                 source type(cpp) "Map.cpp"                 source type(cpp) "Mem_Map.cpp"                 source type(cpp) "Memory_Pool.cpp"                 source type(cpp) "Message_Block.cpp"                 source type(cpp) "Message_Queue.cpp"                 source type(cpp) "Method_Request.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) "NT_Service.cpp"                 source type(cpp) "Object_Manager.cpp"                 source type(cpp) "Obstack.cpp"                 source type(cpp) "OS.cpp"                 source type(cpp) "OS_Dirent.cpp"                 source type(cpp) "OS_Errno.cpp"                 source type(cpp) "OS_Log_Msg_Attributes.cpp"                 source type(cpp) "OS_Memory.cpp"                 source type(cpp) "OS_String.cpp"                 source type(cpp) "OS_Thread_Adapter.cpp"                 source type(cpp) "OS_TLI.cpp"                 source type(cpp) "PI_Malloc.cpp"                 source type(cpp) "Pair.cpp"                 source type(cpp) "Parse_Node.cpp"                 source type(cpp) "Pipe.cpp"                 source type(cpp) "Priority_Reactor.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) "RB_Tree.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) "Sched_Params.cpp"                 source type(cpp) "Select_Reactor.cpp"                 source type(cpp) "Select_Reactor_Base.cpp"                 source type(cpp) "Service_Config.cpp"                 source type(cpp) "Service_Manager.cpp"                 source type(cpp) "Service_Object.cpp"                 source type(cpp) "Service_Repository.cpp"                 source type(cpp) "Service_Types.cpp"                 source type(cpp) "Shared_Memory.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) "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_Dgram_Mcast.cpp"                 source type(cpp) "SOCK_IO.cpp"                 source type(cpp) "SOCK_Stream.cpp"                 source type(cpp) "Sock_Connect.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) "Stats.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) "Svc_Conf_l.cpp"                 source type(cpp) "Svc_Conf_y.cpp"                 source type(cpp) "Synch.cpp"                 source type(cpp) "Process_Semaphore.cpp"                 source type(cpp) "Process_Mutex.cpp"                 source type(cpp) "RW_Process_Mutex.cpp"                 source type(cpp) "File_Lock.cpp"                 source type(cpp) "Synch_Options.cpp"                 source type(cpp) "System_Time.cpp"                 source type(cpp) "Task.cpp"                 source type(cpp) "Thread.cpp"                 source type(cpp) "Thread_Adapter.cpp"                 source type(cpp) "Thread_Control.cpp"                 source type(cpp) "Thread_Exit.cpp"                 source type(cpp) "Thread_Manager.cpp"                 source type(cpp) "Time_Request_Reply.cpp"                 source type(cpp) "Timeprobe.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_Queue_Adapters.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) "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) "TP_Reactor.cpp"                 source type(cpp) "Trace.cpp"                 source type(cpp) "TTY_IO.cpp"                 source type(cpp) "Typed_SV_Message.cpp"                 source type(cpp) "Typed_SV_Message_Queue.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) "WIN32_Asynch_IO.cpp"                 source type(cpp) "WIN32_Proactor.cpp"                 source type(cpp) "XtReactor.cpp"                  // Libraries needed during linking                if $__TOS_WIN__ {                        source type (lib) "advapi32.lib"                        source type (lib) "user32.lib"                        source type (lib) "ws2_32.lib"                        source type (lib) "wsock32.lib"                        source type (lib) "mswsock.lib"                }                if $__TOS_AIX__ {                        source type (lib) "libtli_r.a"                        source type (lib) "libpthreads.a"                        source type (lib) "libc_r.a"                        source type (lib) "libdl.a"                        // Imports                        source type (imp) "pse.exp"                }        }}
\ No newline at end of file
+// $Id$
+//
+// Configuration file to build ACE shared library (aka DLL) on both Win32
+// and AIX using Visual Age C++ 4 (or later)
+
+if $__TOS_WIN__ {
+        option PlatformOptions =
+                 define ("ACE_HAS_DLL","0"),
+                 define ("ACE_HAS_WINSOCK2","1"),
+                 define ("ACE_HAS_WCHAR_TYPEDEFS_CHAR","1"),
+                 define ("_stricmp", "stricmp"),
+                 define ("_strnicmp", "strnicmp"),
+                 define ("_O_TEMPORARY", 0x08),
+                 define ("_O_CREAT", "O_CREAT"),
+                 define ("_O_TRUNC", "O_TRUNC"),
+                 define ("_O_EXCL", "O_EXCL"),
+                 define ("WIN32","1"),
+                 define ("_WINDOWS","1"),
+                 define ("_INTEGRAL_MAX_BITS", 64)
+        TargetType = "dll"
+        TargetName = "aced.dll"
+}
+if $__TOS_AIX__ {
+        option PlatformOptions =
+                defaults(xlC_r),
+                gen(check,bounds,no),
+                link(typecheck,yes),
+                opt(level, 3),
+                gen(enumsize, small),
+                report (disable, "CPPC1125")
+        TargetType = "shr"
+        TargetName = "libACE.o"
+        run after targets("libACE.o") "ar -r -u libACE.a libACE.o"
+        run cleanup targets("libACE.o") "rm -rf libACE.a libACE.o"
+}
+
+option
+         PlatformOptions,
+         link(exportAll),
+         link(linkwithsharedlib),
+         link(linkWithMultiThreadLib,yes),
+         incl(searchpath, "..")
+         {
+               target type ( TargetType ) TargetName
+                {
+                       option macros(global)
+                        {
+                             source type(hpp) 'wchar.h'
+                             source type(hpp) 'wcstr.h'
+                             if $__TOS_WIN__ {
+                                 source type(hpp)
+                                              'config-win32-common.h',
+                                              'config-win32-visualage.h',
+                                              'config-visualage.h',
+                                              'config-win32.h',
+                                              'ws2tcpip.h'
+                             }
+
+                             source type(hpp)
+                                              'Acceptor.h',
+                                              'ACE.h',
+                                              'Activation_Queue.h',
+                                              'Active_Map_Manager.h',
+                                              'Active_Map_Manager_T.h',
+                                              'Addr.h',
+                                              'ARGV.h',
+                                              'Arg_Shifter.h',
+                                              'Array.h',
+                                              'Asynch_Acceptor.h',
+                                              'Asynch_IO.h',
+                                              'Asynch_IO_Impl.h',
+                                              'ATM_Addr.h',
+                                              'Auto_Ptr.h',
+                                              'Base_Thread_Adapter.h',
+                                              'Based_Pointer_Repository.h',
+                                              'Basic_Stats.h',
+                                              'Basic_Types.h',
+                                              'Cached_Connect_Strategy_T.h',
+                                              'Cache_Map_Manager_T.h',
+                                              'Caching_Strategies_T.h',
+                                              'Caching_Utility_T.h',
+                                              'Capabilities.h',
+                                              'CDR_Base.h',
+                                              'CDR_Stream.h',
+                                              'Cleanup_Strategies_T.h',
+                                              'Codeset_IBM1047.h',
+                                              'config.h',
+                                              'Connector.h',
+                                              'Containers.h',
+                                              'Containers_T.h',
+                                              'CORBA_Handler.h',
+                                              'CORBA_macros.h',
+                                              'CORBA_Ref.h',
+                                              'Date_Time.h',
+                                              'DEV.h',
+                                              'DEV_Addr.h',
+                                              'DEV_Connector.h',
+                                              'DEV_IO.h',
+                                              'Dirent.h',
+                                              'DLL.h',
+                                              'Dump.h',
+                                              'Dump_T.h',
+                                              'Dynamic.h',
+                                              'Dynamic_Service.h',
+                                              'Env_Value_T.h',
+                                              'Event_Handler.h',
+                                              'Event_Handler_T.h',
+                                              'FIFO.h',
+                                              'FIFO_Recv.h',
+                                              'FIFO_Recv_Msg.h',
+                                              'FIFO_Send.h',
+                                              'FIFO_Send_Msg.h',
+                                              'FILE.h',
+                                              'Filecache.h',
+                                              'FILE_Addr.h',
+                                              'FILE_Connector.h',
+                                              'FILE_IO.h',
+                                              'Flag_Manip.h',
+                                              'FlReactor.h',
+                                              'Free_List.h',
+                                              'Functor.h',
+                                              'Functor_T.h',
+                                              'Future.h',
+                                              'Future_Set.h',
+                                              'Get_Opt.h',
+                                              'Handle_Gobbler.h',
+                                              'Handle_Ops.h',
+                                              'Handle_Set.h',
+                                              'Hash_Cache_Map_Manager_T.h',
+                                              'Hash_Map_Manager.h',
+                                              'Hash_Map_Manager_T.h',
+                                              'Hash_Map_With_Allocator_T.h',
+                                              'High_Res_Timer.h',
+                                              'config-all.h',
+                                              'INET_Addr.h',
+                                              'Init_ACE.h',
+                                              'iosfwd.h',
+                                              'IOStream.h',
+                                              'IOStream_T.h',
+                                              'IO_Cntl_Msg.h',
+                                              'IO_SAP.h',
+                                              'IPC_SAP.h',
+                                              'Lib_Find.h',
+                                              'Local_Name_Space.h',
+                                              'Local_Name_Space_T.h',
+                                              'Local_Tokens.h',
+                                              'LOCK_SOCK_Acceptor.h',
+                                              'Log_Msg.h',
+                                              'Log_Msg_Backend.h',
+                                              'Log_Msg_IPC.h',
+                                              'Log_Priority.h',
+                                              'Log_Record.h',
+                                              'LSOCK.h',
+                                              'LSOCK_Acceptor.h',
+                                              'LSOCK_CODgram.h',
+                                              'LSOCK_Connector.h',
+                                              'LSOCK_Dgram.h',
+                                              'LSOCK_Stream.h',
+                                              'Malloc.h',
+                                              'Malloc_Allocator.h',
+                                              'Malloc_Base.h',
+                                              'Malloc_T.h',
+                                              'Managed_Object.h',
+                                              'Map.h',
+                                              'Map_Manager.h',
+                                              'Map_T.h',
+                                              'Memory_Pool.h',
+                                              'Mem_Map.h',
+                                              'Message_Block.h',
+                                              'Message_Block_T.h',
+                                              'Message_Queue.h',
+                                              'Message_Queue_T.h',
+                                              'Method_Object.h',
+                                              'Method_Request.h',
+                                              'Module.h',
+                                              'Msg_WFMO_Reactor.h',
+                                              'Name_Proxy.h',
+                                              'Name_Request_Reply.h',
+                                              'Name_Space.h',
+                                              'Naming_Context.h',
+                                              'NT_Service.h',
+                                              'Object_Manager.h',
+                                              'Obstack.h',
+                                              'OS.h',
+                                              'OS_Dirent.h',
+                                              'OS_Errno.h',
+                                              'OS_Log_Msg_Attributes.h',
+                                              'OS_Memory.h',
+                                              'OS_String.h',
+                                              'OS_Thread_Adapter.h',
+                                              'OS_TLI.h',
+                                              'PI_Malloc.h',
+                                              'POSIX_Asynch_IO.h',
+                                              'POSIX_Proactor.h',
+                                              'Pair.h',
+                                              'Pair_T.h',
+                                              'Parse_Node.h',
+                                              'Pipe.h',
+                                              'Priority_Reactor.h',
+                                              'Proactor.h',
+                                              'Proactor_Impl.h',
+                                              'Process.h',
+                                              'Process_Manager.h',
+                                              'Profile_Timer.h',
+                                              'RB_Tree.h',
+                                              'Reactor.h',
+                                              'Reactor_Impl.h',
+                                              'Read_Buffer.h',
+                                              'Registry.h',
+                                              'Registry_Name_Space.h',
+                                              'Remote_Name_Space.h',
+                                              'Remote_Tokens.h',
+                                              'Sched_Params.h',
+                                              'Select_Reactor.h',
+                                              'Select_Reactor_Base.h',
+                                              'Select_Reactor_T.h',
+                                              'Service_Config.h',
+                                              'Service_Manager.h',
+                                              'Service_Object.h',
+                                              'Service_Repository.h',
+                                              'Service_Types.h',
+                                              'Shared_Memory.h',
+                                              'Shared_Memory_MM.h',
+                                              'Shared_Memory_SV.h',
+                                              'Shared_Object.h',
+                                              'Signal.h',
+                                              'Singleton.h',
+                                              'SOCK.h',
+                                              'SOCK_Acceptor.h',
+                                              'SOCK_CODgram.h',
+                                              'SOCK_Connector.h',
+                                              'SOCK_Dgram.h',
+                                              'SOCK_Dgram_Bcast.h',
+                                              'SOCK_Dgram_Mcast.h',
+                                              'SOCK_IO.h',
+                                              'SOCK_Stream.h',
+                                              'Sock_Connect.h',
+                                              'SPIPE.h',
+                                              'SPIPE_Acceptor.h',
+                                              'SPIPE_Addr.h',
+                                              'SPIPE_Connector.h',
+                                              'SPIPE_Stream.h',
+                                              'SString.h',
+                                              'Stats.h',
+                                              'Strategies.h',
+                                              'Strategies_T.h',
+                                              'Stream.h',
+                                              'streams.h',
+                                              'Stream_Modules.h',
+                                              'Svc_Conf.h',
+                                              'Svc_Conf_Tokens.h',
+                                              'Svc_Handler.h',
+                                              'SV_Message.h',
+                                              'SV_Message_Queue.h',
+                                              'SV_Semaphore_Complex.h',
+                                              'SV_Semaphore_Simple.h',
+                                              'SV_Shared_Memory.h',
+                                              'Synch.h',
+                                              'Process_Semaphore.h',
+                                              'Process_Mutex.h',
+                                              'RW_Process_Mutex.h',
+                                              'File_Lock.h',
+                                              'Synch_Options.h',
+                                              'Synch_T.h',
+                                              'System_Time.h',
+                                              'Task.h',
+                                              'Task_T.h',
+                                              'Thread.h',
+                                              'Thread_Adapter.h',
+                                              'Thread_Control.h',
+                                              'Thread_Exit.h',
+                                              'Thread_Manager.h',
+                                              'Timeprobe.h',
+                                              'Timeprobe_T.h',
+                                              'Timer_Hash.h',
+                                              'Timer_Hash_T.h',
+                                              'Timer_Heap.h',
+                                              'Timer_Heap_T.h',
+                                              'Timer_List.h',
+                                              'Timer_List_T.h',
+                                              'Timer_Queue.h',
+                                              'Timer_Queue_Adapters.h',
+                                              'Timer_Queue_T.h',
+                                              'Timer_Wheel.h',
+                                              'Timer_Wheel_T.h',
+                                              'Time_Request_Reply.h',
+                                              'Time_Value.h',
+                                              'TkReactor.h',
+                                              'TLI.h',
+                                              'TLI_Acceptor.h',
+                                              'TLI_Connector.h',
+                                              'TLI_Stream.h',
+                                              'Token.h',
+                                              'Token_Collection.h',
+                                              'Token_Invariants.h',
+                                              'Token_Manager.h',
+                                              'Token_Request_Reply.h',
+                                              'TP_Reactor.h',
+                                              'Trace.h',
+                                              'TTY_IO.h',
+                                              'Typed_SV_Message.h',
+                                              'Typed_SV_Message_Queue.h',
+                                              'UNIX_Addr.h',
+                                              'UPIPE_Acceptor.h',
+                                              'UPIPE_Addr.h',
+                                              'UPIPE_Connector.h',
+                                              'UPIPE_Stream.h',
+                                              'Version.h',
+                                              'WFMO_Reactor.h',
+                                              'WIN32_Asynch_IO.h',
+                                              'WIN32_Proactor.h',
+                                              'XtReactor.h'
+                        }
+                 source type(cpp) "Log_Msg.cpp"
+                 source type(cpp) "ACE.cpp"
+                 source type(cpp) "Activation_Queue.cpp"
+                 source type(cpp) "Active_Map_Manager.cpp"
+                 source type(cpp) "Addr.cpp"
+                 source type(cpp) "Arg_Shifter.cpp"
+                 source type(cpp) "ARGV.cpp"
+                 source type(cpp) "Asynch_IO.cpp"
+                 source type(cpp) "Asynch_IO_Impl.cpp"
+                 source type(cpp) "Base_Thread_Adapter.cpp"
+                 source type(cpp) "Based_Pointer_Repository.cpp"
+                 source type(cpp) "Basic_Stats.cpp"
+                 source type(cpp) "Basic_Types.cpp"
+                 source type(cpp) "Capabilities.cpp"
+                 source type(cpp) "CDR_Base.cpp"
+                 source type(cpp) "CDR_Stream.cpp"
+                 source type(cpp) "Containers.cpp"
+                 source type(cpp) "CORBA_Handler.cpp"
+                 source type(cpp) "CORBA_Ref.cpp"
+                 source type(cpp) "Date_Time.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) "Dirent.cpp"
+                 source type(cpp) "DLL.cpp"
+                 source type(cpp) "Dump.cpp"
+                 source type(cpp) "Dynamic.cpp"
+                 source type(cpp) "Dynamic_Service.cpp"
+                 source type(cpp) "Event_Handler.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) "Filecache.cpp"
+                 source type(cpp) "Flag_Manip.cpp"
+                 source type(cpp) "Functor.cpp"
+                 source type(cpp) "Future.cpp"
+                 source type(cpp) "Get_Opt.cpp"
+                 source type(cpp) "Handle_Ops.cpp"
+                 source type(cpp) "Handle_Set.cpp"
+                 source type(cpp) "Hash_Map_Manager.cpp"
+                 source type(cpp) "High_Res_Timer.cpp"
+                 source type(cpp) "INET_Addr.cpp"
+                 source type(cpp) "Init_ACE.cpp"
+                 source type(cpp) "IO_Cntl_Msg.cpp"
+                 source type(cpp) "IO_SAP.cpp"
+                 source type(cpp) "IOStream.cpp"
+                 source type(cpp) "IPC_SAP.cpp"
+                 source type(cpp) "Lib_Find.cpp"
+                 source type(cpp) "Local_Name_Space.cpp"
+                 source type(cpp) "Local_Tokens.cpp"
+                 source type(cpp) "Log_Msg_Backend.cpp"
+                 source type(cpp) "Log_Msg_IPC.cpp"
+                 source type(cpp) "Log_Record.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) "Malloc.cpp"
+                 source type(cpp) "Malloc_Allocator.cpp"
+                 source type(cpp) "Map.cpp"
+                 source type(cpp) "Mem_Map.cpp"
+                 source type(cpp) "Memory_Pool.cpp"
+                 source type(cpp) "Message_Block.cpp"
+                 source type(cpp) "Message_Queue.cpp"
+                 source type(cpp) "Method_Request.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) "NT_Service.cpp"
+                 source type(cpp) "Object_Manager.cpp"
+                 source type(cpp) "Obstack.cpp"
+                 source type(cpp) "OS.cpp"
+                 source type(cpp) "OS_Dirent.cpp"
+                 source type(cpp) "OS_Errno.cpp"
+                 source type(cpp) "OS_Log_Msg_Attributes.cpp"
+                 source type(cpp) "OS_Memory.cpp"
+                 source type(cpp) "OS_String.cpp"
+                 source type(cpp) "OS_Thread_Adapter.cpp"
+                 source type(cpp) "OS_TLI.cpp"
+                 source type(cpp) "PI_Malloc.cpp"
+                 source type(cpp) "Pair.cpp"
+                 source type(cpp) "Parse_Node.cpp"
+                 source type(cpp) "Pipe.cpp"
+                 source type(cpp) "Priority_Reactor.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) "RB_Tree.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) "Sched_Params.cpp"
+                 source type(cpp) "Select_Reactor.cpp"
+                 source type(cpp) "Select_Reactor_Base.cpp"
+                 source type(cpp) "Service_Config.cpp"
+                 source type(cpp) "Service_Manager.cpp"
+                 source type(cpp) "Service_Object.cpp"
+                 source type(cpp) "Service_Repository.cpp"
+                 source type(cpp) "Service_Types.cpp"
+                 source type(cpp) "Shared_Memory.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) "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_Dgram_Mcast.cpp"
+                 source type(cpp) "SOCK_IO.cpp"
+                 source type(cpp) "SOCK_Stream.cpp"
+                 source type(cpp) "Sock_Connect.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) "Stats.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) "Svc_Conf_l.cpp"
+                 source type(cpp) "Svc_Conf_y.cpp"
+                 source type(cpp) "Synch.cpp"
+                 source type(cpp) "Process_Semaphore.cpp"
+                 source type(cpp) "Process_Mutex.cpp"
+                 source type(cpp) "RW_Process_Mutex.cpp"
+                 source type(cpp) "File_Lock.cpp"
+                 source type(cpp) "Synch_Options.cpp"
+                 source type(cpp) "System_Time.cpp"
+                 source type(cpp) "Task.cpp"
+                 source type(cpp) "Thread.cpp"
+                 source type(cpp) "Thread_Adapter.cpp"
+                 source type(cpp) "Thread_Control.cpp"
+                 source type(cpp) "Thread_Exit.cpp"
+                 source type(cpp) "Thread_Manager.cpp"
+                 source type(cpp) "Time_Request_Reply.cpp"
+                 source type(cpp) "Timeprobe.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_Queue_Adapters.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) "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) "TP_Reactor.cpp"
+                 source type(cpp) "Trace.cpp"
+                 source type(cpp) "TTY_IO.cpp"
+                 source type(cpp) "Typed_SV_Message.cpp"
+                 source type(cpp) "Typed_SV_Message_Queue.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) "WIN32_Asynch_IO.cpp"
+                 source type(cpp) "WIN32_Proactor.cpp"
+                 source type(cpp) "XtReactor.cpp"
+
+                  // Libraries needed during linking
+                if $__TOS_WIN__ {
+                        source type (lib) "advapi32.lib"
+                        source type (lib) "user32.lib"
+                        source type (lib) "ws2_32.lib"
+                        source type (lib) "wsock32.lib"
+                        source type (lib) "mswsock.lib"
+                }
+                if $__TOS_AIX__ {
+                        source type (lib) "libtli_r.a"
+                        source type (lib) "libpthreads.a"
+                        source type (lib) "libc_r.a"
+                        source type (lib) "libdl.a"
+                        // Imports
+                        source type (imp) "pse.exp"
+                }
+        }
+}
diff --git a/ace/ace.rc b/ace/ace.rc
index 54792491900..ede20b12cdf 100644
--- a/ace/ace.rc
+++ b/ace/ace.rc
@@ -28,11 +28,3 @@ BEGIN
         VALUE "Translation", 0x409, 1200
     END
 END
-
-/*
- * The following resource is used by the ACE logger to write messages
- * to the NT event log. If you are statically linking to the ACE
- * library, and you wish to use the NT event log, you should copy this
- * message table to your application's resource script.
- */
-1 MESSAGETABLE ace_message_table.bin
diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index b3999691401..e6cdf3f9508 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -3,6 +3,7 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

 CFG=ACE DLL - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -17,6 +18,8 @@ CFG=ACE DLL - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

+!MESSAGE "ACE DLL - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "ACE DLL - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 MFC Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 MFC Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "ACE DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

@@ -27,11 +30,72 @@ CFG=ACE DLL - Win32 Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ""

+# PROP BASE Intermediate_Dir "DLL\Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "DLL\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

 CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "../" /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

 MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

 RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo /o".\ace.bsc"

+# ADD BSC32 /nologo /o".\ace.bsc"

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace-r.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

+# SUBTRACT BASE LINK32 /pdb:none

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /pdb:".\ace.pdb" /machine:ALPHA /out:"..\bin\ace.dll"

+# SUBTRACT LINK32 /pdb:none

 

-!IF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ""

+# PROP BASE Intermediate_Dir ".\DLL\Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\DLL\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /Gt0 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "../" /D /"WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /MDd /c

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /o /win32 "NUL" "NUL"

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo /o".\ace.bsc"

+# ADD BSC32 /nologo /o".\ace.bsc"

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\ace.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

+# SUBTRACT BASE LINK32 /pdb:none

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /version:4.4 /subsystem:windows /dll /pdb:".\aced.pdb" /debug /machine:ALPHA /out:"..\bin\aced.dll" /pdbtype:sept

+# SUBTRACT LINK32 /pdb:none

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -45,12 +109,15 @@ RSC=rc.exe
 # PROP Intermediate_Dir "DLL\MFC_Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /D ACE_HAS_DLL=1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /I "../PACE" /D "NDEBUG" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FR /FD /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -76,12 +143,15 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\MFC_Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D ACE_HAS_DLL=1 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX /Yc /Yu

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D ACE_HAS_MFC=1 /D ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER=1 /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX /Yc /Yu

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -106,11 +176,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 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /Ob2 /I "../" /I "../PACE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

+RSC=rc.exe

 # ADD BASE RSC /l 0x407 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -134,11 +207,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # 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 /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "ACE_BUILD_DLL" /D "ACE_OS_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX /Yc /Yu

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

+RSC=rc.exe

 # ADD BASE RSC /l 0x407 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -153,6 +229,8 @@ LINK32=link.exe
 

 # Begin Target

 

+# Name "ACE DLL - Win32 Alpha Release"

+# Name "ACE DLL - Win32 Alpha Debug"

 # Name "ACE DLL - Win32 MFC Release"

 # Name "ACE DLL - Win32 MFC Debug"

 # Name "ACE DLL - Win32 Release"

@@ -163,842 +241,3973 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\ACE.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Activation_Queue.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Arg_Shifter.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ARGV.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO_Impl.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Params.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_QoS.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Base_Thread_Adapter.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Based_Pointer_Repository.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Basic_Stats.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Basic_Types.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Capabilities.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Base.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Configuration.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Handler.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Ref.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Date_Time.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_IO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dirent.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service_Base.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler_T.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv_Msg.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send_Msg.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_IO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\File_Lock.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Filecache.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Flag_Manip.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Get_Opt.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Ops.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Set.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\High_Res_Timer.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\INET_Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Init_ACE.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_Cntl_Msg.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_SAP.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IPC_SAP.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Lib_Find.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Tokens.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg_Backend.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg_Callback.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg_IPC.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\Log_Msg_NT_Event_Log.cpp

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Record.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Logging_Strategy.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_CODgram.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Dgram.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_Allocator.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_Instantiations.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_IO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Mem_Map.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_SAP.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Memory_Pool.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Method_Request.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Msg_WFMO_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Multiplexor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Proxy.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming_Context.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Service.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Manager.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Obstack.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Dirent.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Errno.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Log_Msg_Attributes.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Memory.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_String.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Thread_Adapter.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_TLI.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Parse_Node.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PI_Malloc.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pipe.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Proactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Manager.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Mutex.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Semaphore.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Profile_Timer.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Read_Buffer.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Tokens.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RW_Process_Mutex.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sample_History.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sched_Params.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_Base.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Config.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Manager.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Object.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Repository.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Templates.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Types.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_MM.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_SV.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Object.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Signal.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_CODgram.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sock_Connect.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Bcast.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Mcast.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_IO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SString.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stats.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Complex.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Simple.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_l.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_y.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Handler.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_Options.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\System_Time.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Template_Instantiations.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Adapter.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Control.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Exit.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Hook.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Manager.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timeprobe.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_Adapters.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Collection.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Invariants.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Manager.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TP_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trace.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TTY_IO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UNIX_Addr.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Stream.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WFMO_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Asynch_IO.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Proactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\XtReactor.cpp

+

+!IF  "$(CFG)" == "ACE DLL - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 MFC Debug"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE DLL - Win32 Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -1398,10 +4607,6 @@ SOURCE=.\Log_Msg_IPC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Log_Msg_NT_Event_Log.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Log_Priority.h

 # End Source File

 # Begin Source File

@@ -2114,6 +5319,10 @@ SOURCE=.\WIN32_Proactor.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\ws2tcpip.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\XtReactor.h

 # End Source File

 # End Group

diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 0fa973c11a0..52e2df1e32a 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -2,6 +2,7 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

+# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604

 # TARGTYPE "Win32 (x86) Static Library" 0x0104

 

 CFG=ACE LIB - Win32 Static Debug

@@ -17,6 +18,8 @@ CFG=ACE LIB - Win32 Static Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

+!MESSAGE "ACE LIB - Win32 Alpha Static Release" (based on "Win32 (ALPHA) Static Library")

+!MESSAGE "ACE LIB - Win32 Alpha Static Debug" (based on "Win32 (ALPHA) Static Library")

 !MESSAGE "ACE LIB - Win32 Pharlap ETS Static Release" (based on "Win32 (x86) Static Library")

 !MESSAGE "ACE LIB - Win32 Pharlap ETS Static Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE "ACE LIB - Win32 Static Release" (based on "Win32 (x86) Static Library")

@@ -27,10 +30,52 @@ CFG=ACE LIB - Win32 Static Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath "Desktop"

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "ACE_stat"

+# PROP BASE Intermediate_Dir "ACE_stat"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Lib\Release"

+# PROP Target_Dir ""

 CPP=cl.exe

-RSC=rc.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O1 /I "../" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /FD /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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo /o".\ace.bsc"

+# ADD BSC32 /nologo /o".\ace.bsc"

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:".\aces.lib"

+# ADD LIB32 /nologo /out:".\aces.lib"

 

-!IF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "ACE_stat"

+# PROP BASE Intermediate_Dir "ACE_stat"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Lib\Debug"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP nologo Gt0 W3 GX Zi Od Gy I "../" D "_DEBUG" D "WIN32" D "_WINDOWS" D ACE_HAS_DLL=0 D "ACE_NO_INLINE" FD c

+# ADD CPP nologo Gt0 W3 GX Zi Od Gy I "../" D "_DEBUG" D "WIN32" D "_WINDOWS" D ACE_HAS_DLL=0 FD MTd c

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo /o".\ace.bsc"

+# ADD BSC32 /nologo /o".\ace.bsc"

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:".\acesd.lib"

+# ADD LIB32 /nologo /out:".\acesd.lib"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -42,10 +87,12 @@ RSC=rc.exe
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MD /W3 /GX /O1 /I "../" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MT /W3 /GX /O1 /I "../" /I "../PACE" /D ACE_OS_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

 BSC32=bscmake.exe

@@ -67,10 +114,12 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /Gy /I "../" /I "../PACE" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

 BSC32=bscmake.exe

@@ -92,9 +141,11 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /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 "../" /I "../PACE" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

 BSC32=bscmake.exe

@@ -116,9 +167,11 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /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 "../" /I "../PACE" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

 BSC32=bscmake.exe

@@ -132,6 +185,8 @@ LIB32=link.exe -lib
 

 # Begin Target

 

+# Name "ACE LIB - Win32 Alpha Static Release"

+# Name "ACE LIB - Win32 Alpha Static Debug"

 # Name "ACE LIB - Win32 Pharlap ETS Static Release"

 # Name "ACE LIB - Win32 Pharlap ETS Static Debug"

 # Name "ACE LIB - Win32 Static Release"

@@ -142,146 +197,686 @@ LIB32=link.exe -lib
 # Begin Source File

 

 SOURCE=.\ACE.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Activation_Queue.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Active_Map_Manager.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Arg_Shifter.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ARGV.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Asynch_IO_Impl.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Params.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_QoS.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\ATM_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Base_Thread_Adapter.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Based_Pointer_Repository.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Basic_Stats.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Basic_Types.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Capabilities.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Base.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CDR_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Configuration.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Containers.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Handler.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\CORBA_Ref.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Date_Time.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DEV_IO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dirent.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\DLL.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dump.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Dynamic_Service_Base.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -290,698 +885,3289 @@ SOURCE=.\Dynamic_Service_Base.h
 # Begin Source File

 

 SOURCE=.\Event_Handler.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Event_Handler_T.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Recv_Msg.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FIFO_Send_Msg.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\FILE_IO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\File_Lock.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Filecache.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Flag_Manip.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Functor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Get_Opt.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Ops.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Handle_Set.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\High_Res_Timer.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\INET_Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Init_ACE.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_Cntl_Msg.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IO_SAP.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IOStream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\IPC_SAP.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Lib_Find.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Local_Tokens.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg_Backend.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg_Callback.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Msg_IPC.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\Log_Msg_NT_Event_Log.cpp

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Log_Record.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Logging_Strategy.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_CODgram.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Dgram.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\LSOCK_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_Allocator.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Malloc_Instantiations.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Map.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_IO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Mem_Map.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_SAP.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\MEM_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Memory_Pool.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Block.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Method_Request.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Msg_WFMO_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Multiplexor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Proxy.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Naming_Context.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\NT_Service.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Object_Manager.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Obstack.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Dirent.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Errno.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Log_Msg_Attributes.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Memory.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_String.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_Thread_Adapter.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\OS_TLI.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pair.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Parse_Node.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\PI_Malloc.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Pipe.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Priority_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Proactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Manager.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Mutex.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Process_Semaphore.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Profile_Timer.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Reactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Read_Buffer.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Registry_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Name_Space.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Remote_Tokens.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\RW_Process_Mutex.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sample_History.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sched_Params.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Select_Reactor_Base.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Config.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Manager.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Object.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Repository.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Templates.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Service_Types.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_MM.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Memory_SV.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Shared_Object.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Signal.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_CODgram.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sock_Connect.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Bcast.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Dgram_Mcast.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_IO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SOCK_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SPIPE_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SString.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Stats.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Strategies.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Complex.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Semaphore_Simple.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_l.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Conf_y.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Svc_Handler.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Synch_Options.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\System_Time.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Task.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Template_Instantiations.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Adapter.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Control.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Exit.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Hook.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Thread_Manager.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Time_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timeprobe.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Hash.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Heap.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_List.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Queue_Adapters.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Timer_Wheel.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TLI_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Collection.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Invariants.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Manager.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Request_Reply.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TP_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Trace.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TTY_IO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Typed_SV_Message_Queue.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UNIX_Addr.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Acceptor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Connector.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\UPIPE_Stream.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WFMO_Reactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Asynch_IO.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\WIN32_Proactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\XtReactor.cpp

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -1381,10 +4567,6 @@ SOURCE=.\Log_Msg_IPC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Log_Msg_NT_Event_Log.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Log_Priority.h

 # End Source File

 # Begin Source File

@@ -2101,6 +5283,10 @@ SOURCE=.\WIN32_Proactor.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\ws2tcpip.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\XtReactor.h

 # End Source File

 # End Group

@@ -3153,6 +6339,21 @@ SOURCE=..\Version
 # Begin Source File

 

 SOURCE=.\ace.rc

+

+!IF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Alpha Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Pharlap ETS Static Debug"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "ACE LIB - Win32 Static Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # End Target

diff --git a/ace/ace_message_table.bin b/ace/ace_message_table.bin
deleted file mode 100644
index 6ac08e5dc69..00000000000
--- a/ace/ace_message_table.bin
+++ /dev/null
diff --git a/ace/ace_wchar.inl b/ace/ace_wchar.inl
index 7e783b5ac73..6ad2a24664b 100644
--- a/ace/ace_wchar.inl
+++ b/ace/ace_wchar.inl
@@ -7,15 +7,15 @@
 #if defined (ACE_HAS_WCHAR)
 
 inline
-ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii (void)
-{
-  delete [] this->s_;
+ACE_Wide_To_Ascii::~ACE_Wide_To_Ascii (void) 
+{ 
+  delete [] this->s_; 
 }
 
 inline char *
-ACE_Wide_To_Ascii::char_rep (void)
-{
-  return this->s_;
+ACE_Wide_To_Ascii::char_rep (void) 
+{ 
+  return this->s_; 
 }
 
 
@@ -27,22 +27,22 @@ ACE_Wide_To_Ascii::convert (const wchar_t *wstr)
     return 0;
 
 # if defined (ACE_WIN32)
-  int len = ::WideCharToMultiByte (CP_OEMCP,
-                                   0,
-                                   wstr,
-                                   -1,
-                                   NULL,
-                                   0,
-                                   NULL,
-                                   NULL);
+  size_t len = ::WideCharToMultiByte (CP_OEMCP, 
+                                      0, 
+                                      wstr, 
+                                      -1, 
+                                      NULL, 
+                                      0, 
+                                      NULL, 
+                                      NULL);
 # elif defined (ACE_LACKS_WCSLEN)
   const wchar_t *wtemp = wstr;
   while (wtemp != 0)
     ++wtemp;
 
-  int len = wtemp - wstr + 1;
+  size_t len = wtemp - wstr + 1;
 # else  /* ACE_WIN32 */
-  int len = ::wcslen (wstr) + 1;
+  size_t len = ::wcslen (wstr) + 1;
 # endif /* ACE_WIN32 */
 
   char *str = new char[len];
@@ -52,7 +52,7 @@ ACE_Wide_To_Ascii::convert (const wchar_t *wstr)
 # elif defined (VXWORKS)
   ::wcstombs (str, wstr, len);
 # else /* ACE_WIN32 */
-  for (int i = 0; i < len; i++)
+  for (size_t i = 0; i < len; i++)
     {
       wchar_t *t = ACE_const_cast (wchar_t *, wstr);
       str[i] = ACE_static_cast (char, *(t + i));
@@ -63,22 +63,22 @@ ACE_Wide_To_Ascii::convert (const wchar_t *wstr)
 
 
 inline
-ACE_Wide_To_Ascii::ACE_Wide_To_Ascii (const wchar_t *s)
-  : s_ (ACE_Wide_To_Ascii::convert (s))
+ACE_Wide_To_Ascii::ACE_Wide_To_Ascii (const wchar_t *s) 
+  : s_ (ACE_Wide_To_Ascii::convert (s)) 
 {
 }
 
 
-inline
-ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide (void)
-{
-  delete [] this->s_;
+inline 
+ACE_Ascii_To_Wide::~ACE_Ascii_To_Wide (void) 
+{ 
+  delete [] this->s_; 
 }
 
 inline wchar_t *
-ACE_Ascii_To_Wide::wchar_rep (void)
-{
-  return this->s_;
+ACE_Ascii_To_Wide::wchar_rep (void) 
+{ 
+  return this->s_; 
 }
 
 
@@ -90,11 +90,11 @@ ACE_Ascii_To_Wide::convert (const char *str)
     return 0;
 
 # if defined (ACE_WIN32)
-  int len = ::MultiByteToWideChar (CP_OEMCP, 0, str, -1, NULL, 0);
+  size_t len = ::MultiByteToWideChar (CP_OEMCP, 0, str, -1, NULL, 0);
 # else /* ACE_WIN32 */
-  int len = strlen (str) + 1;
+  size_t len = strlen (str) + 1;
 # endif /* ACE_WIN32 */
-
+    
   wchar_t *wstr = new wchar_t[len];
 
 # if defined (ACE_WIN32)
@@ -102,7 +102,7 @@ ACE_Ascii_To_Wide::convert (const char *str)
 # elif defined (VXWORKS)
   ::mbstowcs (wstr, str, len);
 # else /* ACE_WIN32 */
-  for (int i = 0; i < len; i++)
+  for (size_t i = 0; i < len; i++)
     {
       char *t = ACE_const_cast (char *, str);
       wstr[i] = ACE_static_cast (wchar_t, *(t + i));
@@ -112,11 +112,12 @@ ACE_Ascii_To_Wide::convert (const char *str)
 }
 
 
-inline
-ACE_Ascii_To_Wide::ACE_Ascii_To_Wide (const char *s)
-: s_ (ACE_Ascii_To_Wide::convert (s))
+inline 
+ACE_Ascii_To_Wide::ACE_Ascii_To_Wide (const char *s) 
+: s_ (ACE_Ascii_To_Wide::convert (s)) 
 {
 }
 
 
 #endif /* ACE_HAS_WCHAR */
+
diff --git a/ace/config-all.h b/ace/config-all.h
index 87736e7591c..88474f3c528 100644
--- a/ace/config-all.h
+++ b/ace/config-all.h
@@ -315,7 +315,7 @@
 // should keep them quiet.
 // ============================================================================
 
-#if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__KCC) || defined (__rational__) || defined (__USLC__) || defined (ACE_RM544)
+#if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (__DECCXX) || defined (__KCC) || defined (__rational__) || (__USLC__)
 // Some compilers complain about "statement with no effect" with (a).
 // This eliminates the warnings, and no code is generated for the null
 // conditional statement.  NOTE: that may only be true if -O is enabled,
@@ -325,7 +325,7 @@
 # define ACE_UNUSED_ARG(a) (a)
 #endif /* ghs || __GNUC__ || ..... */
 
-#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC) || defined (ACE_RM544) || defined (__USLC__)
+#if defined (__sgi) || defined (ghs) || defined (__DECCXX) || defined(__BORLANDC__) || defined (__KCC)
 # define ACE_NOTREACHED(a)
 #else  /* __sgi || ghs || ..... */
 # define ACE_NOTREACHED(a) a
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index 91876848014..6d00c2c9944 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -27,7 +27,7 @@
 // For some reason EGCS doesn't define this in its stdlib.
 # define ACE_LACKS_AUTO_PTR
 
-# if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 91 )
+# if __GNUC__ == 2 && __GNUC_MINOR__ >= 91
 #   define ACE_HAS_USING_KEYWORD
     // This is only needed with egcs 1.1 (egcs-2.91.57).  It can't be
     // used with older versions.
@@ -36,13 +36,6 @@
 # define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
 # endif /* __GNUC__ >= 2.91 */
 
-#if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 97 )
-	// gcc 2.97 and higher use libstdc++-v3 and require
-	// the use of the std namespace for using iostreams
-# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-# undef  ACE_USES_OLD_IOSTREAMS              
-#endif /* __GNUC__ >= 2.97 */
-
 # if __GNUC__ == 2  &&  __GNUC_MINOR__ != 9  &&  __GNUC_MINOR__ != 91
 #   // g++ 2.9 and egcs 2.91 apparently have a bug with this . . .
 #   define ACE_HAS_TEMPLATE_SPECIALIZATION
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 360b80082a4..dfb63912c15 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -47,7 +47,7 @@
 #  define volatile
 
 #else  // aC++ definitions
-
+ 
 // Parts of TAO (at least) use __HP_aCC to detect this compiler, but the
 // macro is not set until A.01.18. If it's not set, set it - it won't be an
 // HP-advertised value, but we don't check the value/version - just whether
@@ -68,10 +68,8 @@
 // Compiler can't handle calls like foo->operator T *()
 #  define ACE_HAS_BROKEN_CONVERSIONS
 
-// Compiler supports C++ exception handling, unless we turned it off with +noeh
-#  if !defined (__HPACC_NOEH)
-#    define ACE_HAS_EXCEPTIONS
-#  endif  /* __HPACC_NOEH */
+// Compiler supports C++ exception handling
+#  define ACE_HAS_EXCEPTIONS
 
 // Compiler enforces the "One Definition Rule"
 #  define ACE_HAS_ONE_DEFINITION_RULE
@@ -104,10 +102,7 @@
 #  define ACE_HAS_TEMPLATE_SPECIALIZATION
 
 // Compiler's runtime new throws bad_alloc on out-of-memory condition.
-// If being compiled without exceptions though (+noeh), it doesn't.
-#  if defined (ACE_HAS_EXCEPTIONS)
-#    define ACE_NEW_THROWS_EXCEPTIONS
-#  endif /* ACE_HAS_EXCEPTIONS */
+#  define ACE_NEW_THROWS_EXCEPTIONS
 
 #endif /* __cplusplus < 199707L */
 
@@ -123,7 +118,7 @@
 // Compiler doesn't handle 'signed char' correctly (used in ace/IOStream.h)
 #define ACE_LACKS_SIGNED_CHAR
 
-#include "ace/config-hpux-10.x.h"        /* OS information */
+#include "ace/config-hpux-10.x.h"	/* OS information */
 
 #include "ace/post.h"
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 39ef2c9ab5b..7ad4a081567 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -248,8 +248,6 @@
 
 // Platform supports reentrant functions (all the POSIX *_r functions).
 #define ACE_HAS_REENTRANT_FUNCTIONS
-// ctime_r and asctime_r conform to POSIX.1c (2 param version)
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 
 // HP-UX 11 has reentrant netdb functions.  The catch is that the old
 // functions (gethostbyname, etc.) are thread-safe and the _r versions are
@@ -362,9 +360,6 @@
 // HP-UX 11 conforms to the XPG4 spec, which ACE calls broken for the
 // errmsg not being const...
 #define ACE_HAS_BROKEN_T_ERROR
-// The definitions of TCP_NODELAY and TCP_MAXSEG conflict between
-// sys/xti.h and netinet/tcp.h.
-#define ACE_HAS_CONFLICTING_XTI_MACROS
 
 /////////////////////////////////////////////////////////////////////////
 //
diff --git a/ace/config-qnx-rtp.h b/ace/config-qnx-rtp.h
index 2fc30d5ef19..f181cb5b192 100644
--- a/ace/config-qnx-rtp.h
+++ b/ace/config-qnx-rtp.h
@@ -67,7 +67,7 @@
 #define ACE_HAS_DIRENT
 #define ACE_HAS_GETPAGESIZE
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-//#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
+#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 #define ACE_HAS_INLINED_OSCALLS
 #define ACE_HAS_IP_MULTICAST
 #define ACE_HAS_MSG
diff --git a/ace/config-unixware-7.1.0.udk.h b/ace/config-unixware-7.1.0.udk.h
deleted file mode 100644
index ecda2189807..00000000000
--- a/ace/config-unixware-7.1.0.udk.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/* -*- C++ -*- */
-#ifndef ACE_CONFIG_UNIXWARE_UDK_H
-#define ACE_CONFIG_UNIXWARE_UDK_H
-
-// $Id$
-
-// Configuration for the unixware UDK compiler. derived from the unixware/g++ config
-// which was itself derived from an autoconfig run.
-
-/* ACE configuration header file */
-
-#define ACE_HAS_STD_TEMPLATE_SPECIALIZATION
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
-//#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
-
-/* For unixware 7.1 && g++ 2.91.57, see if this fixes my problem */
-//#define ACE_HAS_BROKEN_NOOP_DTORS
-#ifndef UNIXWARE_7_1
-#define UNIXWARE_7_1
-#endif
-
-#define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
-
-/* Define if you have the strftime function.  */
-#define HAVE_STRFTIME 1
-
-/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
-#define HAVE_SYS_WAIT_H 1
-
-/* Define if you have the ANSI C header files.  */
-#define STDC_HEADERS 1
-
-/* Define if lex declares yytext as a char * by default, not a char[].  */
-#define YYTEXT_POINTER 1
-
-/* Define _REENTRANT if reentrant functions should be used. */
-#ifndef _REENTRANT
-# define _REENTRANT 1
-#endif
-
-#define ACE_HAS_NEW_NO_H 1
-#define ACE_HAS_STDEXCEPT_NO_H 1
-#define ACE_HAS_IOMANIP_NO_H 1
-
-/* Platform provides <sys/ioctl.h> header */
-#define ACE_HAS_SYS_IOCTL_H 1
-
-/*
- * TODO: These two next #defines have an #undef before them, in
- * case the variable being defined already had a value.
- * The #undefs are being picked up by configure, and are commented out!
- */
-#define ACE_THREAD_MIN_PRIORITY 0
-#if defined (ACE_THREAD_MIN_PRIORITY)
-/* # undef PTHREAD_MIN_PRIORITY */
-# define PTHREAD_MIN_PRIORITY ACE_THREAD_MIN_PRIORITY
-#endif  /* #if defined (ACE_THREAD_MIN_PRIORITY) */
-
-#define ACE_THREAD_MAX_PRIORITY 99
-#if defined (ACE_THREAD_MAX_PRIORITY)
-/* # undef PTHREAD_MAX_PRIORITY */
-# define PTHREAD_MAX_PRIORITY ACE_THREAD_MAX_PRIORITY
-#endif  /* #if defined (ACE_THREAD_MAX_PRIORITY) */
-
-
-
-/* UnixWare specific configuration parameters */
-/* #undef UNIXWARE */
-/* #undef UNIXWARE_2_0 */
-/* #undef UNIXWARE_2_1 */
-
-/* Specify sizes of given built-in types.  If a size isn't defined here,
-   then ace/Basic_Types.h will attempt to deduce the size. */
-/* #undef ACE_SIZEOF_CHAR */
-#define ACE_SIZEOF_SHORT 2
-#define ACE_SIZEOF_INT 4
-#define ACE_SIZEOF_LONG 4
-#define ACE_SIZEOF_LONG_LONG 8
-#define ACE_SIZEOF_VOID_P 4
-#define ACE_SIZEOF_FLOAT 4
-#define ACE_SIZEOF_DOUBLE 8
-#define ACE_SIZEOF_LONG_DOUBLE 12
-
-/* typedef for ACE_UINT64 */
-/*
-   We only make the typedef if ACE_UINT64_TYPEDEF is defined.  Otherwise,
-   let ace/Basic_Types.h do the work for us.
-*/
-#define ACE_UINT64_TYPEDEF unsigned long long
-#if defined(ACE_UINT64_TYPEDEF)
-   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF && !ACE_DISABLE_AUTOCONF_UINT64 */
-
-/* Enable ACE inlining */
-#define __ACE_INLINE__ 1
-
-/* Platform supports new C++ style casts (dynamic_cast, static_cast,
-   reinterpret_cast and const_cast) */
-#define ACE_HAS_ANSI_CASTS
-
-/* Platform supports Asynchronous IO calls */
-/* #define ACE_HAS_AIO_CALLS */
-
-/* Specify this if you don't want threads to inherit parent thread's
-   ACE_Log_Msg properties. */
-/* #undef ACE_THREADS_DONT_INHERIT_LOG_MSG */
-
-/* OS has priocntl (2) */
-#define ACE_HAS_PRIOCNTL 1
-
-/* Platform has pread() and pwrite() support */
-#define ACE_HAS_P_READ_WRITE 1
-
-/* Compiler/platform correctly calls init()/fini() for shared libraries */
-#define ACE_HAS_AUTOMATIC_INIT_FINI 1
-
-/* Compiler handles explicit calling of template destructor correctly.
-   See "ace/OS.h" for details. */
-/* Staller: already defined by config-g++-common.h
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR 1
-*/
-
-/* Platform doesn't cast MAP_FAILED to a (void *). */
-/* #undef ACE_HAS_BROKEN_MAP_FAILED */
-/* Staller: oh yes, let's do this! */
-#define ACE_HAS_BROKEN_MAP_FAILED
-
-
-/* Prototypes for both signal() and struct sigaction are consistent. */
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1
-
-/* Compiler/platform has correctly prototyped header files */
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-/* Platform supports operations on directories via struct dirent,
-   readdir_r, etc. */
-#define ACE_HAS_DIRENT
-
-/* Compiler supports C++ exception handling */
-# if !defined (ACE_HAS_EXCEPTIONS)
-#define ACE_HAS_EXCEPTIONS
-# endif
-
-/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be
-   defined, except on Win32) */
-#define ACE_HAS_GETPAGESIZE
-
-/* Platform supports the getrusage() system call. */
-#define ACE_HAS_GETRUSAGE
-
-/* Platform has a getrusage () prototype in sys/resource.h that differs from
-   the one in ace/OS.i. */
-#define ACE_HAS_GETRUSAGE_PROTO
-
-/* The GPERF utility is compiled for this platform */
-#define ACE_HAS_GPERF
-
-/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT 1
-
-/* Compiler/platform supports SunOS high resolution timers */
-/* #undef ACE_HAS_HI_RES_TIMER */
-
-/* Compiler/platform supports idtype_t. */
-#define ACE_HAS_IDTYPE_T
-
-/* Inline all the static class OS methods to remove call overhead */
-/* Note: This gets defined by OS.h if __ACE_INLINE__ is defined */
-/* #undef ACE_HAS_INLINED_OSCALLS */
-
-/* Platform supports IP multicast */
-#define ACE_HAS_IP_MULTICAST
-
-/* Platform supports thr_keydelete (e.g,. UNIXWARE) */
-#define ACE_HAS_THR_KEYDELETE
-
-/* Platform calls thr_minstack() rather than thr_min_stack() (e.g., Tandem). */
-#define ACE_HAS_THR_MINSTACK
-
-/* Some files, such as ace/streams.h, want to include new style C++ stream
-   headers.  These headers are iomanip, ios, iostream, istream, ostream,
-   fstream and streambuf.  If _all_ of these headers aren't available, then
-   assume that only iostream.h and fstream.h are available. */
-/* #define ACE_USES_OLD_IOSTREAMS */
-
-/* Platform supports recvmsg and sendmsg */
-#define ACE_HAS_MSG
-
-/* Platform's select() uses non-const timeval* (only found on Linux right
-   now) */
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
-/* Uses ctime_r & asctime_r with only two parameters vs. three. */
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-
-/* Platform is an Intel Pentium microprocessor. */
-/* There is a problem with the gethrtime() because of (apparently) a problem
-   with the inline assembly instruction.  Hopefully there is a way to resolve
-   that with an improvement to the assembler
-*/
-#ifdef ACE_HAS_PENTIUM
-//#undef ACE_HAS_PENTIUM
-#endif /* ACE_HAS_PENTIUM */
-
-
-/* Platform contains <poll.h> */
-#define ACE_HAS_POLL
-
-/* Platform supports POSIX O_NONBLOCK semantics */
-#define ACE_HAS_POSIX_NONBLOCK
-
-/* Platform supports the POSIX struct timespec type */
-#define ACE_HAS_POSIX_TIME
-
-/* Platform supports the /proc file system and defines tid_t
-   in <sys/procfs.h> */
-#define ACE_HAS_PROC_FS
-
-/* Platform supports POSIX Threads */
-#define ACE_HAS_PTHREADS
-
-/* Platform supports POSIX Threads .4a Draft 4 */
-/* #undef ACE_HAS_PTHREADS_DRAFT4 */
-
-/* Platform supports POSIX Threads .4a Draft 6 */
-/* #undef ACE_HAS_PTHREADS_DRAFT6 */
-
-/* Platform supports POSIX Threads .1c Draft 7 */
-/* #undef ACE_HAS_PTHREADS_DRAFT7 */
-
-/* Platform supports POSIX.1c-1995 threads */
-#define ACE_HAS_PTHREADS_STD
-
-/* Platform has pthread_condattr_setkind_np(). */
-/* #undef ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */
-
-/* Platform has pthread_mutexattr_setkind_np(). */
-/* #undef ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP */
-
-/* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and
-   PTHREAD_PROCESS_SHARED values */
-#define ACE_HAS_PTHREAD_PROCESS_ENUM
-
-/* Platform has pthread_sigmask() defined. */
-#define ACE_HAS_PTHREAD_SIGMASK
-
-/* Platform will recurse infinitely on thread exits from TSS cleanup routines
-   (e.g., AIX) */
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-
-/* Platform supports reentrant functions (i.e., all the POSIX *_r
-   functions). */
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-/* Platform has support for multi-byte character support compliant with the
-   XPG4 Worldwide Portability Interface wide-character classification. */
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
-/* Platform does not support reentrant netdb functions (getprotobyname_r,
-   getprotobynumber_r, gethostbyaddr_r, gethostbyname_r, getservbyname_r). */
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-
-/* Platform supports the POSIX regular expression library */
-#define ACE_HAS_REGEX
-
-/* Platform has special header for select(). */
-#define ACE_HAS_SELECT_H
-
-/* Platform has a function to set t_errno (e.g., Tandem). */
-#define ACE_HAS_SET_T_ERRNO
-
-/* Platform supports SVR4 extended signals */
-#define ACE_HAS_SIGINFO_T
-
-/* Platform/compiler has the sigwait(2) prototype */
-#define ACE_HAS_SIGWAIT
-
-/* Compiler/platform defines the sig_atomic_t typedef */
-#define ACE_HAS_SIG_ATOMIC_T
-
-/* Platform supports new BSD inet_addr len field. */
-#define ACE_HAS_SIN_LEN
-
-/* OS/compiler uses size_t * rather than int * for socket lengths */
-#define ACE_HAS_SIZET_SOCKET_LEN
-
-/* Compiler/platform provides the sys/sockio.h file */
-#define ACE_HAS_SOCKIO_H
-
-/* Compiler supports the ssize_t typedef */
-#define ACE_HAS_SSIZE_T
-
-/* Platform supports UNIX International Threads */
-#define ACE_HAS_STHREADS
-
-/* Platform has thr_yield() */
-#define ACE_HAS_THR_YIELD
-
-/* Platform/compiler supports Standard C++ Library */
-/* It seems that UDK provides std-like declarations for only portions
-   such as <exception>
-*/
-#define ACE_HAS_STANDARD_CPP_LIBRARY 0
-
-/* Compiler/platform supports struct strbuf */
-#define ACE_HAS_STRBUF_T
-
-/* Platform supports STREAMS */
-#define ACE_HAS_STREAMS
-
-/* Platform supports STREAM pipes */
-#define ACE_HAS_STREAM_PIPES
-
-/* Compiler/platform supports strerror () */
-#define ACE_HAS_STRERROR
-
-/* Platform/Compiler supports a String class (e.g., GNU or Win32). */
-#define ACE_HAS_STRING_CLASS
-
-/* Platform has <strings.h> (which contains bzero() prototype) */
-#define ACE_HAS_STRINGS
-
-/* Platform has void * as second parameter to gettimeofday and a has a
-   prototype */
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
-
-/* Compiler/platform supports SVR4 dynamic linking semantics */
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-/* Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... */
-#define ACE_HAS_SVR4_TLI
-
-/* Compiler/platform contains the <sys/syscall.h> file. */
-#define ACE_HAS_SYSCALL_H
-
-/* Platform supports system configuration information */
-#define ACE_HAS_SYSINFO 1
-
-/* Platform supports System V IPC (most versions of UNIX, but not Win32) */
-#define ACE_HAS_SYSV_IPC 1
-
-/* Platform provides <sys/filio.h> header */
-#define ACE_HAS_SYS_FILIO_H 1
-
-/* Platform provides <sys/xti.h> header */
-#define ACE_HAS_SYS_XTI_H 1
-
-/* Compiler implements template specialization */
-#define ACE_HAS_TEMPLATE_SPECIALIZATION 1
-
-/* Compiler implements templates that support typedefs inside of classes used
-   as formal arguments to a template class. */
-#define ACE_HAS_TEMPLATE_TYPEDEFS 1
-
-/* Platform has terminal ioctl flags like TCGETS and TCSETS. */
-#define ACE_HAS_TERM_IOCTLS 1
-
-/* Platform supports threads */
-#define ACE_HAS_THREADS 1
-
-/* Compiler/platform has thread-specific storage */
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
-
-/* Platform supports TLI timod STREAMS module */
-#define ACE_HAS_TIMOD_H 1
-
-/* Platform supports TLI tiuser header */
-#define ACE_HAS_TIUSER_H 1
-
-/* Platform supports TLI.  Also see ACE_TLI_TCP_DEVICE. */
-#define ACE_HAS_TLI 1
-
-/* Platform provides TLI function prototypes */
-#define ACE_HAS_TLI_PROTOTYPES 1
-
-/* Platform supports ualarm() */
-#define ACE_HAS_UALARM 1
-
-/* Platform supports ucontext_t (which is used in the extended signal API). */
-#define ACE_HAS_UCONTEXT_T 1
-
-/* Platform has <utime.h> header file */
-#define ACE_HAS_UTIME 1
-
-/* Compiler supports the C++ typename keyword */
-#define ACE_HAS_TYPENAME_KEYWORD 1
-
-/* Compiler supports the new using keyword for C++ namespaces. */
-#define ACE_HAS_USING_KEYWORD 1
-
-/* Prints out console message in ACE_NOTSUP.  Useful for tracking down origin
-   of ACE_NOTSUP. */
-/* #undef ACE_HAS_VERBOSE_NOTSUP */
-
-/* Platform requires void * for mmap(). */
-#define ACE_HAS_VOIDPTR_MMAP 1
-
-/* Platform has XTI (X/Open-standardized superset of TLI).  Implies
-   ACE_HAS_TLI but uses a different header file. */
-#define ACE_HAS_XTI 1
-
-/* Platform can not build ace/IOStream{,_T}.cpp.  This does not necessarily
-   mean that the platform does not support iostreams. */
-#define ACE_LACKS_ACE_IOSTREAM 1
-
-/* Platform does not have u_longlong_t typedef */
-#define ACE_LACKS_U_LONGLONG_T 1
-
-/* Platform lacks madvise() (e.g., Linux) */
-#define ACE_LACKS_MADVISE 1
-
-/* Platform lacks POSIX prototypes for certain System V functions like shared
-   memory and message queues. */
-#define ACE_LACKS_SOME_POSIX_PROTOTYPES 1
-
-/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */
-#define ACE_LACKS_PRI_T 1
-
-/* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1
-
-/* Platfrom lack pthread_yield() support. */
-#define ACE_LACKS_PTHREAD_YIELD 1
-
-/* Platform lacks readers/writer locks. */
-#define ACE_LACKS_RWLOCK_T 1
-
-/* MIT pthreads platform lacks the timedwait prototypes */
-#define ACE_LACKS_TIMEDWAIT_PROTOTYPES 1
-
-/* Platform does not define timepec_t as a typedef for struct timespec. */
-#define ACE_LACKS_TIMESPEC_T 1
-
-/* Compile using multi-thread libraries */
-#define ACE_MT_SAFE 1
-
-/* Platform needs regexpr.h for regular expression support */
-#define ACE_NEEDS_REGEXPR_H 1
-
-/* Platform needs to #include <sched.h> to get thread scheduling defs. */
-#define ACE_NEEDS_SCHED_H 1
-
-/* <time.h> doesn't automatically #include <sys/time.h> */
-#define ACE_LACKS_SYSTIME_H 1
-
-/* Turns off the LM_DEBUG and LM_ERROR logging macros... */
-/* #undef ACE_NLOGGING */
-
-/* Turns off the tracing feature. */
-#define ACE_NTRACE 1
-
-/* The OS/platform supports the poll() event demultiplexor */
-#define ACE_USE_POLL 1
-
-/* Platform has its standard c++ library in the namespace std. */
-#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-
-/* The number of bytes in a double.  */
-#define SIZEOF_DOUBLE 8
-
-/* The number of bytes in a float.  */
-#define SIZEOF_FLOAT 4
-
-/* The number of bytes in a int.  */
-#define SIZEOF_INT 4
-
-/* The number of bytes in a long.  */
-#define SIZEOF_LONG 4
-
-/* The number of bytes in a long double.  */
-#define SIZEOF_LONG_DOUBLE 12
-
-/* The number of bytes in a long long.  */
-#define SIZEOF_LONG_LONG 8
-
-/* The number of bytes in a short.  */
-#define SIZEOF_SHORT 2
-
-/* The number of bytes in a signed char.  */
-#define SIZEOF_SIGNED_CHAR 1
-
-/* The number of bytes in a void *.  */
-#define SIZEOF_VOID_P 4
-
-/* Define if you have the execv function.  */
-#define HAVE_EXECV 1
-
-/* Define if you have the execve function.  */
-#define HAVE_EXECVE 1
-
-/* Define if you have the execvp function.  */
-#define HAVE_EXECVP 1
-
-/* Define if you have the <dirent.h> header file.  */
-#define HAVE_DIRENT_H 1
-
-/* Define if you have the <fstream> header file.  */
-#define HAVE_FSTREAM 1
-
-/* Define if you have the <iomanip> header file.  */
-#define HAVE_IOMANIP 1
-
-/* Define if you have the <iostream> header file.  */
-#define HAVE_IOSTREAM 1
-
-/* Define if you have the <pwd.h> header file.  */
-#define HAVE_PWD_H 1
-
-/* Name of package */
-#define PACKAGE "ace"
-
-/* Version number of package */
-#define VERSION "4.6.37"
-
-/* Added by Staller */
-#define ENUM_BOOLEAN // See file /usr/local/lib/gcc-lib/i486-pc-sysv5/egcs-2.91.60/include/sys/types.h
-/* Hat nix gebracht
-#define ACE_DEFAULT_SELECT_REACTOR_SIZE 256 // this is like in linux config fileto avoid another error
-*/
-#define howmany(x, y)   (((x)+((y)-1))/(y))
-#define ACE_HAS_BROKEN_T_ERROR // let disappear a nasty warning from OS.i
-#if !defined (__USLC__)
-#  define __USLC__ 1
-#endif
-
-#define  __IOCTL_VERSIONED__ // By Carlo!
-#endif /* ACE_UNIXWARE_UDK_H */
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 5887ef8c6d7..d2b04bd2712 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -25,13 +25,6 @@
 #  define WIN32 1
 # endif
 
-// When building a VCL application, the main VCL header file should be
-// included before anything else. You can define ACE_HAS_VCL=1 in your
-// project settings to have this file included for you automatically.
-# if defined (ACE_HAS_VCL) && (ACE_HAS_VCL != 0)
-#  include /**/ <vcl.h>
-# endif 
-
 # include "ace/config-win32-common.h"
 
 # define ACE_CC_NAME ACE_LIB_TEXT ("Borland C++ Builder")
diff --git a/ace/svc_export.h b/ace/svc_export.h
index f2f320bbc9e..0b5ca323c56 100644
--- a/ace/svc_export.h
+++ b/ace/svc_export.h
@@ -13,10 +13,6 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_SVC_HAS_DLL)
-#  define ACE_SVC_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_SVC_HAS_DLL */
-
 #if !defined (ACE_SVC_HAS_DLL)
 #define ACE_SVC_HAS_DLL 1
 #endif /* ! ACE_SVC_HAS_DLL */
diff --git a/ace/ws2tcpip.h b/ace/ws2tcpip.h
new file mode 100644
index 00000000000..5640f2e5989
--- /dev/null
+++ b/ace/ws2tcpip.h
@@ -0,0 +1,90 @@
+/*
+**      $Id$
+**
+**      WS2TCPIP.H - WinSock2 Extension for TCP/IP protocols
+**
+**      This file contains TCP/IP specific information for use
+**      by WinSock2 compatible applications.
+**
+**      To provide the backward compatibility, all the TCP/IP
+**      specific definitions that were included in the WINSOCK.H
+**       file are now included in WINSOCK2.H file. WS2TCPIP.H
+**      file includes only the definitions  introduced in the
+**      "WinSock 2 Protocol-Specific Annex" document.
+**
+**      Rev 0.3 Nov 13, 1995
+*/
+
+#ifndef _WS2TCPIP_H_
+#define _WS2TCPIP_H_
+#include "ace/pre.h"
+
+/* Structure to keep interface specific information */
+
+typedef struct _INTERFACE_INFO
+{
+        u_long          iiFlags;                /* Interface flags */
+        struct sockaddr iiAddress;              /* Interface address */
+        struct sockaddr iiBroadcastAddress;     /* Broadcast address */
+        struct sockaddr iiNetmask;              /* Network mask */
+} INTERFACE_INFO, FAR * LPINTERFACE_INFO;
+
+/* Possible flags for the  iiFlags - bitmask  */
+
+#define IFF_UP          0x00000001 /* Interface is up */
+#define IFF_BROADCAST   0x00000002 /* Broadcast is  supported */
+#define IFF_LOOPBACK    0x00000004 /* this is loopback interface */
+#define IFF_POINTTOPOINT 0x00000008 /*this is point-to-point
+interface*/
+#define IFF_MULTICAST   0x00000010 /* multicast is supported */
+
+/* Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP */
+
+struct ip_mreq {
+        struct in_addr imr_multiaddr;   /* IP multicast address of group */
+        struct in_addr imr_interface;   /* local IP address of interface */
+};
+
+/* TCP/IP specific Ioctl codes */
+
+#define SIO_GET_INTERFACE_LIST  _IOR('t', 127, u_long) // <TBD>
+
+/* Option to use with [gs]etsockopt at the IPPROTO_IP level */
+
+#define IP_OPTIONS                      1 /* set/get IP options */
+#define IP_HDRINCL                      2 /* header is included with data */
+#define IP_TOS                  3 /* IP type of service and preced*/
+#define IP_TTL                  4 /* IP time to live */
+#define IP_MULTICAST_IF         9 /* set/get IP multicast i/f  */
+#define IP_MULTICAST_TTL             10 /* set/get IP multicast ttl */
+#define IP_MULTICAST_LOOP            11 /*set/get IP multicast loopback */
+#define IP_ADD_MEMBERSHIP            12 /* add an IP group membership */
+#define IP_DROP_MEMBERSHIP     13/* drop an IP group membership */
+
+
+/* Option to use with [gs]etsockopt at the IPPROTO_UDP level */
+
+#define UDP_NOCHECKSUM  1
+
+/* Option to use with [gs]etsockopt at the IPPROTO_TCP level */
+
+#define  TCP_EXPEDITED_1122     0x0002
+
+
+/* IPv6 definitions */
+
+struct in_addr6 {
+                u_char  s6_addr[16];    /* IPv6 address */
+};
+
+struct sockaddr_in6 {
+                short           sin6_family;   /* AF_INET6 */
+                u_short         sin6_port;         /* Transport level port numb
+er */
+                u_long  sin6_flowinfo; /* IPv6 flow information */
+                struct in_addr6         sin6_addr; /* IPv6 address */
+};
+
+
+#include "ace/post.h"
+#endif  /* _WS2TCPIP_H_ */
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/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/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index 4ab5888049a..c94c236ea68 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -1,8 +1,3 @@
-Sun Feb 18 09:33:33 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-	* server/IO.cpp (handle): Added a const to the handle() method
-	  to make compilers happy.  Thanks to Kitty for reporting this.
-
 Mon Jun 12 14:22:35 PDT 2000 James Hu <jxh@entera.com>
 
         * server/HTTP_Response.cpp: Added content length support.
diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index aec6da1898c..abb979ddb1f 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -9,7 +9,8 @@
 ACE_RCSID(server, IO, "$Id$")
 
 JAWS_IO::JAWS_IO (void)
-  : handler_ (0)
+  : handle_ (ACE_INVALID_HANDLE),
+    handler_ (0)
 {
 }
 
@@ -17,32 +18,31 @@ JAWS_IO::~JAWS_IO (void)
 {
 }
 
-void
-JAWS_IO::handler (JAWS_IO_Handler *handler)
+ACE_HANDLE
+JAWS_IO::handle (void)
 {
-  this->handler_ = handler;
+  return this->handle_;
 }
 
-JAWS_Synch_IO::JAWS_Synch_IO (void)
-  : handle_ (ACE_INVALID_HANDLE)
+void
+JAWS_IO::handle (ACE_HANDLE handle)
 {
+  this->handle_ = handle;
 }
 
-JAWS_Synch_IO::~JAWS_Synch_IO (void)
+void
+JAWS_IO::handler (JAWS_IO_Handler *handler)
 {
-  ACE_OS::closesocket (this->handle_);
+  this->handler_ = handler;
 }
 
-ACE_HANDLE
-JAWS_Synch_IO::handle (void) const
+JAWS_Synch_IO::JAWS_Synch_IO (void)
 {
-  return this->handle_;
 }
 
-void
-JAWS_Synch_IO::handle (ACE_HANDLE handle)
+JAWS_Synch_IO::~JAWS_Synch_IO (void)
 {
-  this->handle_ = handle;
+  ACE_OS::closesocket (this->handle_);
 }
 
 void
diff --git a/apps/JAWS/server/IO.h b/apps/JAWS/server/IO.h
index baac80de4ac..cf22d1ff09f 100644
--- a/apps/JAWS/server/IO.h
+++ b/apps/JAWS/server/IO.h
@@ -45,9 +45,8 @@ public:
   JAWS_IO (void);
   virtual ~JAWS_IO (void);
   void handler (JAWS_IO_Handler *handler);
-
-  virtual void handle (ACE_HANDLE h) = 0;
-  virtual ACE_HANDLE handle (void) const = 0;
+  void handle (ACE_HANDLE h);
+  ACE_HANDLE handle (void);
 
   // James, please add documentation here.
 
@@ -74,6 +73,7 @@ public:
   // send an error message to the handle.
 
 protected:
+  ACE_HANDLE handle_;
   JAWS_IO_Handler *handler_;
 };
 
@@ -136,9 +136,6 @@ public:
 
   ~JAWS_Synch_IO (void);
 
-  virtual void handle (ACE_HANDLE h);
-  virtual ACE_HANDLE handle (void) const;
-
   void read (ACE_Message_Block& mb, int size);
 
   void transmit_file (const char *filename,
@@ -161,8 +158,6 @@ public:
 protected:
   virtual void send_message (const char *buffer,
                              int length);
-
-  ACE_HANDLE handle_;
 };
 
 // This only works on Win32
@@ -180,9 +175,6 @@ public:
 
   ~JAWS_Asynch_IO (void);
 
-  virtual void handle (ACE_HANDLE h) { ACE_Handler::handle (h); };
-  virtual ACE_HANDLE handle (void) const { return ACE_Handler::handle (); };
-
   void read (ACE_Message_Block& mb, int size);
 
   void transmit_file (const char *filename,
diff --git a/apps/drwho/ChangeLog b/apps/drwho/ChangeLog
index 453e019444c..97dd4934cec 100644
--- a/apps/drwho/ChangeLog
+++ b/apps/drwho/ChangeLog
@@ -1,16 +1,3 @@
-Sat Feb 17 08:33:06 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-	* File_Manager.cpp: Fixed several unreachable statements.
-
-Thu Feb 15 06:00:12 2001  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-	* server.cpp: Renamed tstamp to time_stamp to avoid conflicts with
-	  the pre-processor on the Forte 5.2 compiler.  Thanks to Mike
- 	  Curtis for reporting this.
-
-	* File_Manager.cpp: Fixed "unreachable code" errors reported by
-	  Compaq C++.
-
 Thu Nov 16 17:58:10 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * Options.h:
diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp
index 83bdc87f338..873b221a65c 100644
--- a/apps/drwho/File_Manager.cpp
+++ b/apps/drwho/File_Manager.cpp
@@ -102,9 +102,14 @@ File_Manager::open_passwd_file (void)
 
   this->buffer_ptr = (char *) this->mmap_.addr ();
 
-  this->buffer_size = this->mmap_.size ();
-  this->current_ptr = this->buffer_ptr;
-  return this->number_of_friends;
+  if (this->buffer_ptr >= 0)
+    {
+      this->buffer_size = this->mmap_.size ();
+      this->current_ptr = this->buffer_ptr;
+      return this->number_of_friends;
+    }
+
+  return -1;
 }
 
 // This function opens up FILENAME and memory maps it in our address
@@ -141,24 +146,29 @@ File_Manager::open_friends_file (const char *filename)
 
   this->buffer_ptr = (char *) this->mmap_.addr ();
 
-  this->buffer_size = this->mmap_.size ();
-  this->current_ptr = this->buffer_ptr;
+  if (this->buffer_ptr >= 0)
+    {
+      this->buffer_size = this->mmap_.size ();
+      this->current_ptr = this->buffer_ptr;
+
+      // Determine how many friends there are by counting the newlines.
 
-  // Determine how many friends there are by counting the newlines.
+      for (char *cp = this->buffer_ptr + this->buffer_size;
+	   cp > this->buffer_ptr
+	   ; )
+	if (*--cp == '\n')
+	  {
+	    this->number_of_friends++;
 
-  for (char *cp = this->buffer_ptr + this->buffer_size;
-       cp > this->buffer_ptr
-       ;)
-    if (*--cp == '\n')
-      {
-        this->number_of_friends++;
+	    // Skip consecutive newlines.
+	    while (cp[-1] == '\n')
+	      --cp;
+	  }
 
-        // Skip consecutive newlines.
-        while (cp[-1] == '\n')
-          --cp;
-      }
+      return this->number_of_friends;
+    }
 
-  return this->number_of_friends;
+  return -1;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/apps/drwho/server.cpp b/apps/drwho/server.cpp
index f25815fb7b1..c0b5cb1f333 100644
--- a/apps/drwho/server.cpp
+++ b/apps/drwho/server.cpp
@@ -25,7 +25,7 @@
 #include "ace/Log_Msg.h"
 
 static char *
-time_stamp (void)
+tstamp (void)
 {
   time_t time_now;
   char *temp;
@@ -43,7 +43,7 @@ exit_server (int sig)
 {
   ACE_DEBUG ((LM_DEBUG,
               "%s exiting on signal %S\n",
-              time_stamp (),
+              tstamp (),
               sig));
   ACE_OS::exit (0);
 }
diff --git a/apps/gperf/src/gperf.dsp b/apps/gperf/src/gperf.dsp
index 7230591935a..308e5de129c 100644
--- a/apps/gperf/src/gperf.dsp
+++ b/apps/gperf/src/gperf.dsp
@@ -3,6 +3,7 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

 CFG=gperf - Win32 Static Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -17,6 +18,8 @@ CFG=gperf - Win32 Static Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

+!MESSAGE "gperf - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "gperf - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "gperf - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "gperf - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE "gperf - Win32 Static Release" (based on "Win32 (x86) Console Application")

@@ -27,10 +30,70 @@ CFG=gperf - Win32 Static Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

+

+!IF  "$(CFG)" == "gperf - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "gperf__1"

+# PROP BASE Intermediate_Dir "gperf__1"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\DLL\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /D " WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /D " WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 gperf.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /out:"..\..\..\bin\Release\gperf.exe" /libpath:"..\..\..\ace" /libpath:".\lib"

+# SUBTRACT BASE LINK32 /nodefaultlib

+# ADD LINK32 gperf.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /out:"..\..\..\bin\Release\gperf.exe" /libpath:"..\..\..\ace" /libpath:".\lib"

+# SUBTRACT LINK32 /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "gperf - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "gperf__0"

+# PROP BASE Intermediate_Dir "gperf__0"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\DLL\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

 CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /D " WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

 RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 gperfd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"..\..\..\bin\gperf.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:".\lib\\"

+# SUBTRACT BASE LINK32 /incremental:no /nodefaultlib

+# ADD LINK32 gperfd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"..\..\..\bin\gperf.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:".\lib\\"

+# SUBTRACT LINK32 /incremental:no /nodefaultlib

 

-!IF  "$(CFG)" == "gperf - Win32 Release"

+!ELSEIF  "$(CFG)" == "gperf - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -39,13 +102,15 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -53,7 +118,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin\Release\gperf.exe" /libpath:"..\..\..\ace" /libpath:".\lib"

+# ADD LINK32 gperf.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin\Release\gperf.exe" /libpath:"..\..\..\ace" /libpath:".\lib"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ELSEIF  "$(CFG)" == "gperf - Win32 Debug"

@@ -65,13 +130,15 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -79,7 +146,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\bin\gperf.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:".\lib\\"

+# ADD LINK32 gperfd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\bin\gperf.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:".\lib\\"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ELSEIF  "$(CFG)" == "gperf - Win32 Static Release"

@@ -92,14 +159,16 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Static_Release"

-# PROP Intermediate_Dir "Static_Release"

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -108,7 +177,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 gperf.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin\Release\gperf.exe" /libpath:"..\..\..\ace" /libpath:".\lib"

 # SUBTRACT BASE LINK32 /nodefaultlib

-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin\Release\gperf.exe" /libpath:"..\..\..\ace" /libpath:".\lib"

+# ADD LINK32 gperfs.lib aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:"..\..\..\bin\Release\gperf.exe" /libpath:"..\..\..\ace" /libpath:".\lib"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ELSEIF  "$(CFG)" == "gperf - Win32 Static Debug"

@@ -121,14 +190,16 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -137,13 +208,15 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 gperfd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\bin\gperf.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:".\lib\\"

 # SUBTRACT BASE LINK32 /nodefaultlib

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\bin\gperf.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:".\lib\\"

+# ADD LINK32 gperfsd.lib acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\..\bin\gperf.exe" /pdbtype:sept /libpath:"..\..\..\ace" /libpath:".\lib\\"

 # SUBTRACT LINK32 /nodefaultlib

 

 !ENDIF 

 

 # Begin Target

 

+# Name "gperf - Win32 Alpha Release"

+# Name "gperf - Win32 Alpha Debug"

 # Name "gperf - Win32 Release"

 # Name "gperf - Win32 Debug"

 # Name "gperf - Win32 Static Release"

@@ -153,79 +226,64 @@ LINK32=link.exe
 # PROP Default_Filter ".cpp"

 # Begin Source File

 

-SOURCE=.\Bool_Array.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Gen_Perf.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\gperf.cpp

-# End Source File

-# Begin Source File

 

-SOURCE=.\Hash_Table.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Iterator.cpp

-# End Source File

-# Begin Source File

+!IF  "$(CFG)" == "gperf - Win32 Alpha Release"

+

+DEP_CPP_GPERF=\

+	"..\..\..\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\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"\

+	".\Bool_Array.h"\

+	".\Gen_Perf.h"\

+	".\Key_List.h"\

+	".\List_Node.h"\

+	".\Options.h"\

+	".\Vectors.h"\

+	

+NODEP_CPP_GPERF=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf - Win32 Release"

 

-SOURCE=.\Key_List.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\List_Node.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Options.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Vectors.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Version.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Bool_Array.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Gen_Perf.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Hash_Table.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Iterator.h

-# End Source File

-# Begin Source File

+!ELSEIF  "$(CFG)" == "gperf - Win32 Debug"

 

-SOURCE=.\Key_List.h

-# End Source File

-# Begin Source File

+!ELSEIF  "$(CFG)" == "gperf - Win32 Static Release"

 

-SOURCE=.\List_Node.h

-# End Source File

-# Begin Source File

+!ELSEIF  "$(CFG)" == "gperf - Win32 Static Debug"

 

-SOURCE=.\Options.h

-# End Source File

-# Begin Source File

+!ENDIF 

 

-SOURCE=.\Vectors.h

 # End Source File

 # End Group

 # End Target

diff --git a/apps/gperf/src/gperf.dsw b/apps/gperf/src/gperf.dsw
index 787f4cb942e..6342ab5a626 100644
--- a/apps/gperf/src/gperf.dsw
+++ b/apps/gperf/src/gperf.dsw
@@ -11,6 +11,21 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name gperf_lib

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "gperf_lib"=.\gperf_lib.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

 }}}

 

 ###############################################################################

diff --git a/apps/gperf/src/gperf_lib.dsp b/apps/gperf/src/gperf_lib.dsp
new file mode 100644
index 00000000000..5ced2735a76
--- /dev/null
+++ b/apps/gperf/src/gperf_lib.dsp
@@ -0,0 +1,795 @@
+# Microsoft Developer Studio Project File - Name="gperf_lib" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (ALPHA) Static Library" 0x0604

+# TARGTYPE "Win32 (x86) Static Library" 0x0104

+

+CFG=gperf_lib - 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 NMAKE /f "gperf_lib.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 "gperf_lib.mak" CFG="gperf_lib - Win32 Static Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "gperf_lib - Win32 Alpha Release" (based on "Win32 (ALPHA) Static Library")

+!MESSAGE "gperf_lib - Win32 Alpha Debug" (based on "Win32 (ALPHA) Static Library")

+!MESSAGE "gperf_lib - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "gperf_lib - Win32 Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE "gperf_lib - Win32 Static Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "gperf_lib - Win32 Static Debug" (based on "Win32 (x86) Static Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "gperf_l1"

+# PROP BASE Intermediate_Dir "gperf_l1"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:".\lib\gperf.lib"

+# ADD LIB32 /nologo /out:".\gperf.lib"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "gperf_l0"

+# PROP BASE Intermediate_Dir "gperf_l0"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Z7 /Od /I "..\..\..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Z7 /Od /I "..\..\..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:".\lib\gperfd.lib"

+# ADD LIB32 /nologo /out:".\gperfd.lib"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "gperf_li"

+# PROP BASE Intermediate_Dir "gperf_li"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\DLL\Release"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:".\gperf.lib"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "gperf_l0"

+# PROP BASE Intermediate_Dir "gperf_l0"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\DLL\Debug"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\\" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo

+# ADD LIB32 /nologo /out:".\gperfd.lib"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "gperf_lib___Win32_Static_Release"

+# PROP BASE Intermediate_Dir "gperf_lib___Win32_Static_Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "_WINDOWS" /D "NDEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:".\lib\gperf.lib"

+# ADD LIB32 /nologo /out:".\gperfs.lib"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "gperf_lib___Win32_Static_Debug"

+# PROP BASE Intermediate_Dir "gperf_lib___Win32_Static_Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\..\\" /D "_WINDOWS" /D "_DEBUG" /D "ACE_AS_STATIC_LIBS" /D "WIN32" /FD /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LIB32=link.exe -lib

+# ADD BASE LIB32 /nologo /out:".\lib\gperfd.lib"

+# ADD LIB32 /nologo /out:".\gperfsd.lib"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "gperf_lib - Win32 Alpha Release"

+# Name "gperf_lib - Win32 Alpha Debug"

+# Name "gperf_lib - Win32 Release"

+# Name "gperf_lib - Win32 Debug"

+# Name "gperf_lib - Win32 Static Release"

+# Name "gperf_lib - Win32 Static Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=.\Bool_Array.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_BOOL_=\

+	"..\..\..\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\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"\

+	".\Bool_Array.h"\

+	".\Options.h"\

+	

+NODEP_CPP_BOOL_=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Gen_Perf.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_GEN_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\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"\

+	".\Bool_Array.h"\

+	".\Gen_Perf.h"\

+	".\Key_List.h"\

+	".\List_Node.h"\

+	".\Options.h"\

+	".\Vectors.h"\

+	

+NODEP_CPP_GEN_P=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Hash_Table.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_HASH_=\

+	"..\..\..\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\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"\

+	".\Hash_Table.h"\

+	".\List_Node.h"\

+	".\Options.h"\

+	

+NODEP_CPP_HASH_=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Iterator.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_ITERA=\

+	"..\..\..\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\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"\

+	".\Iterator.h"\

+	".\Options.h"\

+	

+NODEP_CPP_ITERA=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_List.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_KEY_L=\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\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\Read_Buffer.h"\

+	"..\..\..\ace\Read_Buffer.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.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"\

+	".\Hash_Table.h"\

+	".\Key_List.h"\

+	".\List_Node.h"\

+	".\Options.h"\

+	".\Vectors.h"\

+	

+NODEP_CPP_KEY_L=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\List_Node.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_LIST_=\

+	"..\..\..\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\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"\

+	".\List_Node.h"\

+	".\Options.h"\

+	".\Vectors.h"\

+	

+NODEP_CPP_LIST_=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Options.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_OPTIO=\

+	"..\..\..\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\Get_Opt.h"\

+	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\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"\

+	".\Iterator.h"\

+	".\Options.h"\

+	

+NODEP_CPP_OPTIO=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Vectors.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_VECTO=\

+	"..\..\..\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\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"\

+	".\Vectors.h"\

+	

+NODEP_CPP_VECTO=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Version.cpp

+

+!IF  "$(CFG)" == "gperf_lib - Win32 Alpha Release"

+

+DEP_CPP_VERSI=\

+	"..\..\..\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\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"\

+	

+NODEP_CPP_VERSI=\

+	"..\..\..\ace\inc_user_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Release"

+

+!ELSEIF  "$(CFG)" == "gperf_lib - Win32 Static Debug"

+

+!ENDIF 

+

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=.\Bool_Array.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Gen_Perf.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Hash_Table.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Iterator.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Key_List.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\List_Node.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Options.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Vectors.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/bin/ACEutils.pm b/bin/ACEutils.pm
index b7e5a24217c..65aa31e0c71 100644
--- a/bin/ACEutils.pm
+++ b/bin/ACEutils.pm
@@ -26,15 +26,13 @@ sub CheckForExeDir
 ### Check and remove, but don't actually use
 sub CheckForConfig
 {
-  for($i = 0; $i <= $#ARGV;) {
+  for($i = 0; $i <= $#ARGV; $i++) {
     if ($ARGV[$i] eq '-Config') {  
       if (!defined $ARGV[$i + 1]) {
         print STDERR "You must pass a configuration with Config\n";
         exit(1);
       }
       splice(@ARGV, $i, 2);
-    } else {
-      $i++;
     }
   }
 }
diff --git a/bin/PerlACE/MSProject.pm b/bin/PerlACE/MSProject.pm
deleted file mode 100644
index 5562b6fd24e..00000000000
--- a/bin/PerlACE/MSProject.pm
+++ /dev/null
@@ -1,393 +0,0 @@
-# $Id$
-
-package PerlACE::MSProject;
-
-use strict;
-use FileHandle;
-
-###############################################################################
-
-# Constructor
-
-sub new  
-{
-    my $proto = shift;
-    my $class = ref ($proto) || $proto;
-    my $self = {};
-    
-    $self->{FILENAME} = shift;
-    $self->{VERSION} = undef;
-    $self->{NAME} = undef;
-    %{$self->{CONFIGS}} = ();
-    
-    bless ($self, $class);
-    return $self;
-}
-
-###############################################################################
-
-# Accessors
-
-sub Filename
-{
-    my $self = shift;
-
-    if (@_ != 0) {
-        $self->{FILENAME} = shift;
-    }
-	
-    return $self->{FILENAME};
-}
-
-sub Version ()
-{
-    my $self = shift;
-    return $self->{VERSION};
-}
-
-sub Name ()
-{
-    my $self = shift;
-    return $self->{NAME};
-}
-
-sub Configs ()
-{
-    my $self = shift;
-    return keys %{$self->{CONFIGS}};
-}
-
-sub DepOutputFile ($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-
-    my $name = $self->OutputFile ($config);
-           
-    if ($name =~ m/\.dll$/) {
-        $name = $self->LibraryFile ($config);             
-    }
-
-    $name =~ s/.*\\//; # / <- For devenv
-    $name =~ s/.*\///; 
-
-    return $name;
-}
-
-sub OutputFile ($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    if (%{$self->{CONFIGS}}->{$config}->{LINK} =~ m/out\:\"([^\"]*)\"/) {
-        return $1;
-    }
-    elsif (defined $self->Name ()) {
-        my $filename = $self->Filename;
-        my $ext = "";
-        
-        if (%{$self->{CONFIGS}}->{$config}->{LINK} =~ m/\/dll/) {
-            $ext = ".dll";
-        }
-        elsif (%{$self->{CONFIGS}}->{$config}->{LINK} =~ m/\/subsystem\:/) {
-            $ext = ".exe";
-        }
-        else {
-            $ext = ".lib";
-        }
-        
-        $filename =~ s/\.[^\.]*$/$ext/;
-        return $filename;
-    }
-}
-
-
-sub LibraryFile ($)
-{
-    my $self = shift;
-    my $config = shift;
-    my $dll = undef;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    if ($self->OutputFile ($config) =~ m/([^\/\\]*)\.dll$/i) {
-        $dll = $1;
-    }
-    
-    if (defined $dll) {
-        if (%{$self->{CONFIGS}}->{$config}->{LINK} =~ m/implib\:\"([^\"]*)\"/i) {
-            return $1;
-        }
-        else {
-            $dll =~ s/.*\\//ig; # / <- Just here to fix color coding in devenv beta
-            return $self->OutputDir ($config). $dll . ".lib";
-        }
-    }
-}
-
-sub OutputDir ($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    return %{$self->{CONFIGS}}->{$config}->{OUTPUTDIR}; 
-}
-
-sub IntermidiateDir ($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    return %{$self->{CONFIGS}}->{$config}->{INTERMEDIATEDIR}; 
-}
-
-sub TargetDir ($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    return %{$self->{CONFIGS}}->{$config}->{TARGETDIR}; 
-}
-
-sub CPPOptions ($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    return %{$self->{CONFIGS}}->{$config}->{CPP}; 
-}
-
-sub LINKOptions ($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    return %{$self->{CONFIGS}}->{$config}->{LINK}; 
-}
-
-sub Libs($)
-{
-    my $self = shift;
-    my $config = shift;
-    
-    if (!defined $config) {
-        print STDERR "Error: No configuration specified\n";
-        return;
-    }
-    
-    return %{$self->{CONFIGS}}->{$config}->{LIBS};
-}
-
-sub UsesTAOIDL ()
-{
-    my $self = shift;
-    
-    return $self->{TAOIDL};
-}
-
-sub Compiler ()
-{
-    my $self = shift;
-    
-    return $self->{COMPILER};
-}
-
-###############################################################################
-
-# Big methods
-
-sub Load ()
-{
-    my $self = shift;
-    my $config = "Unknown";
-
-    $self->{valid} = 0;
-
-    my $fh = new FileHandle;
-
-    unless ($fh->open ("<" . $self->{FILENAME})) {
-        print "Could not open file ", $self->{FILENAME}, ": ", $_;
-        return;
-    }
-
-    while (<$fh>) {
-        if (m/^\#.*Project File - Name=\"([^\"]*)\"/) {
-            $self->{NAME} = $1;    
-        }
-        
-        if (m/^\#.*Format Version (.*)/) {
-            $self->{VERSION} = $1;
-        }
-
-        # Check for configurations
-        
-        if (m/^\!.*IF  \"\$\(CFG\)\" == \".* - (.*)$\"/) {
-            $config = $1;
-        }
-        elsif (m/^\!ENDIF$/) {
-            $config = "";
-        }
-        
-        # Check for directories
-        
-        if (m/\# PROP Output_Dir \"(.*)\"/) {
-            %{$self->{CONFIGS}}->{$config}->{OUTPUTDIR} = $1;
-        }
-        elsif (m/\# PROP Intermediate_Dir \"(.*)\"/) {
-            %{$self->{CONFIGS}}->{$config}->{INTERMEDIATEDIR} = $1;
-        }
-        elsif (m/\# PROP Target_Dir \"(.*)\"/) {
-            %{$self->{CONFIGS}}->{$config}->{TARGETDIR} = $1;
-        }
-        
-        # Look at CPP options
-        
-        if (m/\# ADD BASE CPP(.*)$/ || m/\# ADD CPP(.*)$/) {
-            my @flags = split (/ \//, $1);
-            
-            foreach my $flag (@flags) {
-                if ($flag && %{$self->{CONFIGS}}->{$config}->{CPP} !~ m/$flag/) {
-                    %{$self->{CONFIGS}}->{$config}->{CPP} .= " /$flag";
-                }
-            }
-        }
-        elsif (m/\# SUBTRACT CPP(.*)$/ || m/\# SUBTRACT BASE CPP(.*)$/) {
-            my @flags = split (/ \//, $1);
-            
-            foreach my $flag (@flags) {
-                if ($flag && %{$self->{CONFIGS}}->{$config}->{CPP} =~ m/$flag/) {
-                    %{$self->{CONFIGS}}->{$config}->{CPP} =~ s/ \/$flag//g;
-                }
-            }
-        }
-        
-        # Look at LINK32 options
-        
-        if (m/\# ADD BASE LINK32(.*)$/ || m/\# ADD LINK32(.*)$/ 
-            || m/\# ADD BASE LIB32(.*)$/ || m/\# ADD LIB32(.*)$/) {
-            my @flags = split (/ \//, $1);
-            
-            foreach my $flag (@flags) {
-                my $found = 0;
-                my @libs = split (/ /, $flag);
-                
-                foreach my $lib (@libs) {
-                    if ($lib =~ m/\.lib$/) {
-                        if (%{$self->{CONFIGS}}->{$config}->{LIBS} !~ m/$lib/) {
-                            %{$self->{CONFIGS}}->{$config}->{LIBS} .= " $lib";
-                        }
-                        $found = 1;
-                    }                 
-                }
-                
-                if (!$found && $flag) {
-                    my $shortflag = $flag;
-                    if ($flag =~ m/^(.*)\:/) {
-                        $shortflag = $1;
-                    }
-                    
-                    if (%{$self->{CONFIGS}}->{$config}->{LINK} !~ m/ \/$shortflag/) {
-                        %{$self->{CONFIGS}}->{$config}->{LINK} .= " /$flag";
-                    }
-                }
-            }
-        }
-        elsif (m/\# SUBTRACT BASE LINK32(.*)$/ || m/\# SUBTRACT LINK32(.*)$/ 
-               || m/\# SUBTRACT BASE LIB32(.*)$/ || m/\# SUBTRACT LIB32(.*)$/) {
-            my @flags = split (/ \//, $1);
-            
-            foreach my $flag (@flags) {
-                my $shortflag = $flag;
-                if ($flag =~ m/^(.*)\:/) {
-                    $shortflag = $1;
-                }
-                
-                if ($flag && %{$self->{CONFIGS}}->{$config}->{LINK} =~ m/ (\/$shortflag\:[^ ]*)/) {
-                    %{$self->{CONFIGS}}->{$config}->{LINK} =~ s/ \Q$1\E//ig;
-                }
-            }
-        }
-        
-        if (m/^\# Name \".* - (.*)\"/ && defined %{$self->{CONFIGS}}->{"Unknown"}) {
-            %{$self->{CONFIGS}}->{$1} = %{$self->{CONFIGS}}->{"Unknown"};
-            delete %{$self->{CONFIGS}}->{"Unknown"};
-        }
-        
-        if (m/tao\_idl/ && m/\$\(InputName\)\.idl/) {
-            $self->{TAOIDL} = 1;
-        }
-    }
-    $fh->close ();
-    $self->{valid} = 1;
-}
-
-###############################################################################
-
-# Build functions
-
-sub Build ($)
-{
-    my $self = shift;
-    my ($config) = @_;
-    
-    my $command = $self->Compiler () . " " . $self->Filename () 
-                  . " /USEENV"
-                  . " /MAKE \"" . $self->Name ()
-                  . " - " . $config . "\"";
-                  
-    system $command;
-}
-
-sub Clean ($)
-{
-    my $self = shift;
-    my ($config) = @_;
-    
-    my $command = $self->Compiler () . " " . $self->Filename () 
-                  . " /USEENV"
-                  . " /MAKE \"" . $self->Name ()
-                  . " - " . $config . "\" /CLEAN";
-                  
-    system $command;
-}
-
-
-1;
\ No newline at end of file
diff --git a/bin/PerlACE/MSProject/DSP.pm b/bin/PerlACE/MSProject/DSP.pm
deleted file mode 100644
index b7ca0276a82..00000000000
--- a/bin/PerlACE/MSProject/DSP.pm
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id$
-
-package PerlACE::MSProject::DSP;
-
-use strict;
-use PerlACE::MSProject;
-
-our @ISA = ("PerlACE::MSProject");
-
-###############################################################################
-
-# Constructor
-
-sub new  
-{
-    my $proto = shift;
-    my $class = ref ($proto) || $proto;
-    my $self = $class->SUPER::new (@_);
-    
-    $self->{COMPILER} = "msdev.com";
-
-    bless ($self, $class);
-    return $self;
-}
-
-###############################################################################
-
-1;
\ No newline at end of file
diff --git a/bin/PerlACE/MSProject/VCP.pm b/bin/PerlACE/MSProject/VCP.pm
deleted file mode 100644
index 8377d22788b..00000000000
--- a/bin/PerlACE/MSProject/VCP.pm
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id$
-
-package PerlACE::MSProject::VCP;
-
-use strict;
-use PerlACE::MSProject;
-
-our @ISA = ("PerlACE::MSProject");
-
-###############################################################################
-
-# Constructor
-
-sub new  
-{
-    my $proto = shift;
-    my $class = ref ($proto) || $proto;
-    my $self = $class->SUPER::new (@_);
-    
-    $self->{COMPILER} = "evc.com";
-
-    bless ($self, $class);
-    return $self;
-}
-
-###############################################################################
-
-# Accessors
-
-1;
\ No newline at end of file
diff --git a/bin/PerlACE/Process_Unix.pm b/bin/PerlACE/Process_Unix.pm
index 4133ea84fa2..7cb18ca5034 100644
--- a/bin/PerlACE/Process_Unix.pm
+++ b/bin/PerlACE/Process_Unix.pm
@@ -36,7 +36,7 @@ for(my $i = 0; $i <= $#ARGV; $i++) {
 
 ###############################################################################
 
-### Constructor and Destructor
+### Constructor
 
 sub new  
 {
@@ -45,7 +45,6 @@ sub new
     my $self = {};
     
     $self->{RUNNING} = 0;
-    $self->{IGNOREEXESUBDIR} = 0;
     $self->{PROCESS} = undef;
     $self->{EXECUTABLE} = shift;
     $self->{ARGUMENTS} = shift;
@@ -54,17 +53,6 @@ sub new
     return $self;
 }
 
-sub DESTROY
-{
-    my $self = shift;
-    
-    if ($self->{RUNNING} == 1) {
-        print STDERR "ERROR: <", $self->{EXECUTABLE}, 
-                     "> still running upon object destruction\n";
-        $self->Kill ();             
-    }
-}
-
 ###############################################################################
 
 ### Some Accessors
@@ -78,10 +66,6 @@ sub Executable
     }
 
     my $executable = $self->{EXECUTABLE};
-    
-    if ($self->{IGNOREEXESUBDIR}) {
-        return $executable;
-    }
 
     my $basename = basename ($executable);
     my $dirname = dirname ($executable). '/';
@@ -124,17 +108,6 @@ sub CommandLine ()
     return $commandline;
 }
 
-sub IgnoreExeSubDir
-{
-    my $self = shift;
-
-    if (@_ != 0) {
-        $self->{IGNOREEXESUBDIR} = shift;
-    }
-
-    return $self->{IGNOREEXESUBDIR};
-}
-
 ###############################################################################
 
 # Spawn the process and continue;
@@ -144,28 +117,14 @@ sub Spawn ()
     my $self = shift;
 
     if ($self->{RUNNING} == 1) {
-        print STDERR "ERROR: Cannot Spawn: <", $self->Executable (),
-                     "> already running\n";
+        print STDERR "ERROR: Cannot Spawn: <$self->{EXECUTABLE}> ",
+                     "already running\n";
         return -1;
     }
 
     if (!defined $self->{EXECUTABLE}) {
         print STDERR "ERROR: Cannot Spawn: No executable specified\n";
-        return -1;
-    }
-
-    if ($self->{IGNOREEXESUBDIR} == 0) {
-        if (!-f $self->Executable ()) {
-            print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), 
-                         "> not found\n";
-            return -1;
-        }
-
-        if (!-x $self->Executable ()) {
-            print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), 
-                         "> not executable\n";
             return -1;
-        }
     }
 
     FORK:
@@ -195,9 +154,9 @@ sub Spawn ()
 sub WaitKill ($)
 {
     my $self = shift;
-    my $timeout = shift;
+    my $maxtime = shift;
 
-    my $status = $self->TimedWait ($timeout);
+    my $status = $self->TimedWait ($maxtime);
 
     if ($status == -1) {
         print STDERR "ERROR: $self->{EXECUTABLE} timedout\n";
@@ -215,25 +174,22 @@ sub WaitKill ($)
 sub SpawnWaitKill ($)
 {
     my $self = shift;
-    my $timeout = shift;
+    my $maxtime = shift;
 
     if ($self->Spawn () == -1) {
         return -1;
     }
 
-    return $self->WaitKill ($timeout);
+    return $self->WaitKill ($maxtime);
 }
 
-sub TerminateWaitKill ($)
+sub Terminate ()
 {
     my $self = shift;
-    my $timeout = shift;
   
     if ($self->{RUNNING}) {
         kill ('TERM', $self->{PROCESS});
     }
-    
-    return $self->WaitKill ($timeout);
 }
 
 sub Kill ()
@@ -255,12 +211,12 @@ sub Wait ()
     waitpid ($self->{PROCESS}, 0);
 }
 
-sub TimedWait ($)
+sub TimedWait
 {
     my $self = shift;
-    my $timeout = shift;
+    my $maxtime = shift;
     
-    while ($timeout-- != 0) {
+    while ($maxtime-- != 0) {
         my $pid = waitpid ($self->{PROCESS}, &WNOHANG);
         if ($pid != 0 && $? != -1) {
             return $?;
diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm
index ce9f04762fe..94a1e1ca2de 100644
--- a/bin/PerlACE/Process_Win32.pm
+++ b/bin/PerlACE/Process_Win32.pm
@@ -13,7 +13,7 @@ my $STILL_ACTIVE = 259;
 
 ###############################################################################
 
-### Constructor and Destructor
+### Constructor
 
 sub new  
 {
@@ -22,7 +22,6 @@ sub new
     my $self = {};
     
     $self->{RUNNING} = 0;
-    $self->{IGNOREEXESUBDIR} = 0;
     $self->{PROCESS} = undef;
     $self->{EXECUTABLE} = shift;
     $self->{ARGUMENTS} = shift;
@@ -31,17 +30,6 @@ sub new
     return $self;
 }
 
-sub DESTROY
-{
-    my $self = shift;
-    
-    if ($self->{RUNNING} == 1) {
-        print STDERR "ERROR: <", $self->{EXECUTABLE}, 
-                     "> still running upon object destruction\n";
-        $self->Kill ();             
-    }
-}
-
 ###############################################################################
 
 ### Some Accessors
@@ -55,17 +43,13 @@ sub Executable
     }
 
     my $executable = $self->{EXECUTABLE};
-    
-    if ($self->{IGNOREEXESUBDIR}) {
-        return $executable;
-    }
 
     my $basename = basename ($executable);
     my $dirname = dirname ($executable). '/';
 
     $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE";
 
-    $executable =~ s/\//\\/g; # / <- # color coding issue in devenv
+    $executable =~ s/\//\\/g;
 
     return $executable;
 }
@@ -94,17 +78,6 @@ sub CommandLine ()
     return $commandline;
 }
 
-sub IgnoreExeSubDir
-{
-    my $self = shift;
-
-    if (@_ != 0) {
-        $self->{IGNOREEXESUBDIR} = shift;
-    }
-
-    return $self->{IGNOREEXESUBDIR};
-}
-
 ###############################################################################
 
 ### Spawning processes
@@ -117,29 +90,15 @@ sub Spawn ()
     my $self = shift;
 
     if ($self->{RUNNING} == 1) {
-        print STDERR "ERROR: Cannot Spawn: <", $self->Executable (),
-                     "> already running\n";
-        return -1;
+        print STDERR "ERROR: Cannot Spawn: <$self->{EXECUTABLE}> ",
+                     "already running\n";
+	return -1;
     }
 
     if (!defined $self->{EXECUTABLE}) {
         print STDERR "ERROR: Cannot Spawn: No executable specified\n";
 	    return -1;
     }
-    
-    if ($self->{IGNOREEXESUBDIR} == 0) {
-        if (!-f $self->Executable ()) {
-            print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), 
-                         "> not found\n";
-            return -1;
-        }
-
-        if (!-x $self->Executable ()) {
-            print STDERR "ERROR: Cannot Spawn: <", $self->Executable (), 
-                         "> not executable\n";
-            return -1;
-        }
-    }
 
     Win32::Process::Create ($self->{PROCESS}, 
                             $self->Executable (),
@@ -158,7 +117,6 @@ sub Spawn ()
     }
 
     $self->{RUNNING} = 1;
-    return 0;
 }
 
 
@@ -167,9 +125,9 @@ sub Spawn ()
 sub WaitKill ($)
 {
     my $self = shift;
-    my $timeout = shift;
+    my $maxtime = shift;
 
-    my $status = $self->TimedWait ($timeout);
+    my $status = $self->TimedWait ($maxtime);
 
     if ($status == -1) {
         print STDERR "ERROR: $self->{EXECUTABLE} timedout\n";
@@ -188,13 +146,13 @@ sub WaitKill ($)
 sub SpawnWaitKill ($)
 {
     my $self = shift;
-    my $timeout = shift;
+    my $maxtime = shift;
 
     if ($self->Spawn () == -1) {
         return -1;
     }
 
-    return $self->WaitKill ($timeout);
+    return $self->WaitKill ($maxtime);
 }
 
 
@@ -203,27 +161,18 @@ sub SpawnWaitKill ($)
 sub Kill ()
 {
     my $self = shift;
- 
-    if ($self->{RUNNING}) {
-        Win32::Process::Kill ($self->{PROCESS}, -1);
-    }
-    
+    Win32::Process::Kill ($self->{PROCESS}, -1);
 	$self->{RUNNING} = 0;
 }
 
 
-# Terminate the process and wait for it to finish
+# Termnate the process
 
-sub TerminateWaitKill ($)
+sub Terminate ()
 {
     my $self = shift;
-    my $timeout = shift;
-    
-    if ($self->{RUNNING}) {
-        Win32::Process::Kill ($self->{PROCESS}, 0);
-    }
-    
-    return $self->WaitKill ($timeout);
+    Win32::Process::Kill ($self->{PROCESS}, -1);
+	$self->{RUNNING} = 0;
 }
 
 
@@ -241,16 +190,16 @@ sub Wait ()
 
 # Wait for a process to exit with a timeout
 
-sub TimedWait ($)
+sub TimedWait
 {
     my $self = shift;
-    my $timeout = shift;
+    my $maxtime = shift;
 
     if (!$self->{RUNNING}) {
         return 0;
     }
 
-    if (Win32::Process::Wait ($self->{PROCESS}, $timeout * 1000) == 0) {
+    if (Win32::Process::Wait ($self->{PROCESS}, $maxtime * 1000) == 0) {
         return -1;
     }
 
diff --git a/bin/PerlACE/Run_Test.pm b/bin/PerlACE/Run_Test.pm
index ea1a0fa0727..08ab4fa22f2 100644
--- a/bin/PerlACE/Run_Test.pm
+++ b/bin/PerlACE/Run_Test.pm
@@ -9,9 +9,6 @@ use PerlACE::ConfigList;
 package PerlACE;
 use Cwd;
 
-# Turn on autoflush
-$| = 1;
-
 sub LocalFile ($)
 {
     my $file = shift;
diff --git a/bin/auto_compile b/bin/auto_compile
index 55ec3d02086..9d12a5d5c01 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -438,12 +438,6 @@ foreach $i (@BUILD_LIST) {
 print LOG "#################### Tests\n";
 
 if ($dont_run == 0) {
-  my $config_params;
-  if ($#CONFIGURATION_OPTIONS != -1) {
-    $config_params = ' -Config ';
-  }
-  $config_params .= join ' -Config ', @CONFIGURATION_OPTIONS;
-
   foreach my $i (@RUN_LIST) {
 
     local $directory = '.';
@@ -467,7 +461,7 @@ if ($dont_run == 0) {
     if ($sandbox ne "") {
       $prefix = $sandbox.' '.$sandbox_timeout.' ';
     }
-    if (open(RUN, $prefix."perl $program $config_params 2>&1 |") == 0) {
+    if (open(RUN, $prefix."perl $program 2>&1 |") == 0) {
         push @failures, "cannot run $program in $directory";
         next;
     }
diff --git a/bin/auto_run_tests.lst b/bin/auto_run_tests.lst
index 877a146ac1b..64dcfef189d 100644
--- a/bin/auto_run_tests.lst
+++ b/bin/auto_run_tests.lst
@@ -16,17 +16,14 @@ TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl: !ST
 TAO/performance-tests/Latency/run_test.pl: !MINIMUM !ST
 TAO/performance-tests/POA/Object_Creation_And_Registration/run_test.pl
 TAO/performance-tests/RTCorba/Oneways/Reliable/run_test.pl: !MINIMUM
-TAO/tests/AMI/run_test.pl: !MINIMUM
-TAO/tests/AMI_Timeouts/run_test.pl: !MINIMUM
 
 TAO/tests/OctetSeq/run_test.pl
 TAO/tests/Leader_Followers/run_test.pl: !ST
-TAO/tests/Leader_Followers/run_test_mt.pl: !ST
 TAO/tests/Multiple_Inheritance/run_test.pl
-TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !Linux
-TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !ST !Linux
-TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !ST !Linux
-TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST !Linux
+TAO/tests/RTCORBA/Client_Propagated/run_test.pl: !MINIMUM !linux
+TAO/tests/RTCORBA/Server_Declared/run_test.pl: !MINIMUM !ST !linux
+TAO/tests/RTCORBA/MT_Client_Protocol_Priority/run_test.pl: !MINIMUM !ST !linux
+TAO/tests/RTCORBA/Banded_Connections/run_test.pl: !MINIMUM !ST !linux
 TAO/tests/RTCORBA/Server_Protocol/run_test.pl: !MINIMUM
 TAO/tests/RTCORBA/Client_Protocol/run_test.pl: !MINIMUM
 TAO/tests/RTCORBA/Private_Connection/run_test.pl: !MINIMUM
@@ -47,7 +44,6 @@ TAO/tests/IORManipulation/run_test.pl
 TAO/tests/Policies/run_test.pl: !MINIMUM !ST
 TAO/tests/Timeout/run_test.pl: !MINIMUM
 TAO/tests/Timed_Buffered_Oneways/run_test.pl: !MINIMUM
-TAO/tests/Codec/run_test.pl
 TAO/tests/IDL_Test/run_test.pl
 TAO/tests/ORB_init/run_test.pl
 TAO/tests/ORB_destroy/run_test.pl
@@ -59,11 +55,11 @@ TAO/examples/Buffered_Oneways/run_test.pl: !MINIMUM
 # REQUIRES AMI 'TAO/examples/Buffered_AMI/run_test.pl: !MINIMUM
 TAO/tests/InterOp-Naming/run_test.pl: !MINIMUM
 TAO/tests/Multiple/run_test.pl
-TAO/tests/Exposed_Policies/run_test.pl
-TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
-TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM !DISABLE_INTERCEPTORS
+# This test is broken - to be fixed by Angelo TAO/tests/Exposed_Policies/run_test.pl
+TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM
+TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM
+TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM
+TAO/tests/Portable_Interceptors/Service_Context_Manipulation/run_test.pl: !MINIMUM
 TAO/tests/Object_Loader/run_test.pl: !STATIC
 
 TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM
@@ -78,17 +74,13 @@ TAO/examples/POA/On_Demand_Loading/run_test.pl: !MINIMUM !STATIC
 TAO/examples/POA/Reference_Counted_Servant/run_test.pl
 TAO/examples/POA/Loader/run_test.pl: !MINIMUM !STATIC
 TAO/examples/POA/RootPOA/run_test.pl
+TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM
 TAO/examples/Simple/bank/run_test.pl
 TAO/examples/Simple/grid/run_test.pl
 TAO/examples/Simple/time-date/run_test.pl: !ST !STATIC
 TAO/examples/Simple/time/run_test.pl
 TAO/examples/Load_Balancing/run_test.pl: !MINIMUM
 
-TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Multicast/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/run_test.pl: !MINIMUM
-TAO/orbsvcs/tests/AVStreams/Latency/run_test.pl: !MINIMUM
 
 TAO/orbsvcs/tests/Simple_Naming/run_test.pl
 TAO/orbsvcs/tests/Trading/run_test.pl: !MINIMUM
@@ -97,8 +89,6 @@ TAO/orbsvcs/tests/Event/Performance/run_test.pl: !ST
 TAO/orbsvcs/tests/EC_Basic/run_test.pl
 TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl: !ST
 TAO/orbsvcs/tests/EC_Throughput/run_test.pl: !ST
-
-
 # BREAKS !linux 'TAO/orbsvcs/tests/EC_Mcast/run_test.pl
 # FAILS 'TAO/orbsvcs/tests/EC_Multiple/run_test.pl
 TAO/orbsvcs/tests/Event_Latency/run_test.pl
diff --git a/bin/create_vt_dsps.pl b/bin/create_vt_dsps.pl
new file mode 100755
index 00000000000..b0ca1f8e4fc
--- /dev/null
+++ b/bin/create_vt_dsps.pl
@@ -0,0 +1,180 @@
+# $Id$
+# Script that creates the version_tests dsp files
+# To use, go to the ACE_wrappers\tests\version_tests directory and
+# run.
+
+if ($^O ne "MSWin32") {
+    die "Not running on Win32";
+}
+
+opendir DIR, ".." or die "Couldn't open dir: $!"; 
+
+open DSW, ">version_tests.dsw" or die "Could not create dsw: $!";
+
+@allfiles = readdir DIR;
+closedir DIR;
+
+print DSW "Microsoft Developer Studio Workspace File, Format Version 6.00\n";
+print DSW "# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!\n";
+print DSW "\n";
+
+@data=<DATA>;
+
+foreach $file (@allfiles) {
+    if ($file =~ /\.dsp$/i) {
+        ($shortname, $junk) = split /\./, $file;
+        ### Don't do ACE_Init_Test since it uses static ACE and MFC, which is tricky and isn't
+        ### covered by this script.
+        if ($shortname ne "ACE_Init_Test") {
+            print "Converting: $shortname\n";
+            open NEW, ">$file" or die "Could not create $file: $!";
+
+            my @mydata = @data;
+            map {s/XXXXXXXX/$shortname/g;} @mydata;
+            print NEW @mydata;
+
+            open OLD, "<../$file" or die "Could not open ../$file: $!";
+            while (<OLD>) {
+                s/SOURCE=\.\\/SOURCE=\.\.\\/;
+                print NEW "$_\n" if (/^\# Begin Group/ || /^\# Begin Source/);
+                print NEW if (/^\# End/ || /^SOURCE=/ || /^\# PROP Default_Filter/);
+            }
+
+            close OLD;
+	    close NEW;	
+
+            print DSW "###############################################################################\n";
+            print DSW "\n";
+            print DSW "Project: \"$file\"=.\\$file - Package Owner=<4>\n";
+            print DSW "\n";
+            print DSW "Package=<5>\n";
+            print DSW "{{{\n";
+            print DSW "}}}\n";
+            print DSW "\n";
+            print DSW "Package=<4>\n";
+            print DSW "{{{\n";
+            print DSW "}}}\n";
+            print DSW "\n";
+        }        
+    }
+}
+
+$junk = $junk;  # to get rid of a warning
+
+print DSW "###############################################################################\n";
+close DSW;
+
+__DATA__
+# Microsoft Developer Studio Project File - Name="XXXXXXXX" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=XXXXXXXX - Win32 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 "XXXXXXXX.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 "XXXXXXXX.mak" CFG="XXXXXXXX - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "XXXXXXXX - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "XXXXXXXX - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "XXXXXXXX - Win32 Release" (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)" == "XXXXXXXX - Win32 Static Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\XXXXXXXX\Static Debug"
+# PROP BASE Intermediate_Dir ".\XXXXXXXX\Static Debug"
+# PROP BASE Target_Dir ".\XXXXXXXX"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\XXXXXXXX"
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "XXXXXXXX - Win32 Static Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\XXXXXXXX\Static Release"
+# PROP BASE Intermediate_Dir ".\XXXXXXXX\Static Release"
+# PROP BASE Target_Dir ".\XXXXXXXX"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\XXXXXXXX"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "XXXXXXXX - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\XXXXXXXX\Release"
+# PROP BASE Intermediate_Dir ".\XXXXXXXX\Release"
+# PROP BASE Target_Dir ".\XXXXXXXX"
+# 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 ".\XXXXXXXX"
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# 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"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "XXXXXXXX - Win32 Static Debug"
+# Name "XXXXXXXX - Win32 Static Release"
+# Name "XXXXXXXX - Win32 Release"
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index 628c9d5753a..62c7fa85c2e 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -439,244 +439,31 @@ sub check_for_mismatched_filename ()
     }
 }
 
-# check for bad run_test
-sub check_for_bad_run_test ()
+# check for 
+sub check_for_old_run_test ()
 {
-    print "Running run_test.pl test\n";
+    print "Running old run_test.pl test\n";
     foreach $file (@files_pl) {
         if (open (FILE, $file)) {
-            my $is_run_test = 0;
-            my $line = 0;
-            my $sub = 0;
-
-            print "Looking at file $file\n" if $opt_d;
-            
-            while (<FILE>) {
-                ++$line;
-
-                if (m/PerlACE/ || m/ACEutils/) {
-                    $is_run_test = 1;
-                }
-                
-                if ($is_run_test == 1) {
-                    if (m/ACEutils/) {
-                        print_error ("ACEutils.pm still being used in $file ($line)");
-                    }
-                    
-                    if (m/unshift \@INC/) {
-                        print_error ("Still unshifting \@INC, should \"use lib\""
-                                     ." instead in $file ($line)");
-                    }
-                    
-                    if (m/\$EXEPREFIX/) {
-                        print_error ("Still using \$EXEPREFIX in $file ($line)");
-                    }
-
-                    if (m/\$EXE_EXT/) {
-                        print_error ("Still using \$EXE_EXT in $file ($line)");
-                    }
-
-                    if (m/\$DIR_SEPARATOR/) {
-                        print_error ("Still using \$DIR_SEPARATOR in $file ($line)");
-                    }
-                    if (m/ACE\:\:/ && !m/PerlACE\:\:/) {
-                        print_error ("Still using ACE::* in $file ($line)");
-                    }
-
-                    if (m/Process\:\:/ && !m/PerlACE\:\:Process\:\:/) {
-                        print_error ("Still using Process::* in $file ($line)");
-                    }
-
-                    if (m/Process\:\:Create/) {
-                        print_error ("Still using Process::Create in $file ($line)");
-                    }
-                    
-                    if ((m/\.ior/ || m/\.conf/) && !m/LocalFile/) {
-                        print_error ("Not using PerlACE::LocalFile at $file ($line)");
-                    }
-
-                    if (m/^  [^ ]/) {
-                        print_warning ("Still using two-space indentation in $file ($line)");
-                    }
-
-                    if (m/^\s*\t/) {
-                        print_error ("Indenting using tabs in $file ($line)");
-                    }
-
-                    if (m/^\s*\{/ && $sub != 1) {
-                        print_warning ("Using Curly Brace alone on $file ($line)");
-                    }
-
-                    if (m/timedout/i && !m/\#/) {
-                        print_error ("timedout message found on $file ($line)");
-                    }
-
-                    if (m/^\s*sub/) {
-                        $sub = 1;
-                    }
-                    else {
-                        $sub = 0;
-                    }
-                }
-            }
-
-            close (FILE);
-
-            if ($is_run_test) {
-                my @output = `perl -wc $file 2>&1`;    
-
-                foreach $output (@output) {
-                    chomp $output;
-                    if ($output =~ m/error/i) {
-                        print_error ($output);
-                    }
-                    elsif ($output !~ m/syntax OK/) {
-                        print_warning ($output);
-                    }
-                }
-            }
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }
-}
-
-
-# Check for links to ~schmidt/ACE_wrappers/, which should not be in the
-# documentation
-sub check_for_absolute_ace_wrappers()
-{
-    print "Running absolute ACE_wrappers test\n";
-    foreach $file (@files_html) {
-        if (open (FILE, $file)) {
-            my $line = 0;
             print "Looking at file $file\n" if $opt_d;
             while (<FILE>) {
-                ++$line;
-                if (m/\~schmidt\/ACE_wrappers\//) {
-                    chomp;
-                    print_error ("~schmidt/ACE_wrappers found in $file on "
-                                 . "line $line");
-                    print_error ($_) if (defined $opt_v);
+                if (m/ACEutils/) {
+                    print_error ("ACEutils.pm still being used in $file");
                 }
-            }
-            close (FILE);
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }
-}
-
-# Make sure ACE_[OS_]TRACE matches the function/method
-sub check_for_bad_ace_trace()
-{
-    print "Running TRACE test\n";
-    foreach $file (@files_inl, @files_cpp) {
-        if (open (FILE, $file)) {
-            my $line = 0;
-            my $class;
-            my $function;
-
-            print "Looking at file $file\n" if $opt_d;
-            while (<FILE>) {
-                ++$line;
                 
-                # look for methods or functions
-                if (m/(^[^\s][^\(]*)\:\:([^\:^\(]*[^\s^\(])\s*/) {
-                    $class = $1;
-                    $function = $2;
-                }
-                elsif (m/^([^\s^\(^\#]*) \(/i) {
-                    $class = "";
-                    $function = $1;
-                }
-                elsif (m/^(operator.*) \(/i) {
-                    $class = "";
-                    $function = $1;
+                if (m/unshift \@INC/) {
+                    print_error ("Still unshifting \@INC, should \"use lib\""
+                                 ." instead in $file");
                 }
                 
-                # Look for TRACE statements
-                if (m/ACE_OS_TRACE\s*\(\s*\"(.*)\"/
-                    || m/ACE_TRACE\s*\(\s*\"(.*)\"/) {
-                    my $trace = $1;
-                    
-                    # reduce the classname 
-                    if ($class =~ m/([^\s][^\<^\s]*)\s*\</) {
-                        $class = $1;
-                    }
-                    
-                    if ($class =~ m/([^\s^\&^\*]*)\s*$/) {
-                        $class = $1;
-                    }
-                    
-                    if ($trace !~ m/\Q$function\E/
-                        || ($trace =~ m/\:\:/ && !($trace =~ m/\Q$class\E/ && $trace =~ m/\Q$function\E/))) {
-                        print_error ("Mismatched TRACE in $file on line $line");
-                        print_error ("   I see \"$trace\" but I think I'm in \"" 
-                                     . $class . "::" . $function . "\"") if (defined $opt_v);
-                    }
+                if (m/ACE\:\:/ && !m/PerlACE\:\:/) {
+                    print_error ("Still using ACE::* in $file");
                 }
-            }
-            close (FILE);
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }
-}
-
-
 
-# This test checks missing ACE_TRY_ENV when using 
-# resolve_initial_references
-sub check_for_missing_rir_env ()
-{
-    print "Running resolve_inital_references() check\n";
-    foreach $file (@files_cpp, @files_inl) {
-        my $line = 0;
-        if (open (FILE, $file)) {
-            my $disable = 0;
-            my $native_try = 0;
-            my $in_rir = 0;
-            my $found_env = 0;
-
-            print "Looking at file $file\n" if $opt_d;
-            while (<FILE>) {
-                ++$line;
-                if (/FUZZ\: disable check_for_missing_rir_env/) {
-                    $disable = 1;
+                if (m/Process\:\:/ && !m/PerlACE\:\:Process\:\:/) {
+                    print_error ("Still using Process::* in $file");
                 }
-                if (/FUZZ\: enable check_for_missing_rir_env/) {
-                    $disable = 0;
-                }
-                if ($disable == 0) {
-                    if (m/try\s*\{/) {
-                        $disable = 1;
-                        next;
-                    }
 
-                    if (m/resolve_initial_references\s*\(/) {
-                        $found_env = 0;
-                        $in_rir = 1;
-                    }
-
-                    if (m/ACE_TRY_ENV/) {
-                        $found_env = 1;
-                    }
-
-                    if ($in_rir == 1 && m/\;\s*$/) {
-                        $in_rir = 0;
-                        if ($found_env != 1) {
-                            print_error ("Missing ACE_TRY_ENV in"
-					 . " resolve_initial_references"
-                                         . " in $file ($line)");
-                        }
-                        $found_env = 0;
-                    }
-                    
-                }
             }
             close (FILE);
         }
@@ -686,13 +473,11 @@ sub check_for_missing_rir_env ()
     }
 }
 
-
-
 ##############################################################################
 
-#our ($opt_c, $opt_d, $opt_h, $opt_l, $opt_m, $opt_v);
+#our ($opt_c, $opt_d, $opt_h, $opt_l, $opt_m);
 
-if (!getopts ('cdhl:mv') || $opt_h) {
+if (!getopts ('cdhl:m') || $opt_h) {
     print "fuzz.pl [-cdhm] [-l level] [file1, file2, ...]\n";
     print "\n";
     print "    -c         only look at the files passed in\n";
@@ -700,7 +485,6 @@ if (!getopts ('cdhl:mv') || $opt_h) {
     print "    -h         display this help\n";
     print "    -l level   set detection level (default = 5)\n";
     print "    -m         only check locally modified files (uses cvs)\n";
-    print "    -v         verbose mode\n";
     exit (1);
 }
 
@@ -733,10 +517,7 @@ check_for_preprocessor_comments () if ($opt_l >= 7);
 check_for_tchar () if ($opt_l >= 4);
 check_for_pre_and_post () if ($opt_l >= 4);
 check_for_mismatched_filename () if ($opt_l >= 2);
-check_for_bad_run_test () if ($opt_l >= 6);
-check_for_absolute_ace_wrappers () if ($opt_l >= 3);
-check_for_bad_ace_trace () if ($opt_l >= 4);
-check_for_missing_rir_env () if ($opt_l >= 5);
+check_for_old_run_test () if ($opt_l >= 6);
 
 print "\nFuzz.pl - $errors error(s), $warnings warning(s)\n";
 
diff --git a/bin/generate_export_file.pl b/bin/generate_export_file.pl
index 54567889de7..f5bcaf08ba6 100755
--- a/bin/generate_export_file.pl
+++ b/bin/generate_export_file.pl
@@ -18,12 +18,12 @@ if (!getopts ('df:hs') || $opt_h) {
     print "\n";
     print "    -d         Turn on debug mode\n";
     print "    -f         Adds a dependency to another *_HAS_DLL macro\n";
-    print "    -s         Add in ACE_AS_STATIC_LIBS check\n";
+    print "    -s         Add in ACE_STATIC_LIBS check\n";
     print "\n";
     print "generate_export_file creates the *_export files that are used\n";
     print "in exporting of symbols for DLLs (and not exporting them when\n";
     print "the library is static).  If library_name is something like\n";
-    print "\"Foo\", then the file will contain definitions for Foo_Export\n";
+    print "\"Foo\", then the file will contain definitions for Foo_Export\n"; 
     print "and FOO_SINGLETON_DECLARE, etc. which will be controlled by\n";
     print "FOO_HAS_DLL, etc.\n";
     exit (1);
@@ -37,7 +37,7 @@ if (defined $opt_d) {
     }
 
     if (defined $opt_s) {
-        print "ACE_AS_STATIC_LIBS turned on\n";
+        print "ACE_STATIC_LIBS turned on\n"; 
     }
 }
 
@@ -72,9 +72,9 @@ $prologue = '
 if (defined $opt_s)
 {
     $static_stuff = "
-#if defined (ACE_AS_STATIC_LIBS) && !defined (-UC-_HAS_DLL)
+#if defined (ACE_STATIC_LIBS) && !defined (-UC-_HAS_DLL)
 #  define -UC-_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && -UC-_HAS_DLL */
+#endif /* ACE_STATIC_LIBS && -UC-_HAS_DLL */
 ";
 }
 
diff --git a/bin/msvc_auto_compile.pl b/bin/msvc_auto_compile.pl
index 48a222d486f..4630cd2f0a2 100755
--- a/bin/msvc_auto_compile.pl
+++ b/bin/msvc_auto_compile.pl
@@ -149,6 +149,7 @@ sub Build_Core ()
     }
     if ($Build_LIB) {
         @core_list = ($ACE_ROOT."\\ace\\ace_lib.dsp",
+                      $ACE_ROOT."\\apps\\gperf\\src\\gperf_lib.dsp",
                       $ACE_ROOT."\\apps\\gperf\\src\\gperf.dsp",
                       $ACE_ROOT."\\TAO\\TAO_IDL\\TAO_IDL_BE_LIB.dsp",
                       $ACE_ROOT."\\TAO\\TAO_IDL\\TAO_IDL_FE_LIB.dsp",
diff --git a/bin/nightlybuilds/builds.lst b/bin/nightlybuilds/builds.lst
index bcad5389aee..dadd6a33116 100644
--- a/bin/nightlybuilds/builds.lst
+++ b/bin/nightlybuilds/builds.lst
@@ -54,11 +54,6 @@ TYPE = TIMEONLY
 LIST = http://ringil.ece.uci.edu/bugzilla/legacy/
 WEB  = http://ringil.ece.uci.edu/scripts/show_log_dir.pl?legacy
 
-[WinCE_All]
-TYPE = TIMEONLY
-LIST = http://ringil.ece.uci.edu/bugzilla/wince/
-WEB  = http://ringil.ece.uci.edu/scripts/show_log_dir.pl?wince
-
 [Debian_KCC]
 TYPE = TIMEONLY
 LIST = http://doc.ece.uci.edu/~bugzilla/auto_compile_logs/doc_KCC/
@@ -134,16 +129,6 @@ TYPE = TIMEONLY
 LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/ace_VXWORKS_GCC/
 WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?ace_VXWORKS_GCC
 
-[VxWorks_5.4_GCC]
-TYPE = TIMEONLY
-LIST = http://prince.ociweb.com/buildlogs/auto_compile_logs/krusty_VXWORKS_GCC/
-WEB  = http://prince.ociweb.com/buildlogs/show_log_dir.cgi?krusty_VXWORKS_GCC
-
-[Chorus_4.0.1_GCC]
-TYPE = TIMEONLY
-LIST = http://prince.ociweb.com/buildlogs/auto_compile_logs/lisa_CHORUS_4_0_1_GCC/
-WEB  = http://prince.ociweb.com/buildlogs/show_log_dir.cgi?lisa_CHORUS_4_0_1_GCC
-
 [Lynx_I386]
 TYPE = TIMEONLY
 LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/danzon_LYNX_I386/
@@ -169,17 +154,7 @@ TYPE = TIMEONLY
 LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/beguine_Core/
 WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?beguine_Core
 
-[RedHat_7.0_No_AMI_Messaging]
-TYPE = TIMEONLY
-LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/beguine_No_AMI_Messaging/
-WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?beguine_No_AMI_Messaging
-
-[Debian_Full_WU]
+[WU_Debian_Full]
 TYPE = TIMEONLY
 LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/charanga_Full/
 WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?charanga_Full
-
-[Debian_Minimum_Static]
-TYPE = TIMEONLY
-LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/charanga_Minimum/
-WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?charanga_Minimum
diff --git a/bin/nightlybuilds/scoreboard_update.pl b/bin/nightlybuilds/scoreboard_update.pl
index 086240b39e6..17209780190 100755
--- a/bin/nightlybuilds/scoreboard_update.pl
+++ b/bin/nightlybuilds/scoreboard_update.pl
@@ -651,7 +651,7 @@ sub update_html ($$)
 our ($opt_c, $opt_h, $opt_o, $opt_m);
 
 if (!getopts ('c:hm:ro:') || defined $opt_h) {
-    print "scoreboard_update.pl [-c file] [-h] [-o dir] [-m script]\n";
+    print "bugzilla_make_pretty.pl [-c file] [-h] [-o dir] [-m script]\n";
     print "\n";
     print "  input        input directory\n";
     print "  output       output directory\n";
diff --git a/bin/pippen.pl b/bin/pippen.pl
deleted file mode 100755
index cecedc92ce5..00000000000
--- a/bin/pippen.pl
+++ /dev/null
@@ -1,402 +0,0 @@
-# $Id$
-
-BEGIN {
-    use Cwd;
-    if (!$ENV{ACE_ROOT}) {
-        $ACE_ROOT = getcwd ()."\\";
-        print STDERR "Error: ACE_ROOT not defined\n";
-        exit 1;
-    }
-    else {
-        $ACE_ROOT = $ENV{ACE_ROOT};
-    }
-}
-use lib "$ACE_ROOT/bin";
-use PerlACE::MSProject::DSP;
-use PerlACE::MSProject::VCP;
-use File::DosGlob 'glob';
-use DirHandle;
-use strict;
-
-################################################################################
-
-my $extension;
-my $recurse = 0;
-my $list = 0;
-my $verbose = 0;
-my @arguments;
-my @configs;
-my @roots;
-my $auto_compile = 0;
-my $clean = 0;
-my $debug = 0;
-
-my $aceroot = 0;
-
-################################################################################
-
-# Parse command line arguments
-
-while ( $#ARGV >= 0)
-{
-    if ($ARGV[0] =~ m/^-list/i) {
-        $list = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-evc3/i) {
-        $extension = "vcp";
-    }    
-    elsif ($ARGV[0] =~ m/^-msvc6/i) {
-        $extension = "dsp";
-    }    
-    elsif ($ARGV[0] =~ m/^-msvc7/i) {
-        $extension = "vcproj";
-    }    
-    elsif ($ARGV[0] =~ m/^-config/i) {
-        push @configs, $ARGV[1];
-        shift; 
-    }    
-    elsif ($ARGV[0] =~ m/^-r/i) {
-        $recurse = 1;
-    }    
-    elsif ($ARGV[0] =~ m/^-v/i) {
-        $verbose = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-auto_compile/i) {
-        $auto_compile = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-clean/i) {
-        $clean = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-useroot/i) {
-        push @roots, $ARGV[1];
-        shift; 
-    }
-    elsif ($ARGV[0] =~ m/^-aceroot/i) {
-        $aceroot = 1;
-    }
-    elsif ($ARGV[0] =~ m/^-(\?|h)/i) {     # Help information
-        print "Options\n";
-        print "-list          - Prints out the list of project files\n";
-        print "-config <c>    - Use <c> as a configuratoin\n";
-        print "-evc3          - Looks for eMbedded Visual C++ 3.0 projects\n";
-        print "-msvc6         - Looks for Visual C++ 5.0/6.0 projects\n";
-        print "-msvc7         - Looks for Visual C++ 7.0 projects\n";
-        print "-clean         - Clean instead of building\n";
-        print "-recurse       - Recurse into directories\n";
-        print "-verbose       - Make some noise\n";
-        print "-auto_compile  - Print out auto_compile info during build\n";
-        print "-useroot <dir> - Use <dir> as a root to look for dependencies\n";
-        print "-aceroot       - Use %ACE_ROOT% as a dependency root\n";
-        exit;
-    }
-    elsif ($ARGV[0] =~ m/^-/) {
-        warn "$0:  unknown option $ARGV[0]\n";
-        exit 1;
-    }
-    else {
-        push @arguments, $ARGV[0];
-    }
-    shift;
-}
- 
-if (!defined @configs) {
-    if (!defined $ENV{DEFAULT_CONFIGS}) {
-        print STDERR "Error: No config specified\n";
-        exit 1;
-    }
-
-    @configs = split /:/, $ENV{DEFAULT_CONFIGS};
-}
-
-if (!defined $extension) {
-    if (!defined $ENV{DEFAULT_COMPILER}) {
-        print STDERR "Error: No compiler specified\n";
-        exit 1;
-    }
-    
-    if ($ENV{DEFAULT_COMPILER} eq "evc3") {
-        $extension = "vcp";
-    }
-    elsif ($ENV{DEFAULT_COMPILER} eq "msvc6") {
-        $extension = "dsp";
-    }
-    elsif ($ENV{DEFAULT_COMPILER} eq "msvc7") {
-        $extension = "vcproj";
-    }
-}
-
-################################################################################
-
-# I like these variables
-
-# %projects->{$file}->{BUILD} <- Are we supposed to build this file?
-#                   ->{PROJ} <- MSProject object
-#                   ->{CONFIGS}->{$config}->{DEPS} <- List of dependencies
-#                                         ->{DONE} <- Have we compiled it yet?
-
-my %projects;
-
-# %names->{$output} <- points to the $file used in the above %projects
-
-my %names;
-
-################################################################################
-
-# Expand all the files/directories passed in on the command line
-
-sub ProjectSearch ($@)
-{
-    my $build = shift;
-    my @targets = @_;
-
-    while ($#targets >= 0) { 
-        my $target = $targets[0];
-        if (-d $target) {
-            print "    Reading Directory $target\n" if ($verbose);
-            if ($recurse) {
-                my $dh = new DirHandle ($target);
-                
-                if (defined $dh) {
-                    foreach my $entry ($dh->read ()) {
-                        if (-d "$target/$entry" && $entry ne "." && $entry ne "..") {
-                            $entry =~ s/^.\\//; # / <- fix for color coding in devenv
-                            push @targets, ($target . "\\". $entry);
-                        }
-                    }
-                }
-                else {
-                    print STDERR "Error: Cannot read $target: $!\n";
-                }
-            }
-            
-            foreach my $t (glob ($target . "\\*." . $extension)) {
-                print "    Adding project $t\n" if ($verbose);
-                %projects->{$t}->{BUILD} = $build;
-            }
-        }
-        else {
-            foreach my $t (glob ($target)) {
-                print "    Adding project $t\n" if ($verbose);
-                %projects->{$t}->{BUILD} = $build;
-            }
-        }
-        shift @targets;
-    }
-}
-
-print "=== Expanding Command line Arguments\n" if ($verbose);
-
-if ($#arguments < 0) {
-    print "    No files specified, defaulting to \".\"\n" if ($verbose);
-    push @arguments, (".");
-}
-
-ProjectSearch (1, @arguments);
-
-print "=== Expanding Root Arguments\n" if ($verbose);
-
-ProjectSearch (0, @roots);
-
-if ($aceroot == 1) {
-    my $oldrecurse = $recurse;
-    $recurse = 1;
-    my @aceroots = ($ENV{ACE_ROOT}."\\ace",
-                    $ENV{ACE_ROOT}."\\apps\\gperf\\src",
-                    $ENV{ACE_ROOT}."\\TAO\\TAO_IDL",
-                    $ENV{ACE_ROOT}."\\TAO\\tao",
-                    $ENV{ACE_ROOT}."\\TAO\\orbsvcs\\orbsvcs");
-    ProjectSearch (0, @aceroots);
-    $recurse = $oldrecurse;
-}
-
-################################################################################
-
-# Read each project file to gather dependency and output information
-
-print "=== Reading Project Files\n" if ($verbose);
-
-foreach my $project (keys %projects) {
-    my $proj;
-    
-    if ($project =~ m/\.dsp$/i) {
-        $proj = new PerlACE::MSProject::DSP ($project);
-    }
-    elsif ($project =~ m/\.vcp$/i) {
-        $proj = new PerlACE::MSProject::VCP ($project);
-    }
-    elsif ($project =~ m/\.vcproj$/i) {
-        print STDERR "Error: MSVC7 not supported yet\n";
-    }
-    else {
-        print STDERR "Error: Unrecognized file: $project\n";
-    }
-
-    print "    Loading $project:" if ($verbose);
-    
-    $proj->Load ();
-    
-    foreach my $config (@configs) {
-        foreach my $proj_config ($proj->Configs ()) {
-            if ($proj_config =~ m/$config/i) {
-                print " \"$proj_config\"" if ($verbose);
-                my $name = $proj->DepOutputFile ($proj_config);
-                           
-                %names->{$name} = $project;
-                @{%projects->{$project}->{CONFIGS}->{$proj_config}->{DEPS}} = split / /, $proj->Libs ($proj_config);
-                
-                if ($proj->UsesTAOIDL () == 1) {
-                    push @{%projects->{$project}->{CONFIGS}->{$proj_config}->{DEPS}}, ("gperf.exe", "tao_idl.exe");
-                }
-            }
-        }
-    }
-    
-    print "\n" if ($verbose);
-
-    %projects->{$project}->{PROJ} = $proj;
-}
-
-################################################################################
-
-# Clean out the dependency lists, we only keep the libraries which we know
-# how to generate
-
-print "=== Cleaning out Dependency Lists\n" if ($verbose);
-
-foreach my $project (keys %projects) {
-    foreach my $config (keys %{%projects->{$project}->{CONFIGS}}) {
-        print "    Cleaning Dependencies: $project ($config)\n" if ($verbose);
-        print "        Before:", join (" ", @{%projects->{$project}->{CONFIGS}->{$config}->{DEPS}}), "\n" if ($verbose);
-        my @newdeps;
-        foreach my $dep (@{%projects->{$project}->{CONFIGS}->{$config}->{DEPS}}) {
-            if (defined %names->{$dep}) {
-                push @newdeps, $dep;
-            }
-        }
-        print "        After:", join (" ", @newdeps), "\n" if ($verbose);
-        @{%projects->{$project}->{CONFIGS}->{$config}->{DEPS}} = @newdeps;
-    }
-}
-
-################################################################################
-
-# Make sure to build any dependencies found
-
-print "=== Walking Dependency Lists\n" if ($verbose);
-
-my $finished = 0;
-
-do {
-    $finished = 1;
-    foreach my $project (keys %projects) {
-        foreach my $config (keys %{%projects->{$project}->{CONFIGS}}) {
-            if (%projects->{$project}->{BUILD} == 1) {
-                foreach my $dep (@{%projects->{$project}->{CONFIGS}->{$config}->{DEPS}}) {
-                    if (%projects->{%names->{$dep}}->{BUILD} != 1) {
-                        %projects->{%names->{$dep}}->{BUILD} = 1;
-                        $finished = 0;
-                    }
-                }
-            }
-        }
-    }
-    
-} while (!$finished);
-
-
-################################################################################
-
-# Output a list, if requested
-
-if ($debug) {
-    print "List of Dependencies\n";
-    print "--------------------\n";
-    foreach my $project (keys %projects) {
-        print "=== $project\n";
-        foreach my $config (keys %{%projects->{$project}->{CONFIGS}}) {
-            print "    Config: $config\n";
-            print "        Depends: ", join (" ", @{%projects->{$project}->{CONFIGS}->{$config}->{DEPS}}), "\n";
-        }
-    }
-    
-    print "\n";
-    print "List of Outputs\n";
-    print "---------------\n";
-    
-    foreach my $name (keys %names) {
-        print "$name\n";
-    }
-}
-
-################################################################################
-
-# Loop through and 
-
-print "=== Compiling\n" if ($verbose);
-
-my $compilations;  # Keep track of the number of compiles done during a pass
-my $unfinished;
-my $loop = 1;
-
-do {
-    $compilations = 0;
-    $unfinished = 0;
-    
-    foreach my $project (keys %projects) {
-        if (%projects->{$project}->{BUILD} == 1) {
-            foreach my $config (keys %{%projects->{$project}->{CONFIGS}}) {
-                if (%projects->{$project}->{CONFIGS}->{$config}->{DONE} != 1) {
-                    my $depsleft = 0;
-                    foreach my $dep (@{%projects->{$project}->{CONFIGS}->{$config}->{DEPS}}) {
-                        if (%projects->{%names->{$dep}}->{CONFIGS}->{$config}->{DONE} != 1) {
-                            ++$depsleft;
-                        }
-                    }
-                    
-                    if ($depsleft == 0) {
-                        ++$compilations;
-                        print "Auto_compiling $project : $config\n" if ($auto_compile);
-                        
-                        if ($list == 1) {
-                            if ($clean == 1) {
-                                print "Cleaning ";
-                            } 
-                            else {
-                                print "Compiling ";
-                            }
-
-                            print "$project : $config\n";
-                        }
-                        elsif ($clean == 1) {
-                            %projects->{$project}->{PROJ}->Clean ($config);
-                        }
-                        else {
-                            %projects->{$project}->{PROJ}->Build ($config);
-                        }
-
-                        %projects->{$project}->{CONFIGS}->{$config}->{DONE} = 1;
-                    }
-                    else {
-                        ++$unfinished;
-                    }
-                }
-            }
-        }
-    }
-    
-    print "    === Loop $loop: $compilations compiles, $unfinished left\n" if ($verbose);
-    ++$loop;
-} while ($compilations != 0);
-
-# Loop through and see if anything wasn't compiled.  If so, this means either there is
-# an error in the script or that there are circular dependencies
-
-foreach my $project (keys %projects) {
-    if (%projects->{$project}->{BUILD} == 1) {
-        foreach my $config (keys %{%projects->{$project}->{CONFIGS}}) {
-            if (%projects->{$project}->{CONFIGS}->{$config}->{DONE} != 1) {
-                print STDERR "Error: Project not compiled: $project - $config\n",
-            }
-        }
-    }        
-}
diff --git a/bin/run_all_list.pm b/bin/run_all_list.pm
new file mode 100644
index 00000000000..20766fa2926
--- /dev/null
+++ b/bin/run_all_list.pm
@@ -0,0 +1,329 @@
+# -*- perl -*-
+# $Id$
+#
+# WARNING: This file is no longer used by the auto_compile script.  It
+# has been left here for backwards compatibility and because some
+# other scripts still use it.  If you want to add tests to the nightly
+# builds please use auto_run_tests.lst
+#
+# This are the pairs "sub-directory , script" we
+# run; the separator *must* be a space followed by a comma and then
+# another space.
+
+$ace_tests = 'tests , run_tests.pl';
+if ($^O eq "MSWin32") {
+  $ace_tests = 'tests , run_tests.bat';
+}
+
+@RUN_LIST =
+    ( $ace_tests,
+      'TAO/tests/Param_Test , run_test.pl',
+      'TAO/tests/Param_Test , run_test.pl -i dii',
+      'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl',
+      'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100',
+      'TAO/performance-tests/Latency , run_test.pl',
+      'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl',
+      'TAO/performance-tests/RTCorba/Oneways/Reliable , run_test.pl',
+      'TAO/tests/OctetSeq , run_test.pl',
+      'TAO/tests/Leader_Followers , run_test.pl',
+      'TAO/tests/Multiple_Inheritance , run_test.pl',
+#HANGS     'TAO/tests/Endpoint_Per_Priority, run_test.pl',
+      'TAO/tests/MT_Client , run_test.pl',
+      'TAO/tests/MT_Server , run_test.pl',
+      'TAO/tests/Faults , run_test.pl',
+      'TAO/tests/BiDirectional , run_test.pl',
+      'TAO/tests/BiDirectional_NestedUpcall , run_test.pl',
+      'TAO/tests/NestedUpcall/Simple , run_test.pl',
+      'TAO/tests/NestedUpcall/MT_Client_Test , run_test.pl',
+      'TAO/tests/NestedUpcall/Triangle_Test , run_test.pl',
+      'TAO/tests/Nested_Event_Loop , run_test.pl',
+      'TAO/tests/POA/Identity , run_test.pl',
+      'TAO/tests/POA/Deactivation , run_test.pl',
+      'TAO/tests/POA/Destruction , run_test.pl',
+      'TAO/tests/POA/wait_for_completion , run_test.pl',
+      'TAO/tests/POA/Non_Servant_Upcalls , run_test.pl',
+      'TAO/tests/IORManipulation , run_test.pl',
+      'TAO/tests/Policies , run_test.pl',
+      'TAO/tests/Timeout , run_test.pl',
+      'TAO/tests/Timed_Buffered_Oneways , run_test.pl',
+      'TAO/tests/IDL_Test , run_test.pl',
+      'TAO/tests/ORB_init , run_test.pl',
+      'TAO/tests/ORB_destroy , run_test.pl',
+      'TAO/tests/DSI_Gateway , run_test.pl',
+      'TAO/tests/DynAny_Test , run_test.pl',
+# NEEDS FIX      'TAO/tests/Connection_Purging , run_test.pl',
+      'TAO/tests/LongUpcalls , run_test.pl',
+      'TAO/examples/Buffered_Oneways , run_test.pl',
+# REQUIRES AMI 'TAO/examples/Buffered_AMI , run_test.pl',
+      'TAO/tests/InterOp-Naming , run_test.pl',
+      'TAO/tests/RTCORBA/Client_Propagated , run_test.pl',
+      'TAO/tests/RTCORBA/Server_Protocol , run_test.pl',
+      'TAO/tests/RTCORBA/RTMutex , run_test.pl',
+      'TAO/examples/POA/Adapter_Activator , run_test.pl',
+      'TAO/examples/POA/DSI , run_test.pl',
+      'TAO/examples/POA/Default_Servant , run_test.pl',
+      'TAO/examples/POA/Explicit_Activation , run_test.pl',
+      'TAO/examples/POA/FindPOA , run_test.pl',
+      'TAO/examples/POA/Forwarding , run_test.pl',
+      'TAO/examples/POA/NewPOA , run_test.pl',
+      'TAO/examples/POA/On_Demand_Activation , run_test.pl',
+      'TAO/examples/POA/On_Demand_Loading , run_test.pl',
+      'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
+      'TAO/examples/POA/Loader , run_test.pl',
+      'TAO/examples/POA/RootPOA , run_test.pl',
+      'TAO/examples/POA/Adapter_Activator , run_test.pl',
+      'TAO/examples/Simple/bank , run_test.pl',
+      'TAO/examples/Simple/grid , run_test.pl',
+      'TAO/examples/Simple/time-date , run_test.pl',
+      'TAO/examples/Simple/time , run_test.pl',
+      'TAO/examples/Load_Balancing , run_test.pl',
+      'TAO/orbsvcs/tests/Simple_Naming , run_test.pl',
+      'TAO/orbsvcs/tests/Trading , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Basic , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Performance , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Basic , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Custom_Marshal , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Throughput , run_test.pl',
+# BREAKS LINUX 'TAO/orbsvcs/tests/EC_Mcast , run_test.pl',
+# FAILS 'TAO/orbsvcs/tests/EC_Multiple , run_test.pl',
+      'TAO/orbsvcs/tests/Event_Latency , run_test.pl',
+      'TAO/examples/Simple/echo , run_test.pl < Echo.idl',
+# INTERACTIVE 'TAO/examples/Simple/chat , run_test.pl',
+      'TAO/orbsvcs/tests/Property , run_test.pl',
+#HANGS'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
+#HANGS'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
+      'TAO/tests/Exposed_Policies, run_test.pl',
+    );
+
+@MINIMUM_CORBA_LIST =
+    ( $ace_tests,
+# NOT MINIMUM 'TAO/tests/Param_Test , run_test.pl',
+# NOT MINIMUM 'TAO/tests/Param_Test , run_test.pl -i dii',
+# NOT MINIMUM 'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl',
+      'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100',
+# NOT MINIMUM 'TAO/performance-tests/Latency , run_test.pl',
+      'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl',
+# NOT MINIMUM 'TAO/performance-tests/RTCorba/Oneways/Reliable , run_test.pl',
+      'TAO/tests/OctetSeq , run_test.pl',
+      'TAO/tests/Leader_Followers , run_test.pl',
+      'TAO/tests/Multiple_Inheritance , run_test.pl',
+#HANGS     'TAO/tests/Endpoint_Per_Priority, run_test.pl',
+      'TAO/tests/MT_Client , run_test.pl',
+      'TAO/tests/MT_Server , run_test.pl',
+# NOT MINIMUM 'TAO/tests/Faults , run_test.pl',
+      'TAO/tests/NestedUpcall/Simple , run_test.pl',
+      'TAO/tests/NestedUpcall/MT_Client_Test , run_test.pl',
+      'TAO/tests/NestedUpcall/Triangle_Test , run_test.pl',
+      'TAO/tests/BiDirectional , run_test.pl',
+      'TAO/tests/BiDirectional_NestedUpcall , run_test.pl',
+      'TAO/tests/Nested_Event_Loop , run_test.pl',
+      'TAO/tests/POA/Identity , run_test.pl',
+      'TAO/tests/POA/Deactivation , run_test.pl',
+      'TAO/tests/POA/Destruction , run_test.pl',
+      'TAO/tests/POA/wait_for_completion , run_test.pl',
+      'TAO/tests/POA/Non_Servant_Upcalls , run_test.pl',
+      'TAO/tests/IORManipulation , run_test.pl',
+# NOT MINIMUM 'TAO/tests/Policies , run_test.pl',
+# NOT MINIMUM 'TAO/tests/Timeout , run_test.pl',
+# NOT MINIMUM 'TAO/tests/Timed_Buffered_Oneways , run_test.pl',
+      'TAO/tests/IDL_Test , run_test.pl',
+      'TAO/tests/ORB_init , run_test.pl',
+      'TAO/tests/ORB_destroy , run_test.pl',
+# NOT MINIMUM 'TAO/tests/DSI_Gateway , run_test.pl',
+# NOT MINIMUM 'TAO/tests/DynAny_Test , run_test.pl',
+# NEED FIX      'TAO/tests/Connection_Purging , run_test.pl',
+      'TAO/tests/LongUpcalls , run_test.pl',
+# NOT MINIMUM 'TAO/examples/Buffered_Oneways , run_test.pl',
+# NOT MINIMUM 'TAO/examples/Buffered_AMI , run_test.pl',
+# NOT MINIMUM 'TAO/tests/InterOp-Naming , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/Adapter_Activator , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/DSI , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/Default_Servant , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/Explicit_Activation , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/FindPOA , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/Forwarding , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/NewPOA , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/On_Demand_Activation , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/On_Demand_Loading , run_test.pl',
+      'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/Loader , run_test.pl',
+      'TAO/examples/POA/RootPOA , run_test.pl',
+# NOT MINIMUM 'TAO/examples/POA/Adapter_Activator , run_test.pl',
+      'TAO/examples/Simple/bank , run_test.pl',
+      'TAO/examples/Simple/grid , run_test.pl',
+      'TAO/examples/Simple/time-date , run_test.pl',
+      'TAO/examples/Simple/time , run_test.pl',
+# NOT MINIMUM 'TAO/examples/Load_Balancing , run_test.pl',
+      'TAO/orbsvcs/tests/Simple_Naming , run_test.pl',
+      'TAO/orbsvcs/tests/Trading , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Basic , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Performance , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Basic , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Custom_Marshal , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Throughput , run_test.pl',
+# BREAKS LINUX 'TAO/orbsvcs/tests/EC_Mcast , run_test.pl',
+# FAILS 'TAO/orbsvcs/tests/EC_Multiple , run_test.pl',
+      'TAO/orbsvcs/tests/Event_Latency , run_test.pl',
+      'TAO/examples/Simple/echo , run_test.pl < Echo.idl',
+# INTERACTIVE 'TAO/examples/Simple/chat , run_test.pl',
+      'TAO/orbsvcs/tests/Property , run_test.pl',
+# FAILS 'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
+# FAILS 'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
+    );
+
+@SINGLE_THREADED_LIST =
+    ( $ace_tests,
+      'TAO/tests/Param_Test , run_test.pl',
+      'TAO/tests/Param_Test , run_test.pl -i dii',
+# NOT ST 'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl',
+# NOT ST 'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100'
+# NOT ST 'TAO/performance-tests/Latency , run_test.pl',
+      'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl',
+      'TAO/performance-tests/RTCorba/Oneways/Reliable , run_test.pl',
+      'TAO/tests/OctetSeq , run_test.pl',
+# NOT ST 'TAO/tests/Leader_Followers , run_test.pl',
+      'TAO/tests/Multiple_Inheritance , run_test.pl',
+# NOT ST 'TAO/tests/MT_Client , run_test.pl',
+# NOT ST 'TAO/tests/MT_Server , run_test.pl',
+      'TAO/tests/Faults , run_test.pl',
+# NOT ST 'TAO/tests/NestedUpcall/Simple , run_test.pl',
+      'TAO/tests/NestedUpcall/MT_Client_Test , run_test.pl',
+      'TAO/tests/NestedUpcall/Triangle_Test , run_test.pl',
+      'TAO/tests/Nested_Event_Loop , run_test.pl',
+      'TAO/tests/POA/Identity , run_test.pl',
+      'TAO/tests/POA/Deactivation , run_test.pl',
+      'TAO/tests/POA/Destruction , run_test.pl',
+      'TAO/tests/POA/wait_for_completion , run_test.pl',
+      'TAO/tests/POA/Non_Servant_Upcalls , run_test.pl',
+      'TAO/tests/IORManipulation , run_test.pl',
+      'TAO/tests/BiDirectional , run_test.pl',
+      'TAO/tests/BiDirectional_NestedUpcall , run_test.pl',
+# NOT ST 'TAO/tests/Policies , run_test.pl',
+      'TAO/tests/Timeout , run_test.pl',
+      'TAO/tests/Timed_Buffered_Oneways , run_test.pl',
+      'TAO/tests/ORB_init , run_test.pl',
+      'TAO/tests/ORB_destroy , run_test.pl',
+      'TAO/tests/DSI_Gateway , run_test.pl',
+      'TAO/tests/DynAny_Test , run_test.pl',
+# NOT ST 'TAO/tests/Connection_Purging , run_test.pl',
+      'TAO/tests/LongUpcalls , run_test.pl',
+      'TAO/examples/Buffered_Oneways , run_test.pl',
+# REQUIRES AMI 'TAO/examples/Buffered_AMI , run_test.pl',
+      'TAO/examples/POA/Adapter_Activator , run_test.pl',
+      'TAO/examples/POA/DSI , run_test.pl',
+      'TAO/examples/POA/Default_Servant , run_test.pl',
+      'TAO/examples/POA/Explicit_Activation , run_test.pl',
+      'TAO/examples/POA/FindPOA , run_test.pl',
+      'TAO/examples/POA/Forwarding , run_test.pl',
+      'TAO/examples/POA/NewPOA , run_test.pl',
+      'TAO/examples/POA/On_Demand_Activation , run_test.pl',
+      'TAO/examples/POA/On_Demand_Loading , run_test.pl',
+      'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
+      'TAO/examples/POA/Loader , run_test.pl',
+      'TAO/examples/POA/RootPOA , run_test.pl',
+      'TAO/examples/POA/Adapter_Activator , run_test.pl',
+      'TAO/examples/Simple/bank , run_test.pl',
+      'TAO/examples/Simple/grid , run_test.pl',
+# NOT ST 'TAO/examples/Simple/time-date , run_test.pl',
+      'TAO/examples/Simple/time , run_test.pl',
+      'TAO/orbsvcs/tests/Simple_Naming , run_test.pl',
+      'TAO/orbsvcs/tests/Trading , run_test.pl',
+# NOT ST 'TAO/orbsvcs/tests/Event/Basic , run_test.pl',
+# NOT ST 'TAO/orbsvcs/tests/Event/Performance , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Basic , run_test.pl',
+# NOT ST 'TAO/orbsvcs/tests/EC_Custom_Marshal , run_test.pl',
+# NOT ST 'TAO/orbsvcs/tests/EC_Throughput , run_test.pl',
+# BREAKS LINUX 'TAO/orbsvcs/tests/EC_Mcast , run_test.pl',
+# FAILS 'TAO/orbsvcs/tests/EC_Multiple , run_test.pl',
+      'TAO/orbsvcs/tests/Event_Latency , run_test.pl',
+      'TAO/examples/Simple/echo , run_test.pl < Echo.idl',
+# INTERACTIVE 'TAO/examples/Simple/chat , run_test.pl',
+      'TAO/orbsvcs/tests/Property , run_test.pl',
+# FAILS 'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
+# FAILS 'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
+    );
+
+@AMI_CORBA_LIST =
+    ( $ace_tests,
+      'TAO/tests/Param_Test , run_test.pl',
+      'TAO/tests/Param_Test , run_test.pl -i dii',
+      'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl',
+      'TAO/performance-tests/Cubit/TAO/MT_Cubit , run_test.pl -n 100',
+      'TAO/performance-tests/Latency , run_test.pl',
+      'TAO/performance-tests/POA/Object_Creation_And_Registration , run_test.pl',
+      'TAO/performance-tests/RTCorba/Oneways/Reliable , run_test.pl',
+      'TAO/tests/OctetSeq , run_test.pl',
+      'TAO/tests/Leader_Followers , run_test.pl',
+#      'TAO/tests/Endpoint_Per_Priority, run_test.pl',
+      'TAO/tests/Multiple_Inheritance , run_test.pl',
+      'TAO/tests/MT_Client , run_test.pl',
+      'TAO/tests/MT_Server , run_test.pl',
+      'TAO/tests/BiDirectional , run_test.pl',
+      'TAO/tests/BiDirectional_NestedUpcall , run_test.pl',
+      'TAO/tests/Faults , run_test.pl',
+      'TAO/tests/NestedUpcall/Simple , run_test.pl',
+      'TAO/tests/NestedUpcall/MT_Client_Test , run_test.pl',
+      'TAO/tests/NestedUpcall/Triangle_Test , run_test.pl',
+      'TAO/tests/Nested_Event_Loop , run_test.pl',
+      'TAO/tests/POA/Identity , run_test.pl',
+      'TAO/tests/POA/Deactivation , run_test.pl',
+      'TAO/tests/POA/Destruction , run_test.pl',
+      'TAO/tests/POA/wait_for_completion , run_test.pl',
+      'TAO/tests/POA/Non_Servant_Upcalls , run_test.pl',
+      'TAO/tests/IORManipulation , run_test.pl',
+      'TAO/tests/Policies , run_test.pl',
+      'TAO/tests/Timeout , run_test.pl',
+      'TAO/tests/Timed_Buffered_Oneways , run_test.pl',
+      'TAO/tests/IDL_Test , run_test.pl',
+      'TAO/tests/ORB_init , run_test.pl',
+      'TAO/tests/ORB_destroy , run_test.pl',
+      'TAO/tests/DSI_Gateway , run_test.pl',
+      'TAO/tests/AMI , run_test.pl',
+      'TAO/tests/InterOp-Naming , run_test.pl',
+      'TAO/examples/Buffered_Oneways , run_test.pl',
+      'TAO/examples/Buffered_AMI , run_test.pl',
+      'TAO/examples/POA/Adapter_Activator , run_test.pl',
+      'TAO/examples/POA/DSI , run_test.pl',
+      'TAO/examples/POA/Default_Servant , run_test.pl',
+      'TAO/examples/POA/Explicit_Activation , run_test.pl',
+      'TAO/examples/POA/FindPOA , run_test.pl',
+      'TAO/examples/POA/Forwarding , run_test.pl',
+      'TAO/examples/POA/NewPOA , run_test.pl',
+      'TAO/examples/POA/On_Demand_Activation , run_test.pl',
+      'TAO/examples/POA/On_Demand_Loading , run_test.pl',
+      'TAO/examples/POA/Reference_Counted_Servant , run_test.pl',
+      'TAO/examples/POA/Loader , run_test.pl',
+      'TAO/examples/POA/RootPOA , run_test.pl',
+      'TAO/examples/POA/Adapter_Activator , run_test.pl',
+      'TAO/examples/Simple/bank , run_test.pl',
+      'TAO/examples/Simple/grid , run_test.pl',
+      'TAO/examples/Simple/time-date , run_test.pl',
+      'TAO/examples/Simple/time , run_test.pl',
+      'TAO/examples/Load_Balancing , run_test.pl',
+      'TAO/orbsvcs/tests/Simple_Naming , run_test.pl',
+      'TAO/orbsvcs/tests/Trading , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Basic , run_test.pl',
+      'TAO/orbsvcs/tests/Event/Performance , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Basic , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Custom_Marshal , run_test.pl',
+      'TAO/orbsvcs/tests/EC_Throughput , run_test.pl',
+# BREAKS LINUX 'TAO/orbsvcs/tests/EC_Mcast , run_test.pl',
+# FAILS 'TAO/orbsvcs/tests/EC_Multiple , run_test.pl',
+      'TAO/orbsvcs/tests/Event_Latency , run_test.pl',
+      'TAO/examples/Simple/echo , run_test.pl < Echo.idl',
+# INTERACTIVE 'TAO/examples/Simple/chat , run_test.pl',
+      'TAO/orbsvcs/tests/Property , run_test.pl',
+# HANGS'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
+# HANGS'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
+    );
+1;
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/ACE-categories.html b/docs/ACE-categories.html
index 7f23b88d635..cbde3ec44f4 100644
--- a/docs/ACE-categories.html
+++ b/docs/ACE-categories.html
@@ -15,10 +15,10 @@ bgcolor="#ffffff">
 <h3><a href = "http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</a> Class Categories</h3>
 
 This document groups each file in <A
-HREF="../ace">$ACE_ROOT/ace</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace">$ACE_ROOT/ace</A>
 into its appropriate class category and provides a link to the C++
 source code and <A
-HREF="http://doc.ece.uci.edu/Doxygen/Current/html/ace/">HTML
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/man/acewindex.html">HTML
 versions</A> of the relevant manual pages</A>. <P>
 
 <b>[ACE]</b>
@@ -27,94 +27,94 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/CORBA_Handler.cpp">CORBA_Handler.cpp</a></li>
 <li><a href = "../ace/CORBA_Handler.h">CORBA_Handler.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_CORBA_Handler.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_CORBA_Handler.html">[doxygen]</a></b>
 <li><a href = "../ace/CORBA_Handler.i">CORBA_Handler.i</a></li>
 <li><a href = "../ace/CORBA_Ref.cpp">CORBA_Ref.cpp</a></li>
 <li><a href = "../ace/CORBA_Ref.h">CORBA_Ref.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_CORBA_Ref.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_CORBA_Ref.html">[doxygen]</a></b>
 <li><a href = "../ace/CORBA_Ref.i">CORBA_Ref.i</a></li>
 </ul>
 <b>[Containers]</b>
 <ul>
 <li><a href = "../ace/Array.cpp">Array.cpp</a></li>
 <li><a href = "../ace/Array.h">Array.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Array.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Array.html">[doxygen]</a></b>
 <li><a href = "../ace/Array.i">Array.i</a></li>
 <li><a href = "../ace/Containers.cpp">Containers.cpp</a></li>
 <li><a href = "../ace/Containers.i">Containers.i</a></li>
 <li><a href = "../ace/Containers.h">Containers.h</a></li>
 <li><a href = "../ace/Hash_Map_Manager.cpp">Hash_Map_Manager.cpp</a></li>
 <li><a href = "../ace/Hash_Map_Manager.h">Hash_Map_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Hash_Map_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Hash_Map_Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Filecache.cpp">Filecache.cpp</a></li>
 <li><a href = "../ace/Filecache.h">Filecache.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Filecache.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Filecache.html">[doxygen]</a></b>
 <li><a href = "../ace/Free_List.cpp">Free_List.cpp</a></li>
 <li><a href = "../ace/Free_List.i">Free_List.i</a></li>
 <li><a href = "../ace/Free_List.h">Free_List.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Free_List.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Free_List.html">[doxygen]</a></b>
 <li><a href = "../ace/Managed_Object.cpp">Managed_Object.cpp</a></li>
 <li><a href = "../ace/Managed_Object.h">Managed_Object.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Managed_Object.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Managed_Object.html">[doxygen]</a></b>
 <li><a href = "../ace/Managed_Object.i">Managed_Object.i</a></li>
 <li><a href = "../ace/Map_Manager.cpp">Map_Manager.cpp</a></li>
 <li><a href = "../ace/Map_Manager.h">Map_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Map_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Map_Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Map_Manager.i">Map_Manager.i</a></li>
 <li><a href = "../ace/Object_Manager.cpp">Object_Manager.cpp</a></li>
 <li><a href = "../ace/Object_Manager.i">Object_Manager.i</a></li>
 <li><a href = "../ace/Object_Manager.h">Object_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Object_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Object_Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/SString.cpp">SString.cpp</a></li>
 <li><a href = "../ace/SString.h">SString.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SString.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SString.html">[doxygen]</a></b>
 <li><a href = "../ace/SString.i">SString.i</a></li>
 </ul>
 <b>[Concurrency]</b>
 <ul>
 <li><a href = "../ace/Activation_Queue.h">Activation_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Activation_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Activation_Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/Activation_Queue.cpp">Activation_Queue.cpp</a></li>
 <li><a href = "../ace/Atomic_Op.i">Atomic_Op.i</a></li>
 <li><a href = "../ace/Future.h">Future.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Future.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Future.html">[doxygen]</a></b>
 <li><a href = "../ace/Future.cpp">Future.cpp</a></li>
 <li><a href = "../ace/Method_Request.h">Method_Request.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Method_Request.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Method_Request.html">[doxygen]</a></b>
 <li><a href = "../ace/Method_Request.cpp">Method_Request.cpp</a></li>
 <li><a href = "../ace/Process.cpp">Process.cpp</a></li>
 <li><a href = "../ace/Process.h">Process.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Process.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Process.html">[doxygen]</a></b>
 <li><a href = "../ace/Process.i">Process.i</a></li>
 <li><a href = "../ace/Process_Manager.cpp">Process_Manager.cpp</a></li>
 <li><a href = "../ace/Process_Manager.h">Process_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Process_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Process_Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Process_Manager.i">Process_Manager.i</a></li>
 <li><a href = "../ace/Sched_Params.cpp">Sched_Params.cpp</a></li>
 <li><a href = "../ace/Sched_Params.h">Sched_Params.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Sched_Params.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Sched_Params.html">[doxygen]</a></b>
 <li><a href = "../ace/Sched_Params.i">Sched_Params.i</a></li>
 <li><a href = "../ace/Synch.cpp">Synch.cpp</a></li>
 <li><a href = "../ace/Synch.h">Synch.h</a></li>
 <li><a href = "../ace/Synch.i">Synch.i</a></li>
 <li><a href = "../ace/Synch_Options.cpp">Synch_Options.cpp</a></li>
 <li><a href = "../ace/Synch_Options.h">Synch_Options.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Synch_Options.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Synch_Options.html">[doxygen]</a></b>
 <li><a href = "../ace/Synch_Options.i">Synch_Options.i</a></li>
 <li><a href = "../ace/Synch_T.cpp">Synch_T.cpp</a></li>
 <li><a href = "../ace/Synch_T.h">Synch_T.h</a></li>
 <li><a href = "../ace/Synch_T.i">Synch_T.i</a></li>
 <li><a href = "../ace/Thread.cpp">Thread.cpp</a></li>
 <li><a href = "../ace/Thread.h">Thread.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Thread.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Thread.html">[doxygen]</a></b>
 <li><a href = "../ace/Thread.i">Thread.i</a></li>
 <li><a href = "../ace/Thread_Manager.cpp">Thread_Manager.cpp</a></li>
 <li><a href = "../ace/Thread_Manager.h">Thread_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Thread_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Thread_Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Thread_Manager.i">Thread_Manager.i</a></li>
 <li><a href = "../ace/Token.cpp">Token.cpp</a></li>
 <li><a href = "../ace/Token.h">Token.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Token.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Token.html">[doxygen]</a></b>
 <li><a href = "../ace/Token.i">Token.i</a></li>
 </ul>
 <b>[Config]</b>
@@ -129,22 +129,22 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/Acceptor.cpp">Acceptor.cpp</a></li>
 <li><a href = "../ace/Acceptor.h">Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/Acceptor.i">Acceptor.i</a></li>
 <li><a href = "../ace/Asynch_Acceptor.cpp">Asynch_Acceptor.cpp</a></li>
 <li><a href = "../ace/Asynch_Acceptor.h">Asynch_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Asynch_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Asynch_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/Asynch_Acceptor.i">Asynch_Acceptor.i</a></li>
 <li><a href = "../ace/Asynch_IO.cpp">Asynch_IO.cpp</a></li>
 <li><a href = "../ace/Asynch_IO.h">Asynch_IO.h</a></li>
 <li><a href = "../ace/Asynch_IO.i">Asynch_IO.i</a></li>
 <li><a href = "../ace/Connector.cpp">Connector.cpp</a></li>
 <li><a href = "../ace/Connector.h">Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/Connector.i">Connector.i</a></li>
 <li><a href = "../ace/Dynamic_Service.cpp">Dynamic_Service.cpp</a></li>
 <li><a href = "../ace/Dynamic_Service.h">Dynamic_Service.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Dynamic_Service.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Dynamic_Service.html">[doxygen]</a></b>
 <li><a href = "../ace/Dynamic_Service.i">Dynamic_Service.i</a></li>
 <li><a href = "../ace/Strategies.cpp">Strategies.cpp</a></li>
 <li><a href = "../ace/Strategies.h">Strategies.h</a></li>
@@ -154,7 +154,7 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Strategies_T.i">Strategies_T.i</a></li>
 <li><a href = "../ace/Svc_Handler.cpp">Svc_Handler.cpp</a></li>
 <li><a href = "../ace/Svc_Handler.h">Svc_Handler.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Svc_Handler.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Svc_Handler.html">[doxygen]</a></b>
 <li><a href = "../ace/Svc_Handler.i">Svc_Handler.i</a></li>
 </ul>
 <b>[IPC]</b>
@@ -163,40 +163,40 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/IO_SAP.cpp">IO_SAP.cpp</a></li>
 <li><a href = "../ace/IO_SAP.h">IO_SAP.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IO_SAP.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_IO_SAP.html">[doxygen]</a></b>
 <li><a href = "../ace/IO_SAP.i">IO_SAP.i</a></li>
 <br>
 <b>[DEV_SAP]</b>
 <ul>
 <li><a href = "../ace/DEV.cpp">DEV.cpp</a></li>
 <li><a href = "../ace/DEV.h">DEV.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_DEV.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV.i">DEV.i</a></li>
 <li><a href = "../ace/DEV_Connector.cpp">DEV_Connector.cpp</a></li>
 <li><a href = "../ace/DEV_Connector.h">DEV_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_DEV_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV_Connector.i">DEV_Connector.i</a></li>
 <li><a href = "../ace/DEV_IO.cpp">DEV_IO.cpp</a></li>
 <li><a href = "../ace/DEV_IO.h">DEV_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_DEV_IO.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV_IO.i">DEV_IO.i</a></li>
 <li><a href = "../ace/TTY_IO.cpp">TTY_IO.cpp</a></li>
 <li><a href = "../ace/TTY_IO.h">TTY_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TTY_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_TTY_IO.html">[doxygen]</a></b>
 </ul>
 <b>[FILE_SAP]</b>
 <ul>
 <li><a href = "../ace/FILE.cpp">FILE.cpp</a></li>
 <li><a href = "../ace/FILE.h">FILE.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FILE.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE.i">FILE.i</a></li>
 <li><a href = "../ace/FILE_Connector.cpp">FILE_Connector.cpp</a></li>
 <li><a href = "../ace/FILE_Connector.h">FILE_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FILE_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE_Connector.i">FILE_Connector.i</a></li>
 <li><a href = "../ace/FILE_IO.cpp">FILE_IO.cpp</a></li>
 <li><a href = "../ace/FILE_IO.h">FILE_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FILE_IO.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE_IO.i">FILE_IO.i</a></li>
 </ul>
 </ul>
@@ -204,163 +204,163 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/IPC_SAP.cpp">IPC_SAP.cpp</a></li>
 <li><a href = "../ace/IPC_SAP.h">IPC_SAP.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IPC_SAP.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_IPC_SAP.html">[doxygen]</a></b>
 <li><a href = "../ace/IPC_SAP.i">IPC_SAP.i</a></li>
 <br>
 <b>[Addr]</b>
 <ul>
 <li><a href = "../ace/Addr.cpp">Addr.cpp</a></li>
 <li><a href = "../ace/Addr.h">Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/Addr.i">Addr.i</a></li>
 <li><a href = "../ace/DEV_Addr.cpp">DEV_Addr.cpp</a></li>
 <li><a href = "../ace/DEV_Addr.h">DEV_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DEV_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_DEV_Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/DEV_Addr.i">DEV_Addr.i</a></li>
 <li><a href = "../ace/FILE_Addr.cpp">FILE_Addr.cpp</a></li>
 <li><a href = "../ace/FILE_Addr.h">FILE_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FILE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FILE_Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/FILE_Addr.i">FILE_Addr.i</a></li>
 <li><a href = "../ace/INET_Addr.cpp">INET_Addr.cpp</a></li>
 <li><a href = "../ace/INET_Addr.h">INET_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_INET_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_INET_Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/INET_Addr.i">INET_Addr.i</a></li>
 <li><a href = "../ace/SPIPE_Addr.cpp">SPIPE_Addr.cpp</a></li>
 <li><a href = "../ace/SPIPE_Addr.h">SPIPE_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SPIPE_Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Addr.i">SPIPE_Addr.i</a></li>
 <li><a href = "../ace/UNIX_Addr.cpp">UNIX_Addr.cpp</a></li>
 <li><a href = "../ace/UNIX_Addr.h">UNIX_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UNIX_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_UNIX_Addr.html">[doxygen]</a></b>
 <li><a href = "../ace/UNIX_Addr.i">UNIX_Addr.i</a></li>
 <li><a href = "../ace/UPIPE_Addr.h">UPIPE_Addr.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Addr.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_UPIPE_Addr.html">[doxygen]</a></b>
 </ul>
 <b>[FIFO_SAP]</b>
 <ul>
 <li><a href = "../ace/FIFO.cpp">FIFO.cpp</a></li>
 <li><a href = "../ace/FIFO.h">FIFO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FIFO.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO.i">FIFO.i</a></li>
 <li><a href = "../ace/FIFO_Recv.cpp">FIFO_Recv.cpp</a></li>
 <li><a href = "../ace/FIFO_Recv.h">FIFO_Recv.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Recv.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FIFO_Recv.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Recv.i">FIFO_Recv.i</a></li>
 <li><a href = "../ace/FIFO_Recv_Msg.cpp">FIFO_Recv_Msg.cpp</a></li>
 <li><a href = "../ace/FIFO_Recv_Msg.h">FIFO_Recv_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Recv_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FIFO_Recv_Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Recv_Msg.i">FIFO_Recv_Msg.i</a></li>
 <li><a href = "../ace/FIFO_Send.cpp">FIFO_Send.cpp</a></li>
 <li><a href = "../ace/FIFO_Send.h">FIFO_Send.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Send.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FIFO_Send.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Send.i">FIFO_Send.i</a></li>
 <li><a href = "../ace/FIFO_Send_Msg.cpp">FIFO_Send_Msg.cpp</a></li>
 <li><a href = "../ace/FIFO_Send_Msg.h">FIFO_Send_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_FIFO_Send_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_FIFO_Send_Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/FIFO_Send_Msg.i">FIFO_Send_Msg.i</a></li>
 </ul>
 <b>[SOCK_SAP]</b>
 <ul>
 <li><a href = "../ace/LOCK_SOCK_Acceptor.cpp">LOCK_SOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/LOCK_SOCK_Acceptor.h">LOCK_SOCK_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LOCK_SOCK_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_LOCK_SOCK_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK.cpp">LSOCK.cpp</a></li>
 <li><a href = "../ace/LSOCK.h">LSOCK.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_LSOCK.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK.i">LSOCK.i</a></li>
 <li><a href = "../ace/LSOCK_Acceptor.cpp">LSOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/LSOCK_Acceptor.h">LSOCK_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_LSOCK_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Acceptor.i">LSOCK_Acceptor.i</a></li>
 <li><a href = "../ace/LSOCK_CODgram.cpp">LSOCK_CODgram.cpp</a></li>
 <li><a href = "../ace/LSOCK_CODgram.h">LSOCK_CODgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_CODgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_LSOCK_CODgram.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_CODgram.i">LSOCK_CODgram.i</a></li>
 <li><a href = "../ace/LSOCK_Connector.cpp">LSOCK_Connector.cpp</a></li>
 <li><a href = "../ace/LSOCK_Connector.h">LSOCK_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_LSOCK_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Connector.i">LSOCK_Connector.i</a></li>
 <li><a href = "../ace/LSOCK_Dgram.cpp">LSOCK_Dgram.cpp</a></li>
 <li><a href = "../ace/LSOCK_Dgram.h">LSOCK_Dgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Dgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_LSOCK_Dgram.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Dgram.i">LSOCK_Dgram.i</a></li>
 <li><a href = "../ace/LSOCK_Stream.cpp">LSOCK_Stream.cpp</a></li>
 <li><a href = "../ace/LSOCK_Stream.h">LSOCK_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_LSOCK_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_LSOCK_Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/LSOCK_Stream.i">LSOCK_Stream.i</a></li>
 <li><a href = "../ace/SOCK.cpp">SOCK.cpp</a></li>
 <li><a href = "../ace/SOCK.h">SOCK.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK.i">SOCK.i</a></li>
 <li><a href = "../ace/SOCK_Acceptor.cpp">SOCK_Acceptor.cpp</a></li>
 <li><a href = "../ace/SOCK_Acceptor.h">SOCK_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Acceptor.i">SOCK_Acceptor.i</a></li>
 <li><a href = "../ace/SOCK_CODgram.cpp">SOCK_CODgram.cpp</a></li>
 <li><a href = "../ace/SOCK_CODgram.h">SOCK_CODgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_CODgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_CODgram.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_CODgram.i">SOCK_CODgram.i</a></li>
 <li><a href = "../ace/SOCK_Connector.cpp">SOCK_Connector.cpp</a></li>
 <li><a href = "../ace/SOCK_Connector.h">SOCK_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Connector.i">SOCK_Connector.i</a></li>
 <li><a href = "../ace/SOCK_Dgram.cpp">SOCK_Dgram.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram.h">SOCK_Dgram.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Dgram.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_Dgram.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Dgram.i">SOCK_Dgram.i</a></li>
 <li><a href = "../ace/SOCK_Dgram_Bcast.cpp">SOCK_Dgram_Bcast.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram_Bcast.h">SOCK_Dgram_Bcast.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Dgram_Bcast.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_Dgram_Bcast.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Dgram_Bcast.i">SOCK_Dgram_Bcast.i</a></li>
 <li><a href = "../ace/SOCK_Dgram_Mcast.cpp">SOCK_Dgram_Mcast.cpp</a></li>
 <li><a href = "../ace/SOCK_Dgram_Mcast.h">SOCK_Dgram_Mcast.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Dgram_Mcast.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_Dgram_Mcast.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Dgram_Mcast.i">SOCK_Dgram_Mcast.i</a></li>
 <li><a href = "../ace/SOCK_IO.cpp">SOCK_IO.cpp</a></li>
 <li><a href = "../ace/SOCK_IO.h">SOCK_IO.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_IO.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_IO.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_IO.i">SOCK_IO.i</a></li>
 <li><a href = "../ace/SOCK_Stream.cpp">SOCK_Stream.cpp</a></li>
 <li><a href = "../ace/SOCK_Stream.h">SOCK_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SOCK_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SOCK_Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/SOCK_Stream.i">SOCK_Stream.i</a></li>
 </ul>
 <b>[SPIPE_SAP]</b>
 <ul>
 <li><a href = "../ace/SPIPE.cpp">SPIPE.cpp</a></li>
 <li><a href = "../ace/SPIPE.h">SPIPE.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SPIPE.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE.i">SPIPE.i</a></li>
 <li><a href = "../ace/SPIPE_Acceptor.cpp">SPIPE_Acceptor.cpp</a></li>
 <li><a href = "../ace/SPIPE_Acceptor.h">SPIPE_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SPIPE_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Acceptor.i">SPIPE_Acceptor.i</a></li>
 <li><a href = "../ace/SPIPE_Connector.cpp">SPIPE_Connector.cpp</a></li>
 <li><a href = "../ace/SPIPE_Connector.h">SPIPE_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SPIPE_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Connector.i">SPIPE_Connector.i</a></li>
 <li><a href = "../ace/SPIPE_Stream.cpp">SPIPE_Stream.cpp</a></li>
 <li><a href = "../ace/SPIPE_Stream.h">SPIPE_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SPIPE_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SPIPE_Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/SPIPE_Stream.i">SPIPE_Stream.i</a></li>
 </ul>
 <b>[TLI_SAP]</b>
 <ul>
 <li><a href = "../ace/TLI.cpp">TLI.cpp</a></li>
 <li><a href = "../ace/TLI.h">TLI.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_TLI.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI.i">TLI.i</a></li>
 <li><a href = "../ace/TLI_Acceptor.cpp">TLI_Acceptor.cpp</a></li>
 <li><a href = "../ace/TLI_Acceptor.h">TLI_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_TLI_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI_Acceptor.i">TLI_Acceptor.i</a></li>
 <li><a href = "../ace/TLI_Connector.cpp">TLI_Connector.cpp</a></li>
 <li><a href = "../ace/TLI_Connector.h">TLI_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_TLI_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI_Connector.i">TLI_Connector.i</a></li>
 <li><a href = "../ace/TLI_Stream.cpp">TLI_Stream.cpp</a></li>
 <li><a href = "../ace/TLI_Stream.h">TLI_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_TLI_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_TLI_Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/TLI_Stream.i">TLI_Stream.i</a></li>
 </ul>
 </ul>
@@ -368,27 +368,27 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/UPIPE_Acceptor.cpp">UPIPE_Acceptor.cpp</a></li>
 <li><a href = "../ace/UPIPE_Acceptor.h">UPIPE_Acceptor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Acceptor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_UPIPE_Acceptor.html">[doxygen]</a></b>
 <li><a href = "../ace/UPIPE_Acceptor.i">UPIPE_Acceptor.i</a></li>
 <li><a href = "../ace/UPIPE_Connector.cpp">UPIPE_Connector.cpp</a></li>
 <li><a href = "../ace/UPIPE_Connector.h">UPIPE_Connector.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Connector.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_UPIPE_Connector.html">[doxygen]</a></b>
 <li><a href = "../ace/UPIPE_Connector.i">UPIPE_Connector.i</a></li>
 <li><a href = "../ace/UPIPE_Stream.cpp">UPIPE_Stream.cpp</a></li>
 <li><a href = "../ace/UPIPE_Stream.h">UPIPE_Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_UPIPE_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_UPIPE_Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/UPIPE_Stream.i">UPIPE_Stream.i</a></li>
 </ul>
 <b>[Misc]</b>
 <ul>
 <li><a href = "../ace/IOStream.cpp">IOStream.cpp</a></li>
 <li><a href = "../ace/IOStream.h">IOStream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IOStream.html">[doxygen]</a></b>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IOStream_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_IOStream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_IOStream_T.html">[doxygen]</a></b>
 <li><a href = "../ace/IOStream_T.i">IOStream_T.i</a></li>
 <li><a href = "../ace/Pipe.cpp">Pipe.cpp</a></li>
 <li><a href = "../ace/Pipe.h">Pipe.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Pipe.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Pipe.html">[doxygen]</a></b>
 <li><a href = "../ace/Pipe.i">Pipe.i</a></li>
 <li><a href = "../ace/Signal.cpp">Signal.cpp</a></li>
 <li><a href = "../ace/Signal.h">Signal.h</a></li>
@@ -403,16 +403,16 @@ versions</A> of the relevant manual pages</A>. <P>
 <li><a href = "../ace/Dump_T.h">Dump_T.h</a></li>
 <li><a href = "../ace/Log_Msg.cpp">Log_Msg.cpp</a></li>
 <li><a href = "../ace/Log_Msg.h">Log_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Log_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Log_Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/Log_Msg.i">Log_Msg.i</a></li>
 <li><a href = "../ace/Log_Priority.h">Log_Priority.h</a></li>
 <li><a href = "../ace/Log_Record.cpp">Log_Record.cpp</a></li>
 <li><a href = "../ace/Log_Record.h">Log_Record.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Log_Record.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Log_Record.html">[doxygen]</a></b>
 <li><a href = "../ace/Log_Record.i">Log_Record.i</a></li>
 <li><a href = "../ace/Trace.cpp">Trace.cpp</a></li>
 <li><a href = "../ace/Trace.h">Trace.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Trace.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Trace.html">[doxygen]</a></b>
 <li><a href = "../ace/Trace.i">Trace.i</a></li>
 </ul>
 <b>[Memory]</b>
@@ -421,14 +421,14 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/Mem_Map.cpp">Mem_Map.cpp</a></li>
 <li><a href = "../ace/Mem_Map.h">Mem_Map.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Mem_Map.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Mem_Map.html">[doxygen]</a></b>
 <li><a href = "../ace/Mem_Map.i">Mem_Map.i</a></li>
 </ul>
 <b>[Shared_Malloc]</b>
 <ul>
 <li><a href = "../ace/Malloc.cpp">Malloc.cpp</a></li>
 <li><a href = "../ace/Malloc.h">Malloc.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Malloc.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Malloc.html">[doxygen]</a></b>
 <li><a href = "../ace/Malloc.i">Malloc.i</a></li>
 <li><a href = "../ace/Malloc_T.cpp">Malloc_T.cpp</a></li>
 <li><a href = "../ace/Malloc_T.h">Malloc_T.h</a></li>
@@ -440,24 +440,24 @@ versions</A> of the relevant manual pages</A>. <P>
 <b>[Shared_Memory]</b>
 <ul>
 <li><a href = "../ace/Shared_Memory.h">Shared_Memory.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Memory.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Shared_Memory.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Memory_MM.cpp">Shared_Memory_MM.cpp</a></li>
 <li><a href = "../ace/Shared_Memory_MM.h">Shared_Memory_MM.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Memory_MM.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Shared_Memory_MM.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Memory_MM.i">Shared_Memory_MM.i</a></li>
 <li><a href = "../ace/Shared_Memory_SV.cpp">Shared_Memory_SV.cpp</a></li>
 <li><a href = "../ace/Shared_Memory_SV.h">Shared_Memory_SV.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Memory_SV.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Shared_Memory_SV.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Memory_SV.i">Shared_Memory_SV.i</a></li>
 </ul>
 <b>[Utils]</b>
 <ul>
 <li><a href = "../ace/Obstack.cpp">Obstack.cpp</a></li>
 <li><a href = "../ace/Obstack.h">Obstack.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Obstack.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Obstack.html">[doxygen]</a></b>
 <li><a href = "../ace/Read_Buffer.cpp">Read_Buffer.cpp</a></li>
 <li><a href = "../ace/Read_Buffer.h">Read_Buffer.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Read_Buffer.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Read_Buffer.html">[doxygen]</a></b>
 <li><a href = "../ace/Read_Buffer.i">Read_Buffer.i</a></li>
 </ul>
 </ul>
@@ -465,141 +465,141 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/ARGV.cpp">ARGV.cpp</a></li>
 <li><a href = "../ace/ARGV.h">ARGV.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_ARGV.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_ARGV.html">[doxygen]</a></b>
 <li><a href = "../ace/ARGV.i">ARGV.i</a></li>
 <li><a href = "../ace/Auto_Ptr.cpp">Auto_Ptr.cpp</a></li>
 <li><a href = "../ace/Auto_Ptr.h">Auto_Ptr.h</a></li>
 <li><a href = "../ace/Auto_Ptr.i">Auto_Ptr.i</a></li>
 <li><a href = "../ace/Date_Time.cpp">Date_Time.cpp</a></li>
 <li><a href = "../ace/Date_Time.h">Date_Time.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Date_Time.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Date_Time.html">[doxygen]</a></b>
 <li><a href = "../ace/Date_Time.i">Date_Time.i</a></li>
 <li><a href = "../ace/Dynamic.cpp">Dynamic.cpp</a></li>
 <li><a href = "../ace/Dynamic.h">Dynamic.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Dynamic.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Dynamic.html">[doxygen]</a></b>
 <li><a href = "../ace/Dynamic.i">Dynamic.i</a></li>
 <li><a href = "../ace/Get_Opt.cpp">Get_Opt.cpp</a></li>
 <li><a href = "../ace/Get_Opt.h">Get_Opt.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Get_Opt.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Get_Opt.html">[doxygen]</a></b>
 <li><a href = "../ace/Get_Opt.i">Get_Opt.i</a></li>
 <li><a href = "../ace/Registry.cpp">Registry.cpp</a></li>
 <li><a href = "../ace/Registry.h">Registry.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Registry.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Registry.html">[doxygen]</a></b>
 <li><a href = "../ace/Singleton.cpp">Singleton.cpp</a></li>
 <li><a href = "../ace/Singleton.h">Singleton.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Singleton.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Singleton.html">[doxygen]</a></b>
 <li><a href = "../ace/Singleton.i">Singleton.i</a></li>
 <li><a href = "../ace/System_Time.cpp">System_Time.cpp</a></li>
 <li><a href = "../ace/System_Time.h">System_Time.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_System_Time.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_System_Time.html">[doxygen]</a></b>
 </ul>
 <b>[Name_Service]</b>
 <ul>
 <li><a href = "../ace/Local_Name_Space.cpp">Local_Name_Space.cpp</a></li>
 <li><a href = "../ace/Local_Name_Space.h">Local_Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Local_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Local_Name_Space.html">[doxygen]</a></b>
 <li><a href = "../ace/Local_Name_Space_T.cpp">Local_Name_Space_T.cpp</a></li>
 <li><a href = "../ace/Local_Name_Space_T.h">Local_Name_Space_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Name_Options.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Name_Options.html">[doxygen]</a></b>
 <li><a href = "../ace/Name_Proxy.cpp">Name_Proxy.cpp</a></li>
 <li><a href = "../ace/Name_Proxy.h">Name_Proxy.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Name_Proxy.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Name_Proxy.html">[doxygen]</a></b>
 <li><a href = "../ace/Name_Request_Reply.cpp">Name_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Name_Request_Reply.h">Name_Request_Reply.h</a></li>
 <li><a href = "../ace/Name_Space.cpp">Name_Space.cpp</a></li>
 <li><a href = "../ace/Name_Space.h">Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Name_Space.html">[doxygen]</a></b>
 <li><a href = "../ace/Naming_Context.cpp">Naming_Context.cpp</a></li>
 <li><a href = "../ace/Naming_Context.h">Naming_Context.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Naming_Context.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Naming_Context.html">[doxygen]</a></b>
 <li><a href = "../ace/Registry_Name_Space.cpp">Registry_Name_Space.cpp</a></li>
 <li><a href = "../ace/Registry_Name_Space.h">Registry_Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Registry_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Registry_Name_Space.html">[doxygen]</a></b>
 <li><a href = "../ace/Remote_Name_Space.cpp">Remote_Name_Space.cpp</a></li>
 <li><a href = "../ace/Remote_Name_Space.h">Remote_Name_Space.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Remote_Name_Space.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Remote_Name_Space.html">[doxygen]</a></b>
 </ul>
 <b>[OS Adapters]</b>
 <ul>
 <li><a href = "../ace/ACE.cpp">ACE.cpp</a></li>
 <li><a href = "../ace/ACE.h">ACE.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE.html">[doxygen]</a></b>
 <li><a href = "../ace/ACE.i">ACE.i</a></li>
 <li><a href = "../ace/OS.cpp">OS.cpp</a></li>
 <li><a href = "../ace/OS.h">OS.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_OS.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_OS.html">[doxygen]</a></b>
 <li><a href = "../ace/OS.i">OS.i</a></li>
 </ul>
 <b>[Reactor]</b>
 <ul>
 <li><a href = "../ace/Event_Handler.cpp">Event_Handler.cpp</a></li>
 <li><a href = "../ace/Event_Handler.h">Event_Handler.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Event_Handler.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Event_Handler.html">[doxygen]</a></b>
 <li><a href = "../ace/Event_Handler.i">Event_Handler.i</a></li>
 <li><a href = "../ace/Event_Handler_T.cpp">Event_Handler_T.cpp</a></li>
 <li><a href = "../ace/Event_Handler_T.h">Event_Handler_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Event_Handler_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Event_Handler_T.html">[doxygen]</a></b>
 <li><a href = "../ace/Event_Handler_T.i">Event_Handler_T.i</a></li>
 <li><a href = "../ace/Handle_Set.cpp">Handle_Set.cpp</a></li>
 <li><a href = "../ace/Handle_Set.h">Handle_Set.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Handle_Set.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Handle_Set.html">[doxygen]</a></b>
 <li><a href = "../ace/Handle_Set.i">Handle_Set.i</a></li>
 <li><a href = "../ace/Priority_Reactor.cpp">Priority_Reactor.cpp</a></li>
 <li><a href = "../ace/Priority_Reactor.i">Priority_Reactor.i</a></li>
 <li><a href = "../ace/Priority_Reactor.h">Priority_Reactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Priority_Reactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Priority_Reactor.html">[doxygen]</a></b>
 <li><a href = "../ace/Proactor.h">Proactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Proactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Proactor.html">[doxygen]</a></b>
 <li><a href = "../ace/Proactor.i">Proactor.i</a></li>
 <li><a href = "../ace/Proactor.cpp">Proactor.cpp</a></li>
 <li><a href = "../ace/Reactor.cpp">Reactor.cpp</a></li>
 <li><a href = "../ace/Reactor.h">Reactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Reactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Reactor.html">[doxygen]</a></b>
 <li><a href = "../ace/Reactor.i">Reactor.i</a></li>
 <li><a href = "../ace/Reactor_Impl.h">Reactor_Impl.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Reactor_Impl.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Reactor_Impl.html">[doxygen]</a></b>
 <li><a href = "../ace/Select_Reactor.cpp">Select_Reactor.cpp</a></li>
 <li><a href = "../ace/Select_Reactor.h">Select_Reactor.h</a></li>
 <li><a href = "../ace/Select_Reactor.i">Select_Reactor.i</a></li>
 <li><a href = "../ace/WFMO_Reactor.cpp">WFMO_Reactor.cpp</a></li>
 <li><a href = "../ace/WFMO_Reactor.h">WFMO_Reactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_WFMO_Reactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_WFMO_Reactor.html">[doxygen]</a></b>
 <li><a href = "../ace/WFMO_Reactor.i">WFMO_Reactor.i</a></li>
 <li><a href = "../ace/XtReactor.cpp">XtReactor.cpp</a></li>
 <li><a href = "../ace/XtReactor.h">XtReactor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_XtReactor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_XtReactor.html">[doxygen]</a></b>
 </ul>
 <b>[Service_Configurator]</b>
 <ul>
 <li><a href = "../ace/DLL.cpp">DLL.cpp</a></li>
 <li><a href = "../ace/DLL.h">DLL.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_DLL.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_DLL.html">[doxygen]</a></b>
 <li><a href = "../ace/Parse_Node.cpp">Parse_Node.cpp</a></li>
 <li><a href = "../ace/Parse_Node.h">Parse_Node.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Parse_Node.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Parse_Node.html">[doxygen]</a></b>
 <li><a href = "../ace/Parse_Node.i">Parse_Node.i</a></li>
 <li><a href = "../ace/Service_Config.cpp">Service_Config.cpp</a></li>
 <li><a href = "../ace/Service_Config.h">Service_Config.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Config.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Service_Config.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Config.i">Service_Config.i</a></li>
 <li><a href = "../ace/Service_Manager.cpp">Service_Manager.cpp</a></li>
 <li><a href = "../ace/Service_Manager.h">Service_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Service_Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Manager.i">Service_Manager.i</a></li>
 <li><a href = "../ace/Service_Object.cpp">Service_Object.cpp</a></li>
 <li><a href = "../ace/Service_Object.h">Service_Object.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Object.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Service_Object.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Object.i">Service_Object.i</a></li>
 <li><a href = "../ace/Service_Repository.cpp">Service_Repository.cpp</a></li>
 <li><a href = "../ace/Service_Repository.h">Service_Repository.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Service_Repository.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Service_Repository.html">[doxygen]</a></b>
 <li><a href = "../ace/Service_Repository.i">Service_Repository.i</a></li>
 <li><a href = "../ace/Service_Types.cpp">Service_Types.cpp</a></li>
 <li><a href = "../ace/Service_Types.i">Service_Types.i</a></li>
 <li><a href = "../ace/Service_Types.h">Service_Types.h</a></li>
 <li><a href = "../ace/Shared_Object.cpp">Shared_Object.cpp</a></li>
 <li><a href = "../ace/Shared_Object.h">Shared_Object.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Shared_Object.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Shared_Object.html">[doxygen]</a></b>
 <li><a href = "../ace/Shared_Object.i">Shared_Object.i</a></li>
 <li><a href = "../ace/Svc_Conf.h">Svc_Conf.h</a></li>
 <li><a href = "../ace/Svc_Conf_l.cpp">Svc_Conf_l.cpp</a></li>
@@ -610,37 +610,37 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/IO_Cntl_Msg.cpp">IO_Cntl_Msg.cpp</a></li>
 <li><a href = "../ace/IO_Cntl_Msg.h">IO_Cntl_Msg.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_IO_Cntl_Msg.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_IO_Cntl_Msg.html">[doxygen]</a></b>
 <li><a href = "../ace/IO_Cntl_Msg.i">IO_Cntl_Msg.i</a></li>
 <li><a href = "../ace/Message_Block.cpp">Message_Block.cpp</a></li>
 <li><a href = "../ace/Message_Block.h">Message_Block.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Message_Block.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Message_Block.html">[doxygen]</a></b>
 <li><a href = "../ace/Message_Block.i">Message_Block.i</a></li>
 <li><a href = "../ace/Message_Queue.cpp">Message_Queue.cpp</a></li>
 <li><a href = "../ace/Message_Queue.h">Message_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Message_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Message_Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/Message_Queue.i">Message_Queue.i</a></li>
 <li><a href = "../ace/Message_Queue_T.cpp">Message_Queue_T.cpp</a></li>
 <li><a href = "../ace/Message_Queue_T.h">Message_Queue_T.h</a></li>
 <li><a href = "../ace/Message_Queue_T.i">Message_Queue_T.i</a></li>
 <li><a href = "../ace/Module.cpp">Module.cpp</a></li>
 <li><a href = "../ace/Module.h">Module.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Module.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Module.html">[doxygen]</a></b>
 <li><a href = "../ace/Module.i">Module.i</a></li>
 <li><a href = "../ace/Multiplexor.cpp">Multiplexor.cpp</a></li>
 <li><a href = "../ace/Multiplexor.h">Multiplexor.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Multiplexor.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Multiplexor.html">[doxygen]</a></b>
 <li><a href = "../ace/Multiplexor.i">Multiplexor.i</a></li>
 <li><a href = "../ace/Stream.cpp">Stream.cpp</a></li>
 <li><a href = "../ace/Stream.h">Stream.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Stream.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Stream.html">[doxygen]</a></b>
 <li><a href = "../ace/Stream.i">Stream.i</a></li>
 <li><a href = "../ace/Stream_Modules.cpp">Stream_Modules.cpp</a></li>
 <li><a href = "../ace/Stream_Modules.h">Stream_Modules.h</a></li>
 <li><a href = "../ace/Stream_Modules.i">Stream_Modules.i</a></li>
 <li><a href = "../ace/Task.cpp">Task.cpp</a></li>
 <li><a href = "../ace/Task.h">Task.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Task.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Task.html">[doxygen]</a></b>
 <li><a href = "../ace/Task.i">Task.i</a></li>
 <li><a href = "../ace/Task_T.cpp">Task_T.cpp</a></li>
 <li><a href = "../ace/Task_T.h">Task_T.h</a></li>
@@ -652,38 +652,38 @@ versions</A> of the relevant manual pages</A>. <P>
 <ul>
 <li><a href = "../ace/SV_Message.cpp">SV_Message.cpp</a></li>
 <li><a href = "../ace/SV_Message.h">SV_Message.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Message.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SV_Message.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Message.i">SV_Message.i</a></li>
 <li><a href = "../ace/SV_Message_Queue.cpp">SV_Message_Queue.cpp</a></li>
 <li><a href = "../ace/SV_Message_Queue.h">SV_Message_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Message_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SV_Message_Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Message_Queue.i">SV_Message_Queue.i</a></li>
 <li><a href = "../ace/Typed_SV_Message.cpp">Typed_SV_Message.cpp</a></li>
 <li><a href = "../ace/Typed_SV_Message.h">Typed_SV_Message.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Typed_SV_Message.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Typed_SV_Message.html">[doxygen]</a></b>
 <li><a href = "../ace/Typed_SV_Message.i">Typed_SV_Message.i</a></li>
 <li><a href = "../ace/Typed_SV_Message_Queue.cpp">Typed_SV_Message_Queue.cpp</a></
 li>
 <li><a href = "../ace/Typed_SV_Message_Queue.h">Typed_SV_Message_Queue.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Typed_SV_Message_Queue.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Typed_SV_Message_Queue.html">[doxygen]</a></b>
 <li><a href = "../ace/Typed_SV_Message_Queue.i">Typed_SV_Message_Queue.i</a></li>
 </ul>
 <b>[System_V_Semaphores]</b>
 <ul>
 <li><a href = "../ace/SV_Semaphore_Complex.cpp">SV_Semaphore_Complex.cpp</a></li>
 <li><a href = "../ace/SV_Semaphore_Complex.h">SV_Semaphore_Complex.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Semaphore_Complex.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SV_Semaphore_Complex.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Semaphore_Complex.i">SV_Semaphore_Complex.i</a></li>
 <li><a href = "../ace/SV_Semaphore_Simple.cpp">SV_Semaphore_Simple.cpp</a></li>
 <li><a href = "../ace/SV_Semaphore_Simple.h">SV_Semaphore_Simple.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Semaphore_Simple.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SV_Semaphore_Simple.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Semaphore_Simple.i">SV_Semaphore_Simple.i</a></li>
 </ul>
 <b>[System_V_Shared_Memory]</b>
 <ul>
 <li><a href = "../ace/SV_Shared_Memory.cpp">SV_Shared_Memory.cpp</a></li>
 <li><a href = "../ace/SV_Shared_Memory.h">SV_Shared_Memory.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_SV_Shared_Memory.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_SV_Shared_Memory.html">[doxygen]</a></b>
 <li><a href = "../ace/SV_Shared_Memory.i">SV_Shared_Memory.i</a></li>
 </ul>
 </ul>
@@ -691,31 +691,31 @@ li>
 <ul>
 <li><a href = "../ace/High_Res_Timer.cpp">High_Res_Timer.cpp</a></li>
 <li><a href = "../ace/High_Res_Timer.h">High_Res_Timer.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_High_Res_Timer.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_High_Res_Timer.html">[doxygen]</a></b>
 <li><a href = "../ace/High_Res_Timer.i">High_Res_Timer.i</a></li>
 <li><a href = "../ace/Profile_Timer.cpp">Profile_Timer.cpp</a></li>
 <li><a href = "../ace/Profile_Timer.h">Profile_Timer.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Profile_Timer.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Profile_Timer.html">[doxygen]</a></b>
 <li><a href = "../ace/Profile_Timer.i">Profile_Timer.i</a></li>
 <li><a href = "../ace/Time_Request_Reply.cpp">Time_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Time_Request_Reply.h">Time_Request_Reply.h</a></li>
 <li><a href = "../ace/Time_Value.h">Time_Value.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Time_Value.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Time_Value.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Hash.cpp">Timer_Hash.cpp</a></li>
 <li><a href = "../ace/Timer_Hash.h">Timer_Hash.h</a></li>
 <li><a href = "../ace/Timer_Hash_T.cpp">Timer_Hash_T.cpp</a></li>
 <li><a href = "../ace/Timer_Hash_T.h">Timer_Hash_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Hash_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Timer_Hash_T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Heap.cpp">Timer_Heap.cpp</a></li>
 <li><a href = "../ace/Timer_Heap.h">Timer_Heap.h</a></li>
 <li><a href = "../ace/Timer_Heap_T.cpp">Timer_Heap_T.cpp</a></li>
 <li><a href = "../ace/Timer_Heap_T.h">Timer_Heap_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Heap_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Timer_Heap_T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_List.cpp">Timer_List.cpp</a></li>
 <li><a href = "../ace/Timer_List.h">Timer_List.h</a></li>
 <li><a href = "../ace/Timer_List_T.cpp">Timer_List_T.cpp</a></li>
 <li><a href = "../ace/Timer_List_T.h">Timer_List_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_List_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Timer_List_T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Queue.cpp">Timer_Queue.cpp</a></li>
 <li><a href = "../ace/Timer_Queue.h">Timer_Queue.h</a></li>
 <li><a href = "../ace/Timer_Queue.i">Timer_Queue.i</a></li>
@@ -724,13 +724,13 @@ li>
 <li><a href = "../ace/Timer_Queue_Adapters.i">Timer_Queue_Adapters.i</a></li>
 <li><a href = "../ace/Timer_Queue_T.cpp">Timer_Queue_T.cpp</a></li>
 <li><a href = "../ace/Timer_Queue_T.h">Timer_Queue_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Queue_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Timer_Queue_T.html">[doxygen]</a></b>
 <li><a href = "../ace/Timer_Queue_T.i">Timer_Queue_T.i</a></li>
 <li><a href = "../ace/Timer_Wheel.cpp">Timer_Wheel.cpp</a></li>
 <li><a href = "../ace/Timer_Wheel.h">Timer_Wheel.h</a></li>
 <li><a href = "../ace/Timer_Wheel_T.cpp">Timer_Wheel_T.cpp</a></li>
 <li><a href = "../ace/Timer_Wheel_T.h">Timer_Wheel_T.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Timer_Wheel_T.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Timer_Wheel_T.html">[doxygen]</a></b>
 </ul>
 <b>[Token_Service]</b>
 <ul>
@@ -742,11 +742,11 @@ li>
 <li><a href = "../ace/Remote_Tokens.i">Remote_Tokens.i</a></li>
 <li><a href = "../ace/Token_Collection.cpp">Token_Collection.cpp</a></li>
 <li><a href = "../ace/Token_Collection.h">Token_Collection.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Token_Collection.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Token_Collection.html">[doxygen]</a></b>
 <li><a href = "../ace/Token_Collection.i">Token_Collection.i</a></li>
 <li><a href = "../ace/Token_Manager.cpp">Token_Manager.cpp</a></li>
 <li><a href = "../ace/Token_Manager.h">Token_Manager.h</a></li>
-<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/html/ace/class_ACE_Token_Manager.html">[doxygen]</a></b>
+<b><a href = "http://doc.ece.uci.edu/Doxygen/Current/ace/class_ACE_Token_Manager.html">[doxygen]</a></b>
 <li><a href = "../ace/Token_Manager.i">Token_Manager.i</a></li>
 <li><a href = "../ace/Token_Request_Reply.cpp">Token_Request_Reply.cpp</a></li>
 <li><a href = "../ace/Token_Request_Reply.h">Token_Request_Reply.h</a></li>
diff --git a/docs/ACE-porting.html b/docs/ACE-porting.html
index e64bc25fc57..196c28981c6 100644
--- a/docs/ACE-porting.html
+++ b/docs/ACE-porting.html
@@ -30,11 +30,11 @@ straightforward to port TAO, as well.<P>
 <H4>Create a <CODE>config.h</CODE> Header File for the Target OS Platform</H4>
 
 A <CODE>config-*.h</CODE> header file exists in <A
-HREF="../ace/">$ACE_ROOT/ace</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace/">$ACE_ROOT/ace</A>
 for each platform to which ACE has been ported.  This file contains
 the portability macros for each particular configuration of ACE.  A
 complete description of the existent macros can be found in the <A
-HREF="../ace/README">$ACE_ROOT/ace/README</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace/README">$ACE_ROOT/ace/README</A>
 file. <P>
 
 Currently, you must edit this file by hand to port it to new OS
@@ -57,7 +57,7 @@ how ACE has been ported to other operating systems in the
 
 Optional features in pthreads are covered by <CODE>ACE_HAS_*</CODE>
 and/or <CODE>ACE_LACKS_*</CODE> macros, which are described in the <A
-HREF="../ace/README">$ACE_ROOT/ace/README</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ace/README">$ACE_ROOT/ace/README</A>
 file.  Particular platform features, such as DCE pthreads calls that
 end in <CODE>_np</CODE>, should be bracketed by platform defines
 rather than by inventing more <CODE>ACE_HAS_*</CODE> or
@@ -90,10 +90,12 @@ After porting the <CODE>ACE_OS</CODE> class, the next step is to port
 all of the ACE C++ wrapper components, such as sockets, threads,
 synchronization mechanisms.  A full list of the categories and classes
 can be found in the <A
-HREF="ACE-categories.html">$ACE_ROOT/ACE-categories</a>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-categories">$ACE_ROOT/ACE-categories</a>
 file.  It is easiest to concentrate on porting one category at the
-time.  The ACE release contain a <A HREF="../tests/README">one-button
-test suite</A> in the <A HREF="../tests/">$ACE_ROOT/tests/</A>
+time.  The ACE release contain a <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/tests/README">one-button
+test suite</A> in the <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/tests/">$ACE_ROOT/tests/</A>
 directory.  These tests can be used to validate the correctness of the
 various ACE C++ wrappers as they are ported. <P>
 
@@ -112,7 +114,7 @@ platform-dependent code is localized in the lower layers of ACE. <P>
 
 After porting and successfully testing all the ACE framework
 components, it also should be relatively easy to port and <A
-HREF="../TAO/TAO-INSTALL.html">install</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/TAO-INSTALL.html">install</A>
 TAO because all of its platform-dependent code is localized in ACE.
 Typically, the only problems that arise when porting TAO is bugs with
 C++ compilers. <P>
diff --git a/docs/ACE-subsets.html b/docs/ACE-subsets.html
index 4283d7e5b85..611c73d0105 100644
--- a/docs/ACE-subsets.html
+++ b/docs/ACE-subsets.html
@@ -441,7 +441,7 @@ XtReactor
 
 Here is an example size breakdown, by ACE library component.  It is
 for the ACE 5.0 libACE.a, statically built with these <a
-href="../ACE-INSTALL.html#flags">make
+href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html#flags">make
 flags</a>:
 <pre><code>
     debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0
diff --git a/docs/bugzilla-build-setup.html b/docs/bugzilla-build-setup.html
deleted file mode 100644
index 0deed4d6c45..00000000000
--- a/docs/bugzilla-build-setup.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-  <!-- $Id$ -->
-  <head>
-    <title>Setting Up A Bugzilla Nightly Build</title>
-  </head>
-
-  <body text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">
-
-    <h1>Setting Up A Bugzilla Nightly Build</h1>
-
-    <p>
-      The
-      <a href="http://www.cs.wustl.edu/~schmidt/doc-center.html">
-	Center for Distributed Object Computing</a> has automated
-      daily builds to keep track of the progress made each day for
-      selected software and hardware platforms.
-    </p>
-
-    <h2>Unix Instructions</h2>
-
-    <p>
-      Below are the steps to take to add a platform to the current
-      platforms included in the daily builds. BUILD_NAME should be
-      replaced with the name you want to give the build (e.g.,
-      Solaris8_gcc). It can be helpful to embed the OS and the compiler
-      used in BUILD_NAME as in the example in the previous sentence
-      (i.e., Solaris8_gcc =>
-      the Solaris 8 operating system and GNU's gcc/g++ compiler).
-    </p>
-
-    <ul>
-    <li>Configure CVSROOT as it will be used in the build
-<pre>
-    $ cvs checkout ACE_wrappers
-
-    $ cd ACE_wrappers
-    $ mkdir build build/BUILD_NAME
-    $ ./bin/create_ace_build -a build/BUILD_NAME
-    $ mkdir build/BUILD_NAME/auto_compile
-    $ touch build/BUILD_NAME/auto_compile/history
-</pre>
-
-    <li>Configure build/BUILD_NAME/ace/config.h.
-    (Solaris 8 is used here as an example.)
-<pre>
-    $ echo '#include "ace/config-sunos5.8.h" > build/BUILD_NAME/ace/config.h
-</pre>
-
-    <li>Configure build/BUILD_NAME/include/makeinclude/platform_macros.GNU
-    Solaris 8 and GNU compiler is used here as an example. This example
-    also shows building without debug.
-<pre>
-    $ cd build/BUILD_NAME/include/makeinclude
-    $ echo 'include $(ACE_ROOT)/include/makeinclude/platform_sunos5_g++.GNU' > platform_macros.GNU
-    $ echo 'debug=0' >> platform_macros.GNU
-</pre>
-
-    <li>Setup build script in ~bugzilla/bin.
-    (Copy an existing build script to use as a template. Solaris 8 and GNU compiler is used here as an example.)
-<pre>
-    $ su bugzilla
-    $ cd ~/bin
-    $ cp auto_compile_sunos_gcc272 auto_compile_sunos8_gcc
-</pre>
-    Modify the new auto compile file as needed. At a minimum, CHECKOUT and
-    BUILD will need to be modified.<BR><BR>
-
-    <li>Create a cron job to run the build.
-    (Decide which machine the build should be done. Add a cron job to bugzilla's crontab.)
-<pre>
-    $ ssh -l bugzilla <i>machine_of_choice</i>
-    $ crontab -e
-    <i>Add cron job to kick off the build every day.</i>
-</pre>
-
-    <li>After the build has been running successfully a few days (not
-    necessarily that there aren't errors or warnings in the compilation or
-    execution) incorporate it into the showlog.cgi script.
-<pre>
-    $ cd ~bugzilla/.www-docs/cgi-bin
-    $ vi showlog.cgi # to include the build you're making
-</pre>
-    Modify the new auto compile file as needed. At a minimum, CHECKOUT and
-    BUILD will need to be modified.
-
-    </ul>
-
-    <h2>Win32 Instructions</h2>
-
-    <p>
-	  The Win32 builds use a different set of scripts from the Unix nightly
-	  builds.  Instructions will be provided here for them at a future 
-	  date.
-	</p>
-
-    <h2>Scoreboard</h2>
-
-    <p>
-	  The scoreboard is the web page created by <code>
-	  ACE_wrappers/bin/nightlybuilds/scoreboard_update.pl</code>.  The main 
-	  build scoreboard for the DOC Group is located at <a href=
-	  "http://ringil.ece.uci.edu/scoreboard/">
-	  http://ringil.ece.uci.edu/scoreboard/</a>.
-	</p>
-
-    <p>
-	  The <code>scoreboard_update.pl</code> works by downloading a directory 
-	  via http, determining the build that has run last, download it, and 
-	  then parse and create html documents based on it. It requires that the 
-	  builds name their logs based on the time that the log was created (both
-	  <code>auto_compile</code> and <code>prepare_log.pl</code> do this
-	  correctly).
-	</p>
-
-    <p>
-	  To integrate into the scoreboard, the following steps should be taken:
-	</p>
-
-    <ol>
-	  <li>
-	    Make the directory containing the log files accessible from the
-		internet (or at least from the machine running the scoreboard, in 
-		this case, ringil.ece.uci.edu).  This directory must be able to be
-		browsed via the web and should not require a password.
-	    <br><br>
-	  </li>
-
-	  <li>
-        Add the build to the appropriate *.lst file in the <code>
-		ACE_wrappers/bin/nightlybuilds/*.lst</code>.  The main scoreboard
-		uses builds.lst.  Each entry looks like the following:
-<pre>
-    [BUILD_NAME]
-    TYPE = TIMEONLY
-    LIST = http://ace.cs.wustl.edu/~bugzilla/auto_compile_logs/build_dir/
-    WEB  = http://ace.cs.wustl.edu/~bugzilla/cgi-bin/show_log_dir.cgi?build_dir
-</pre>
-        BUILD_NAME, LIST, and WEB should be updated to the appropriate values.
-        TYPE currently needs to be TIMEONLY.  LIST refers to the address 
-		needed to browse the logs directory.  WEB refers to the address 
-		used to link to the logs directory (we usually put a url to the 
-		show_log_dir.cgi script here).
-	    <br><br>
-	  </li>
-
-	  <li>
-	    Check in the *.lst file.  The scoreboard will automatically update 
-		its copy of the list before parsing it.
-	    <br><br>
-	  </li>
-	</ol>
-
-    <hr>
-    <address><a href="mailto:joeh@cs.wustl.edu">Joe Hoffert</a></address>
-<!-- Created: Thu Feb 22 10:15:58 CST 2001 -->
-<!-- hhmts start -->
-Last modified: Wed Feb 28 15:32:45 CST 2001
-<!-- hhmts end -->
-    <br>
-  </body>
-</html>
diff --git a/docs/run_test.txt b/docs/run_test.txt
index 9889a9222e3..561657c7f94 100644
--- a/docs/run_test.txt
+++ b/docs/run_test.txt
@@ -24,40 +24,33 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib '../../../bin';
 use PerlACE::Run_Test;
-
-$status = 0;
+use Cwd;
 
 $server_ior = PerlACE::LocalFile ("server.ior");
 unlink $server_ior;
 
 $SV = new PerlACE::Process ("server", "-o $server_ior");
-$CL = new PerlACE::Process ("client", "-k file://$server_ior");
 
 $SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($server_ior, 5) == -1) {
     print STDERR "ERROR: cannot find file <$server_ior>\n";
-    $SV->Kill ();
+    $SV->Kill (); $SV->TimedWait (1);
     exit 1;
 } 
 
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->TerminateWaitKill (5);
+$CL = new PerlACE::Process ("client", " -k file://$server_ior ");
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+$client = $CL->SpawnWaitKill (60);
+$server = $SV->WaitKill (5);
 
 unlink $server_ior;
  
-exit $status;
+if ($server != 0 || $client != 0) {
+    exit 1;
+}
+
+exit 0;
 @endverbatim
 
 @subsection details Example Details
@@ -90,7 +83,7 @@ line arguments (like -Config and -ExeSubDir) and also brings in
 the PerlACE::Process module.
 
 @verbatim
-$status = 0;
+use Cwd;
 
 $server_ior = PerlACE::LocalFile ("server.ior");
 
@@ -103,70 +96,50 @@ immediately because we use PerlACE::waitforfile_timed later.
 
 @verbatim
 $SV = new PerlACE::Process ("server", "-o $server_ior");
-$CL = new PerlACE::Process ("client", " -k file://$server_ior ");
 
 $SV->Spawn ();
 @endverbatim
 
 The PerlACE::Process is constructed with an executable and 
 arguments.  @note Unlike the old Process module, the process
-isn't started until one of the Spawn methods is used.
+isn't started until one of the Spawn's is called.
 
 @verbatim
 if (PerlACE::waitforfile_timed ($server_ior, 5) == -1) {
     print STDERR "ERROR: cannot find file <$server_ior>\n";
-    $SV->Kill (); 
+    $SV->Kill (); $SV->TimedWait (1);
     exit 1;
 } 
 @endverbatim
 
 The PerlACE::waitforfile_timed method waits until the file is
-created.  In this way, we know when to start the client.  If
-no IOR file is used, then you'd need to use Perl's sleep 
-method. 
+created.  In this way, we know when to start the client.
 
 @verbatim
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-@endverbatim
-
-Here is an example of starting the client.  SpawnWaitKill will start 
-the process and wait for the specified number of seconds for the 
-process to end.  If the time limit is reached, it will kill the 
-process and return -1.  
-
-The return value of SpawnWaitKill is the return value of the 
-process, unless it timed out.  You don't need to check for the 
-timeout, since SpawnWaitKill will print out a timeout error.  
-Instead, just check for != 0.
-
-@verbatim
-$server = $SV->TerminateWaitKill (5);
+$CL = new PerlACE::Process ("client", " -k file://$server_ior ");
 
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
+$client = $CL->SpawnWaitKill (60);
+$server = $SV->WaitKill (5);
 @endverbatim
 
-Here is the termination of the server.  Servers are usually terminated
-either by TerminateWaitKill or just WaitKill.  TerminateWaitKill is 
-used when the server doesn't shut down itself.  WaitKill is used when
-it does (such as when the client calls a shutdown method).  Once
-again, we check the return status.
-
+Here are two more methods on the PerlACE::Process object.
+SpawnWaitKill will start the process and wait for the specified
+number of seconds for the process to end.  If the time limit
+is reached, it will kill the process.  WaitKill will do the same,
+but is used after the process is already spawned.
 
 @verbatim
 unlink $server_ior;
  
-exit $status;
+if ($server != 0 || $client != 0) {
+    exit 1;
+}
+ 
+exit 0;
 @endverbatim
 
-And finally, we unlink any files that were created and then just
-exit with $status.  
+And finally, we just check the return codes of the server and 
+client and return 1 from this perl script if they aren't 0.
 
+This return code is used by the auto_run_tests.pl script.
 */
\ No newline at end of file
diff --git a/docs/tutorials/013/message_queue.cpp b/docs/tutorials/013/message_queue.cpp
index 6264381810a..67a22f7457b 100644
--- a/docs/tutorials/013/message_queue.cpp
+++ b/docs/tutorials/013/message_queue.cpp
@@ -80,9 +80,9 @@ template class ACE_Guard < ACE_Mutex >;
 template class ACE_Lock_Adapter < ACE_Mutex >;
 template class ACE_Atomic_Op < ACE_Mutex, int >;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Guard<ACE_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Mutex>
-#pragma instantiate ACE_Atomic_Op<ACE_Mutex, int>
+#pragma instantiate ACE_Guard<ACE_Mutex>;
+#pragma instantiate ACE_Lock_Adapter<ACE_Mutex>;
+#pragma instantiate ACE_Atomic_Op<ACE_Mutex, int>;
 #endif /*
          ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
        */
diff --git a/docs/tutorials/new-tutorials.html b/docs/tutorials/new-tutorials.html
index 60748d02f4b..f9cf9bbc6b6 100644
--- a/docs/tutorials/new-tutorials.html
+++ b/docs/tutorials/new-tutorials.html
@@ -71,6 +71,7 @@ Organization can come later...  <P>
 <HR><P>
 Back to the <A
 HREF="../ACE-tutorials.html">ACE
-tutorials</A> or <A HREF="../../TAO/docs/TAO-tutorials.html">TAO
+tutorials</A> or <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/TAO-tutorials.html">TAO
 tutorials</A> page.
 
diff --git a/etc/tao.doxygen b/etc/tao.doxygen
index 624235b8fb8..c0447ced197 100644
--- a/etc/tao.doxygen
+++ b/etc/tao.doxygen
@@ -48,7 +48,7 @@ WARN_FORMAT           = "$file:$line: $text"
 #---------------------------------------------------------------------------
 
 INPUT                 = TAO/tao
-FILE_PATTERNS         = *.cpp *.h *.i *.inl *.pidl *.txt
+FILE_PATTERNS         = *.cpp *.h *.i *.inl *.pidl
 RECURSIVE             =
 EXCLUDE               = 
 EXCLUDE_PATTERNS      = InterfaceC.cpp Services.h
diff --git a/examples/Export/run_test.pl b/examples/Export/run_test.pl
index 7c84078d8ff..d88d4c72bea 100755
--- a/examples/Export/run_test.pl
+++ b/examples/Export/run_test.pl
@@ -6,12 +6,23 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # -*- perl -*-
 
 use lib "../../bin";
-use PerlACE::Run_Test;
 
-$TEST = new PerlACE::Process ("test");
+require ACEutils;
+use Cwd;
 
-$status = $TEST->SpawnWaitKill (20);
+$cwd = getcwd();
+$test_exe = "$cwd$DIR_SEPARATOR"."test".$EXE_EXT;
 
-$status = 1 if ($status < 0);
+$TEST = Process::Create ($test_exe, "");
+
+$status = $TEST->TimedWait (20);
+if ($status == -1) {
+    print STDERR "ERROR: test timed out\n";
+    $status = 1;
+    $TEST->Kill (); $TEST->TimedWait (1);
+}
+elsif ($status > 0) {
+    print STDERR "ERROR: test failed\n";
+}
 
 exit $status;
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index 422eeb17ba9..0aad9ba5a77 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -112,6 +112,13 @@ main (int argc, char *argv [])
                        "open"),
                       -1);
 
+  else if (ACE_Reactor::instance ()->register_handler
+           (&peer_acceptor,
+            ACE_Event_Handler::READ_MASK) == - 1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "registering service with ACE_Reactor\n"),
+                      -1);
+
   ACE_DEBUG ((LM_DEBUG,
               "(%P) starting up daemon\n"));
 
diff --git a/examples/IPC_SAP/SOCK_SAP/Makefile.bor b/examples/IPC_SAP/SOCK_SAP/Makefile.bor
index 33dc76321e5..52a347a6ce6 100644
--- a/examples/IPC_SAP/SOCK_SAP/Makefile.bor
+++ b/examples/IPC_SAP/SOCK_SAP/Makefile.bor
@@ -1,12 +1,14 @@
 #
-# Makefile for building the IPC_SAP SOCK_SAP ace examples
-#
+ # Makefile for building the IPC_SAP SOCK_SAP ace examples
+ #
+
+ !include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
-NAMES = \
-	CPP-inclient \
+ TESTS = \
+        CPP-inclient \
 	CPP-unclient \
 	CPP-inserver \
-	CPP-inserver-fancy \
+        CPP-inserver-fancy \
 	CPP-inserver-poll \
 	CPP-unserver \
 	FD-unclient \
@@ -14,13 +16,21 @@ NAMES = \
 	C-inclient \
 	C-inserver
 
+all_tests: $(TESTS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+
+$(TESTS):
+	$(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
+
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
 CFLAGS = $(ACE_CFLAGS)
 
 CPPDIR = .
 
-LIBFILES = $(ACE_LIB)
+LIBFILES = \
+        $(ACE_LIB) \
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/examples/Log_Msg/makefile.bor b/examples/Log_Msg/makefile.bor
index 9868323d17c..2f78c01c4be 100644
--- a/examples/Log_Msg/makefile.bor
+++ b/examples/Log_Msg/makefile.bor
@@ -1,11 +1,18 @@
 #
-# Makefile for building the log_msg ace examples
-#
+ # Makefile for building the log_ms ace examples
+ #
+
+ !include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+ TESTS = \
+        test_callback \
+        test_log_msg \
+        test_ostream
+
+all_tests: $(TESTS)
 
-NAMES = \
-	test_callback \
-	test_log_msg \
-	test_ostream
+$(TESTS):
+	$(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
@@ -15,5 +22,4 @@ CPPDIR = .
 
 LIBFILES = $(ACE_LIB)
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/examples/Log_Msg/test_log_msg.cpp b/examples/Log_Msg/test_log_msg.cpp
index e4216f8cf12..120bc4c3906 100644
--- a/examples/Log_Msg/test_log_msg.cpp
+++ b/examples/Log_Msg/test_log_msg.cpp
@@ -140,7 +140,7 @@ main (int argc, char *argv[])
                                 (char *) array,
                                 sizeof array);
 
-      // Disable the LM_DEBUG and LM_INFO messages at the process level.
+      // Disable the LM_DEBUG and LM_INFO messages.
       u_long priority_mask =
         ACE_LOG_MSG->priority_mask (ACE_Log_Msg::PROCESS);
       ACE_CLR_BITS (priority_mask,
diff --git a/examples/Map_Manager/makefile.bor b/examples/Map_Manager/makefile.bor
index 509468e7ddb..02acd82833a 100644
--- a/examples/Map_Manager/makefile.bor
+++ b/examples/Map_Manager/makefile.bor
@@ -1,8 +1,16 @@
 #
-# Makefile for building the test_hash_map_manager ace examples
-#
+ # Makefile for building the test_hash_map_manager ace examples
+ #
+
+ !include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+ TESTS = \
+        test_hash_map_manager
+
+all_tests: $(TESTS)
 
-NAME = test_hash_map_manager
+$(TESTS):
+	$(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
diff --git a/examples/Mem_Map/file-reverse/makefile.bor b/examples/Mem_Map/file-reverse/makefile.bor
index c5f92970c72..13e8059587d 100644
--- a/examples/Mem_Map/file-reverse/makefile.bor
+++ b/examples/Mem_Map/file-reverse/makefile.bor
@@ -2,7 +2,15 @@
 # Makefile for building the mem_map file-reserse ace examples
 #
 
-NAME = file-reverse
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+TESTS = \
+        file-reverse
+
+all_tests: $(TESTS)
+
+$(TESTS):
+	$(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
diff --git a/examples/QOS/Fill_ACE_QoS.cpp b/examples/QOS/Fill_ACE_QoS.cpp
index 655e48cc742..87d893b92bd 100644
--- a/examples/QOS/Fill_ACE_QoS.cpp
+++ b/examples/QOS/Fill_ACE_QoS.cpp
@@ -30,16 +30,16 @@ int
 Fill_ACE_QoS::fill_simplex_receiver_qos (ACE_QoS &ace_qos,
                                          const ACE_CString &recv_flow_name)
 {
-  ACE_Flow_Spec *recv_flow_spec = 0;
+  ACE_Flow_Spec *recv_flow_spec = new ACE_Flow_Spec ();
 
-  if (this->map ().find (recv_flow_name, recv_flow_spec) != 0)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "Unable to find a FlowSpec with name %s",
-                       recv_flow_name.c_str ()),
-                      -1);
-  ace_qos.receiving_flowspec (*recv_flow_spec);
-  ace_qos.sending_flowspec (*(this->default_traffic_));
-  ace_qos.provider_specific (Fill_ACE_QoS::iov_);
+   if (this->map ().find (recv_flow_name, recv_flow_spec) != 0)
+     ACE_ERROR_RETURN ((LM_DEBUG,
+                        "Unable to find a FlowSpec with name %s",
+                        recv_flow_name.c_str ()),
+                       -1);
+   ace_qos.receiving_flowspec (*recv_flow_spec);
+   ace_qos.sending_flowspec (*(this->default_traffic_));
+   ace_qos.provider_specific (Fill_ACE_QoS::iov_);
 
   return 0;
 }
@@ -64,7 +64,7 @@ Fill_ACE_QoS::fill_simplex_sender_qos (ACE_QoS &ace_qos,
   return 0;
 }
 
-int
+int 
 Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
                                const ACE_CString &recv_flow_name,
                                const ACE_CString &send_flow_name)
@@ -77,13 +77,13 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
                        "Unable to find a FlowSpec with name %s",
                        recv_flow_name.c_str ()),
                       -1);
-
+  
   if (this->map ().find (send_flow_name, send_flow_spec) != 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
                        "Unable to find a FlowSpec with name %s",
                        send_flow_name.c_str ()),
                       -1);
-
+  
   ace_qos.receiving_flowspec (*recv_flow_spec);
   ace_qos.sending_flowspec (*send_flow_spec);
   ace_qos.provider_specific (Fill_ACE_QoS::iov_);
@@ -91,7 +91,7 @@ Fill_ACE_QoS::fill_duplex_qos (ACE_QoS &ace_qos,
   return 0;
 }
 
-Fill_ACE_QoS::FLOW_SPEC_HASH_MAP&
+Fill_ACE_QoS::FLOW_SPEC_HASH_MAP
 Fill_ACE_QoS::map (void)
 {
   return this->flow_spec_map_;
@@ -112,3 +112,5 @@ template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_H
 #pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_Flow_Spec *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Thread_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
diff --git a/examples/QOS/Fill_ACE_QoS.h b/examples/QOS/Fill_ACE_QoS.h
index 9c48633d47f..3dd92f548e4 100644
--- a/examples/QOS/Fill_ACE_QoS.h
+++ b/examples/QOS/Fill_ACE_QoS.h
@@ -26,10 +26,10 @@
 class Fill_ACE_QoS
 {
   //  TITLE
-  //    This class helps users to add new flow specs and provides
+  //    This class helps users to add new flow specs and provides 
   //    utility functions for filling up the flow specs for simplex/duplex
   //    sessions.
-
+   
 public:
   typedef ACE_Hash_Map_Manager <ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> FLOW_SPEC_HASH_MAP;
 
@@ -44,32 +44,34 @@ public:
                                  const ACE_CString &recv_flow_name);
   // To be used by receivers. Fills the receiver qos and sets the
   // sender qos to NO_TRAFFIC.
-
+  
   int fill_simplex_sender_qos (ACE_QoS &ace_qos,
                                const ACE_CString &send_flow_name);
   // To be used by senders. Fills the sender qos and sets the receiver
   // qos to NO_TRAFFIC.
-
+  
   int fill_duplex_qos (ACE_QoS &ace_qos,
                        const ACE_CString &recv_flow_name,
                        const ACE_CString &send_flow_name);
   // To be used by applications that wish to be both receivers and
   // senders.
 
-  FLOW_SPEC_HASH_MAP& map (void);
+  FLOW_SPEC_HASH_MAP map (void);
   // Returns the hash map of flowspecs indexed by flowspec name.
-
+  
 private:
-
-  // The Service Provider is currently set to NULL for all ACE_QoS.
+  
+  // The Service Provider is currently set to NULL for all ACE_QoS. 
   static const iovec iov_;
-
+  
   // A NO_TRAFFIC flow spec. Senders set the receiving qos to this
   // while the receivers set the sending qos to this.
   ACE_Flow_Spec *default_traffic_;
 
   // A list of flowspecs indexed by the flowspec name.
   FLOW_SPEC_HASH_MAP flow_spec_map_;
+
+
 };
 
 #endif /* FILL_ACE_QOS_H */
diff --git a/examples/QOS/Makefile b/examples/QOS/Makefile
index b688dd6b38d..c197ad6b6cf 100644
--- a/examples/QOS/Makefile
+++ b/examples/QOS/Makefile
@@ -2,304 +2,92 @@
 #
 # $Id$
 #
-LDLIBS += -lACE_QoS
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+#	Makefile for the Reactor multicast tests
+#----------------------------------------------------------------------------
 
-PSRC    = $(addsuffix .cpp,$(BIN))
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
 
-CLT_OBJS =					\
-		QoS_Signal_Handler.o		\
-		QoS_Util.o			\
-		Fill_ACE_QoS.o			\
-                client.o			\
+SIMPLE_CLT_OBJS = \
+		QoS_Signal_Handler.o \
+		QoS_Util.o \
+		Fill_ACE_QoS.o \
+                client.o \
                 Sender_QoS_Event_Handler.o
 
-SVR_OBJS =					\
-		QoS_Signal_Handler.o		\
-		QoS_Util.o			\
-		Fill_ACE_QoS.o			\
-                server.o			\
+SIMPLE_SVR_OBJS = \
+		QoS_Signal_Handler.o \
+		QoS_Util.o \
+		Fill_ACE_QoS.o \
+                server.o \
                 Receiver_QoS_Event_Handler.o
 
-BIN2 = server					\
-	client
+BUILD 	= $(VBIN)
+
+BIN = server \
+       client
 
-BIN = $(BIN2)
+LDLIBS = -lACE_QoS
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+# 	ACE stuff
 #----------------------------------------------------------------------------
 
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include		$(ACE_ROOT)/include/makeinclude/macros.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
-server: $(addprefix $(VDIR),$(SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+#	$(LINK.cc) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+
+client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+#	$(LINK.cc)  -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+.obj/Log_Wrapper.o .obj/Log_Wrapper.so .shobj/Log_Wrapper.o .shobj/Log_Wrapper.so: Log_Wrapper.cpp Log_Wrapper.h \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/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/QoS_Session.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/QoS/QoS_Session_Factory.h \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/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/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
- $(ACE_ROOT)/ace/QoS/ACE_QoS_Export.h \
- $(ACE_ROOT)/ace/QoS/QoS_Decorator.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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SOCK.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/QoS/QoS_Manager.h \
- $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.i \
- QoS_Util.h Fill_ACE_QoS.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.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_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/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 \
- QoS_Signal_Handler.h Receiver_QoS_Event_Handler.h
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/QoS_Session.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i \
  $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/QoS/QoS_Session_Factory.h \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(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_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.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/Memory_Pool.i \
- $(ACE_ROOT)/ace/QoS/ACE_QoS_Export.h \
- $(ACE_ROOT)/ace/QoS/QoS_Session_Impl.h \
- $(ACE_ROOT)/ace/QoS/QoS_Session_Impl.i \
- $(ACE_ROOT)/ace/QoS/QoS_Decorator.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/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -307,28 +95,6 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
  $(ACE_ROOT)/ace/IPC_SAP.i \
  $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/QoS/QoS_Manager.h \
- $(ACE_ROOT)/ace/QoS/SOCK_Dgram_Mcast_QoS.i \
- QoS_Util.h Fill_ACE_QoS.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.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_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/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 \
- QoS_Signal_Handler.h Sender_QoS_Event_Handler.h
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/QOS/QoS_Util.cpp b/examples/QOS/QoS_Util.cpp
index ffcd9e59e7f..bd789d911b4 100644
--- a/examples/QOS/QoS_Util.cpp
+++ b/examples/QOS/QoS_Util.cpp
@@ -14,9 +14,9 @@ QoS_Util::QoS_Util (int argc,
                     char *argv[])
   : argc_ (argc),
     argv_ (argv),
-    source_port_ (SENDER_PORT),
     protocol_ (IPPROTO_UDP),
-    multicast_flag_ (0)
+    multicast_flag_ (0),
+    source_port_ (SENDER_PORT)
 {
   ACE_NEW (this->mult_session_addr_,
            ACE_INET_Addr (ACE_DEFAULT_MULTICAST_PORT));
diff --git a/examples/QOS/Receiver_QoS_Event_Handler.cpp b/examples/QOS/Receiver_QoS_Event_Handler.cpp
index 5646e7670df..09ac1a87f28 100644
--- a/examples/QOS/Receiver_QoS_Event_Handler.cpp
+++ b/examples/QOS/Receiver_QoS_Event_Handler.cpp
@@ -81,7 +81,6 @@ Receiver_QoS_Event_Handler::handle_input (ACE_HANDLE)
 int
 Receiver_QoS_Event_Handler::handle_qos (ACE_HANDLE fd)
 {
-  ACE_UNUSED_ARG (fd);
 
   ACE_DEBUG ((LM_DEBUG,
               "\nReceived a QOS event. Inside handle_qos ()\n"));
diff --git a/examples/QOS/Sender_QoS_Event_Handler.cpp b/examples/QOS/Sender_QoS_Event_Handler.cpp
index 75eb6930942..5f52a42f554 100644
--- a/examples/QOS/Sender_QoS_Event_Handler.cpp
+++ b/examples/QOS/Sender_QoS_Event_Handler.cpp
@@ -116,10 +116,9 @@ Sender_QoS_Event_Handler::handle_qos (ACE_HANDLE)
 //      ACE_DEBUG ((LM_DEBUG,
 //                  "Getting QOS using ACE_OS::ioctl () succeeds.\n"));
 
-  char* msg = "Hello sent on a QoS enabled session !!\n";
   iovec iov[1];
-  iov[0].iov_base = msg;
-  iov[0].iov_len = ACE_OS_String::strlen(msg);
+  iov[0].iov_base = (char *) "Hello sent on a QoS enabled session !!\n";
+  iov[0].iov_len = ACE_OS::strlen (iov[0].iov_base);
 
   size_t bytes_sent = 0;
 
diff --git a/examples/QOS/client.dsp b/examples/QOS/client.dsp
index 38170cc779c..a52153dc44c 100644
--- a/examples/QOS/client.dsp
+++ b/examples/QOS/client.dsp
@@ -1,138 +1,138 @@
-# Microsoft Developer Studio Project File - Name="003" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=003 - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="003 - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "003 - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "003 - 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)" == "003 - 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 "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ws2_32.lib ACE_QoS.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"

-

-!ELSEIF  "$(CFG)" == "003 - 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 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib ACE_QoSd.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "003 - Win32 Release"

-# Name "003 - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Fill_ACE_QoS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Signal_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Util.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sender_QoS_Event_Handler.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\Fill_ACE_QoS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\FlowSpec_Dbase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Signal_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Util.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Sender_QOS_Event_Handler.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="003" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=003 - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "client.mak" CFG="003 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "003 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "003 - 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)" == "003 - 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 "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib ws2_32.lib ACE_QoS.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"
+
+!ELSEIF  "$(CFG)" == "003 - 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 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib ACE_QoSd.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "003 - Win32 Release"
+# Name "003 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Fill_ACE_QoS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Signal_Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Util.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sender_QoS_Event_Handler.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Fill_ACE_QoS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\FlowSpec_Dbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Signal_Handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Util.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Sender_QOS_Event_Handler.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/examples/QOS/server.dsp b/examples/QOS/server.dsp
index 714f288f210..08243a4a072 100644
--- a/examples/QOS/server.dsp
+++ b/examples/QOS/server.dsp
@@ -1,138 +1,138 @@
-# Microsoft Developer Studio Project File - Name="002" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=002 - 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="002 - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "002 - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "002 - 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)" == "002 - 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 "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib ACE_QoS.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"

-

-!ELSEIF  "$(CFG)" == "002 - 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 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /YX /FD /c

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib ACE_QoSd.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "002 - Win32 Release"

-# Name "002 - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Fill_ACE_QoS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Signal_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Util.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Receiver_QoS_Event_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\Fill_ACE_QoS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\FlowSpec_Dbase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Signal_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\QoS_Util.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Receiver_QOS_Event_Handler.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="002" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=002 - 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="002 - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "002 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "002 - 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)" == "002 - 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 "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib ACE_QoS.lib ws2_32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"
+
+!ELSEIF  "$(CFG)" == "002 - 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 /GX /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib ACE_QoSd.lib ws2_32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace" /libpath:"..\..\ace\QoS"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "002 - Win32 Release"
+# Name "002 - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Fill_ACE_QoS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Signal_Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Util.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Receiver_QoS_Event_Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\server.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Fill_ACE_QoS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\FlowSpec_Dbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Signal_Handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\QoS_Util.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Receiver_QOS_Event_Handler.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/examples/RMCast/Send_File/Makefile.bor b/examples/RMCast/Send_File/Makefile.bor
index 2bf2db27a10..489f89b29c4 100644
--- a/examples/RMCast/Send_File/Makefile.bor
+++ b/examples/RMCast/Send_File/Makefile.bor
@@ -1,18 +1,31 @@
 #
-# Makefile for building the RMCast Send_File ace examples
-#
+ # Makefile for building the RMCast Send_File ace examples
+ #
+
+ !include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+ TESTS = \
+        Receiver \
+        Sender
 
-NAMES = \
-	Receiver \
-	Sender
+all_tests: $(TESTS)
+
+LIBFILES = \
+	$(ACE_LIB) \
+        $(ACE_RMCAST_LIB)
+
+$(TESTS):
+	$(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
-CFLAGS = $(ACE_CFLAGS) $(ACE_RMCAST_CFLAGS)
+CFLAGS = $(ACE_CFLAGS)
 
 CPPDIR = .
 
-LIBFILES = $(ACE_LIB) $(ACE_RMCAST_LIB)
+LIBFILES = \
+        $(ACE_LIB) \
+        $(ACE_RMCAST_LIB)
+
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/examples/Reactor/Misc/signal_tester.cpp b/examples/Reactor/Misc/signal_tester.cpp
deleted file mode 100644
index 37613f14f38..00000000000
--- a/examples/Reactor/Misc/signal_tester.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// Perform an extensive test of the ACE_Reactor's event dispatching
-// $Id$
-
-// mechanisms.  These mechanisms illustrate how signals, I/O, and
-// timeout events can all be handled within the same framework.  In
-// addition, this example illustrates how to use the ACE_Reactor for
-// devices that perform I/O via signals (such as SVR4 message queues).
-
-
-#include "ace/Service_Config.h"
-
-// Used to shut down the event loop.
-static sig_atomic_t done = 0;
-
-// This class illustrates how to handle signal-driven I/O using the
-// ACE_Reactor framework.  Note that signals may be caught and
-// processed without requiring the use of global signal handler
-// functions or global signal handler data.
-
-class Sig_Handler : public ACE_Event_Handler
-{
-public:
-  Sig_Handler (void);
-  virtual ACE_HANDLE get_handle (void) const;
-  virtual int handle_input (ACE_HANDLE);
-  virtual int shutdown (ACE_HANDLE, ACE_Reactor_Mask);
-  virtual int handle_signal (ACE_HANDLE signum, siginfo_t * = 0, 
-			     ucontext_t * = 0);
-
-private:
-  ACE_HANDLE handle_;
-};
-
-// A dummy_handle is required to reserve a slot in the ACE_Reactor's
-// descriptor table.
-
-Sig_Handler::Sig_Handler (void)
-{
-  // Assign the Sig_Handler a dummy I/O descriptor.  Note that even
-  // though we open this file "Write Only" we still need to use the
-  // ACE_Event_Handler::NULL_MASK when registering this with the
-  // ACE_Reactor (see below).
-  this->handle_ = ACE_OS::open (ACE_DEV_NULL, O_WRONLY);
-  ACE_ASSERT (this->handle_ != -1);
-
-  // Register signal handler object.  Note that NULL_MASK is used to
-  // keep the ACE_Reactor from calling us back on the "/dev/null"
-  // descriptor.
-  if (ACE_Service_Config::reactor ()->register_handler 
-      (this, ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-
-  // Create a sigset_t corresponding to the signals we want to catch.
-  ACE_Sig_Set sig_set;
-
-  sig_set.sig_add (SIGINT);
-  sig_set.sig_add (SIGQUIT);
-  sig_set.sig_add (SIGALRM);  
-
-  // Register the signal handler object to catch the signals.
-  if (ACE_Service_Config::reactor ()->register_handler (sig_set, this) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
-}
-
-// Called by the ACE_Reactor to extract the fd.
-
-ACE_HANDLE
-Sig_Handler::get_handle (void) const
-{
-  return this->handle_;
-}
-
-// In a real application, this method would be where the read on the
-// signal-driven I/O device would occur asynchronously.  For now we'll
-// just print a greeting to let you know that everything is working
-// properly!
-
-int 
-Sig_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_DEBUG ((LM_DEBUG, "handling asynchonrous input...\n"));
-  return 0;
-}
-
-// In a real application, this method would do any cleanup activities
-// required when shutting down the I/O device.
-
-int 
-Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-{
-  ACE_DEBUG ((LM_DEBUG, "closing down Sig_Handler...\n"));
-  return 0;
-}
-
-// This method handles all the signals that are being caught by this
-// object.  In our simple example, we are simply catching SIGALRM,
-// SIGINT, and SIGQUIT.  Anything else is logged and ignored.
-//
-// There are several advantages to using this approach.  First, 
-// the behavior triggered by the signal is handled in the main event
-// loop, rather than in the signal handler.  Second, the ACE_Reactor's 
-// signal handling mechanism eliminates the need to use global signal 
-// handler functions and data. 
-
-int
-Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-{
-  ACE_DEBUG ((LM_DEBUG, "received signal %S\n", signum));
-
-  switch (signum)
-    {
-    case SIGALRM:
-      // Rearm the alarm.
-      ACE_OS::alarm (4);
-      break;
-    case SIGINT:
-      // Tell the ACE_Reactor to enable the ready bit for
-      // this->handle_.  The ACE_Reactor will subsequently call the
-      // Sig_Handler::handle_input method from within its event loop.
-      return ACE_Service_Config::reactor ()->ready_ops 
-	(this->handle_, ACE_Event_Handler::READ_MASK, ACE_Reactor::ADD_MASK);
-    case SIGQUIT:
-      ACE_DEBUG ((LM_DEBUG, "%S: shutting down signal tester\n", signum));
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default: 
-      ACE_DEBUG ((LM_DEBUG, 
-		  "%S: not handled, returning to program\n", signum));
-      break;
-    }
-  return 0;
-}
-
-// This class illustrates that the ACE_Reactor can handle signals,
-// STDIO, and timeouts using the same mechanisms.
-
-class STDIN_Handler : public ACE_Event_Handler
-{
-public:
-  STDIN_Handler (void);
-  virtual int handle_input (ACE_HANDLE);
-  virtual int handle_timeout (const ACE_Time_Value &, 
-			      const void *arg);
-};
-
-STDIN_Handler::STDIN_Handler (void)
-{
-  if (ACE::register_stdin_handler (this,
-				   ACE_Service_Config::reactor (),
-				   ACE_Service_Config::thr_mgr ()) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
-
-  // Register the STDIN_Handler to be dispatched once every second.
-  else if (ACE_Service_Config::reactor ()->schedule_timer
-	   (this, 0, ACE_Time_Value (1), ACE_Time_Value (1)) == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n%a", "schedule_timer", 1));
-}
-
-int 
-STDIN_Handler::handle_timeout (const ACE_Time_Value &tv,
-			       const void *)
-{
-  ACE_DEBUG ((LM_DEBUG, "timeout occurred at %d sec, %d usec\n",
-	      tv.sec (), tv.usec ()));
-  return 0;
-}
-
-// Read from input descriptor and write to stdout descriptor.
-
-int 
-STDIN_Handler::handle_input (ACE_HANDLE handle)
-{
-  ssize_t n;
-  char buf[BUFSIZ];
-
-  switch (n = ACE_OS::read (handle, buf, sizeof buf))
-    {
-    case -1:
-      if (errno == EINTR)
-	return 0;
-        /* NOTREACHED */
-      else
-	ACE_ERROR ((LM_ERROR, "%p\n", "read"));
-      /* FALLTHROUGH */
-    case 0:
-      ACE_Service_Config::end_reactor_event_loop ();
-      break;
-    default:
-      {
-	ssize_t result = ACE::write_n (ACE_STDOUT, buf, n);
-
-	if (result != n)
-	  ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "write"), 
-			    result == -1 && errno == EINTR ? 0 : -1);
-      }
-    }
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Service_Config daemon (argv [0]);
-
-  // Signal handler.
-  Sig_Handler sh;
-
-  // Define an I/O handler object.
-  STDIN_Handler ioh;
-
-  // Optionally start the alarm.
-  if (argc > 1)
-    ACE_OS::alarm (4);
-
-  // Loop handling signals and I/O events until SIGQUIT occurs.
-
-  while (daemon.reactor_event_loop_done () == 0)
-    daemon.run_reactor_event_loop ();
-
-  return 0;
-}
diff --git a/examples/Reactor/Misc/test_signals.cpp b/examples/Reactor/Misc/test_signals.cpp
deleted file mode 100644
index 6493667de12..00000000000
--- a/examples/Reactor/Misc/test_signals.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// Test the ability of the Reactor/Signal_Handler to register multiple
-// $Id$
-
-// handler per-signal.
-
-/* This test works as follows:
-	
-	1. To test the "original" semantics of ACE (i.e., only one
-	   ACE_Event_Handler can be registered per signal), you don't
-	   need to do anything special.  Existing programs work the
-	   same since giving the Reactor's constructor a 0 value
-	   (which is the default argument, BTW) instructs it to behave
-	   as before.  When a 0 is given, the ACE_Reactor's
-	   constructor/open method creates an instance of
-	   ACE_Sig_Handler and assigns this to an internal pointer.
-	   This pointer is then used to dispatch all signal-related
-	   methods within the Reactor.  The default ACE_Sig_Handler
-	   only allows *one* ACE_Event_Handler to be registered
-	   per-signal.
-
-	   To run this version of the test do the following:
-  
-	   % ./test-signal
-	   ./test_signals
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_2 (fruity, 0, 0) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 0, 0)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 0, 0) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           Note that in this test only one handler (the last one --
-	   "Sig_Handler_2 (fruity)") is actually registered.  BTW, the
-	   core dump is the expected behavior since the default
-	   disposition is restored when there are no more handlers
-	   (see the code below).
-
-	2. To test the "multiple handlers per-signal semantics", you
-	   need to pass the constructor/open method of the ACE_Reactor
-	   a pointer to a an instance of ACE_Sig_Handlers (note the
-	   plural "s").  ACE_Sig_Handlers is a class that derives from
-	   ACE_Sig_Handler.  The difference between these two classes
-	   is that (1) ACE_Sig_Handlers::register_signal allows
-	   multiple ACE_Event_Handlers to be registered per-signal and
-	   (2) it enables SA_RESTART by default.  This class also
-	   implements Detlef Becker's algorithm for integrating ACE
-	   signal handling with 3rd party libraries.
-
-	   To run this version of the test do the following:
-  
-	   % ./test_signals 1
-
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_1 (howdy, 3, 1) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Interrupt occurred in Sig_Handler_1 (doody, 5, 4) with count = 1
-	   shutting down SIGINT in Sig_Handler_1 (doody, 5, 4)
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 1
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 1
-	   waiting for SIGINT or SIGQUIT
-	   ^\
-	   signal Quit occurred in Sig_Handler_1 (howdy, 3, 1) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (howdy, 3, 1)
-	   signal Quit occurred in Sig_Handler_1 (doody, 5, 4) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_1 (doody, 5, 4)
-	   signal Quit occurred in Sig_Handler_2 (tutty, 7, 6) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (tutty, 7, 6)
-	   signal Quit occurred in Sig_Handler_2 (fruity, 9, 8) with count = 2
-	   shutting down SIGQUIT in Sig_Handler_2 (fruity, 9, 8)
-	   waiting for SIGINT or SIGQUIT
-	   ^C
-	   signal Interrupt occurred in external handler!
-	   signal Interrupt occurred in Sig_Handler_2 (tutty, 7, 6) with count = 3
-	   signal Interrupt occurred in Sig_Handler_2 (fruity, 9, 8) with count = 3
-	   waiting for SIGINT or SIGQUIT
-	   ^\Quit (core dumped)
-
-           When this test begins all four handlers are registered and
-           dispatched when a SIGINT or SIGQUIT occurs.  After the
-           first SIGINT, the handle_signal method of the Sig_Handler_1
-           objects unregister themselves.  At that point there are 4
-           SIGQUIT handlers left, but only 2 of our SIGINT handlers
-           left (and the 1 external handler).  After the first
-           SIGQUIT, there are no SIGQUIT handlers left since they all
-           deregister themselves (which restores the "SIG_DFL"
-           disposition).  On the second SIGINT there are only 3
-           handlers left (2 of ours and 1 external).  Finally, on the
-           second SIGQUIT we exit and dump core since that's what
-           happens with the default disposition for SIGQUIT. */
-
-#include "ace/Log_Msg.h"
-#include "ace/Reactor.h"
-
-class Sig_Handler_1 : public ACE_Event_Handler
-{
-public:
-  Sig_Handler_1 (ACE_Reactor &reactor, char *msg)
-    : msg_ (msg),
-      count_ (0),
-      reactor_ (reactor)
-  {
-    // Register the signal handlers.
-    this->quit_sigkey_ = reactor.register_handler (SIGQUIT, this);
-    this->int_sigkey_ = reactor.register_handler (SIGINT, this);
-
-    if (this->quit_sigkey_ == -1 || this->int_sigkey_ == -1)
-      ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_1 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 1 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else if (this->count_ != 2 && signum == SIGINT)
-      {
-	if (this->reactor_.remove_handler (SIGINT, 0, 0,
-					   this->int_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGINT in Sig_Handler_1 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    return 0;
-  }
-
-protected:
-  char *msg_;
-  int count_;
-  int int_sigkey_;
-  int quit_sigkey_;
-  ACE_Reactor &reactor_;
-};
-
-class Sig_Handler_2 : public Sig_Handler_1
-{
-public:
-  Sig_Handler_2 (ACE_Reactor &reactor, char *msg)
-    : Sig_Handler_1 (reactor, msg)
-  {
-  }
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *)
-  {
-    this->count_++;
-    ACE_DEBUG ((LM_DEBUG, 
-	       "\nsignal %S occurred in Sig_Handler_2 (%s, %d, %d) with count = %d",
-	       signum, this->msg_, this->int_sigkey_, this->quit_sigkey_, this->count_));
-    if (this->count_ != 0 && signum == SIGQUIT)
-      {
-	if (this->reactor_.remove_handler (SIGQUIT, 0, 0,
-					   this->quit_sigkey_) == -1)
-	  ACE_ERROR ((LM_ERROR, "\n%p", "remove_handler"));
-	else
-	  ACE_DEBUG ((LM_DEBUG, "\nshutting down SIGQUIT in Sig_Handler_2 (%s, %d, %d)",
-		     this->msg_, this->int_sigkey_, this->quit_sigkey_));
-      }
-    else
-      return 0;
-  }
-};
-
-static void
-external_handler (int signum)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nsignal %S occurred in external handler!", signum));
-}
-
-#if !defined (HPUX)
-int 
-main (int argc, char *argv)
-{
-  // If argc > 1 then allow multiple handlers per-signal, else just
-  // allow 1 handler per-signal.
-  ACE_Sig_Handlers multi_handlers;
-
-  ACE_Reactor reactor (argc > 1 ? &multi_handlers: 0);
-
-  if (argc > 1)
-    {
-      // Register an "external" signal handler so that the
-      // ACE_Sig_Handlers code will have something to incorporate!
-      ACE_SignalHandler eh = ACE_SignalHandler (external_handler);
-      ACE_Sig_Action sa (eh);
-
-      sa.register_action (SIGINT);
-    }
-
-  // Create a bevy of handlers.
-  Sig_Handler_1 h1 (reactor, "howdy"), h2 (reactor, "doody");
-  Sig_Handler_2 h3 (reactor, "tutty"), h4 (reactor, "fruity");
-
-  // Wait for user to type SIGINT and SIGQUIT.
-
-  for (;;)
-    {
-      ACE_DEBUG ((LM_DEBUG, "\nwaiting for SIGINT or SIGQUIT\n"));
-      reactor.handle_events ();
-    }
-  return 0;
-}
-#else
-int
-main (void)
-{
-  ACE_ERROR_RETURN ((LM_ERROR, "The HP C++ compiler is too lame to support this feature\n"), -1);
-}
-#endif /* HPUX */
diff --git a/examples/Service_Configurator/IPC-tests/client/makefile.bor b/examples/Service_Configurator/IPC-tests/client/makefile.bor
index 6acb4134761..8ca304c83ed 100644
--- a/examples/Service_Configurator/IPC-tests/client/makefile.bor
+++ b/examples/Service_Configurator/IPC-tests/client/makefile.bor
@@ -2,17 +2,24 @@
 # Makefile for building the ACE Service_Configurator IPC-tests client
 #
 
-NAMES = \
-	local_dgram_client_test \
-	local_stream_client_test \
-	local_pipe_client_test \
-	remote_stream_client_test \
-	remote_thr_stream_client_test \
-	remote_dgram_client_test \
-	local_fifo_client_test \
-	broadcast_client_test \
-	local_spipe_client_test \
-	remote_service_directory_test
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+CLIENTS = \
+       local_dgram_client_test \
+       local_stream_client_test \
+       local_pipe_client_test \
+       remote_stream_client_test \
+       remote_thr_stream_client_test \
+       remote_dgram_client_test \
+       local_fifo_client_test \
+       broadcast_client_test \
+       local_spipe_client_test \
+       remote_service_directory_test
+
+all_clients: $(CLIENTS)
+
+$(CLIENTS):
+     $(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
@@ -22,5 +29,5 @@ CPPDIR = .
 
 LIBFILES = $(ACE_LIB)
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
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 c5e96ed0416..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>;
-template class ACE_Malloc_T<ACE_Shared_Memory_Pool, ACE_SV_Semaphore_Simple, ACE_Control_Block>;
-#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Threads/Makefile.bor b/examples/Threads/Makefile.bor
index 228284446b2..dd56aebc0a6 100644
--- a/examples/Threads/Makefile.bor
+++ b/examples/Threads/Makefile.bor
@@ -2,31 +2,38 @@
 # Makefile for building the ACE Threads examples
 #
 
-NAMES = \
-	auto_event \
-	barrier1 \
-	barrier2 \
-	cancel \
-	future1 \
-	future2 \
-	manual_event \
-	process_manager \
-	process_mutex \
-	process_semaphore \
-	reader_writer \
-	recursive_mutex \
-	task_one \
-	task_two \
-	task_three \
-	task_four \
-	task_five \
-	thread_manager \
-	thread_pool \
-	thread_specific \
-	token \
-	tss1 \
-	tss2 \
-	wfmo
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+TESTS = \
+        auto_event \
+        barrier1 \
+        barrier2 \
+        cancel \
+        future1 \
+        future2 \
+        manual_event \
+        process_manager \
+        process_mutex \
+        process_semaphore \
+        reader_writer \
+        recursive_mutex \
+        task_one \
+        task_two \
+        task_three \
+        task_four \
+        task_five \
+        thread_manager \
+        thread_pool \
+        thread_specific \
+        token \
+        tss1 \
+        tss2 \
+        wfmo
+
+all_tests: $(TESTS)
+
+$(TESTS):
+	$(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
@@ -36,5 +43,6 @@ CPPDIR = .
 
 LIBFILES = $(ACE_LIB)
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+
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/html/index.html b/html/index.html
index bf34f43da57..0657dc0b690 100644
--- a/html/index.html
+++ b/html/index.html
@@ -16,51 +16,51 @@
     </P>
 
     <UL>
-      <LI><P><A HREF="ace/index.html">
+      <LI><P><A HREF="ace">
 	    The ACE library
 	  </A>
 	</P>
       </LI>
-      <LI><P><A HREF="ace/ssl/index.html">ACE SSL Adapters
+      <LI><P><A HREF="ace/ssl">ACE SSL Adapters
 	  </A>
 	</P>
       </LI>
-      <LI><P><A HREF="ace/rmcast/index.html">ACE Reliable Multicast
+      <LI><P><A HREF="ace/rmcast">ACE Reliable Multicast
 	    components
 	  </A>
 	</P>
       </LI>
-      <LI><P><A HREF="tao/index.html">
+      <LI><P><A HREF="tao">
 	    The TAO library and components
 	  </A>
 	</P>
       </LI>
-      <LI><P><A HREF="tao/portableserver/index.html">TAO_PortableServer:
+      <LI><P><A HREF="tao/portableserver">TAO_PortableServer:
 	  </A>
 	  TAO's Portable Object Adapter
 	</P>
       </LI>
-      <LI><P><A HREF="tao/dynamicany/index.html">TAO_DynamicAny:
+      <LI><P><A HREF="tao/dynamicany">TAO_DynamicAny:
 	  </A>
 	  TAO's implementation of Dynamic Anys.
 	</P>
       </LI>
-      <LI><P><A HREF="tao/dynamicinterface/index.html">TAO_DynamicInterface:
+      <LI><P><A HREF="tao/dynamicinterface">TAO_DynamicInterface:
 	  </A>
 	  TAO's implementation of DII/DSI.
 	</P>
       </LI>
-      <LI><P><A HREF="tao/smartproxies/index.html">TAO_SmartProxies:
+      <LI><P><A HREF="tao/smartproxies">TAO_SmartProxies:
 	  </A>n
 	  TAO's smart proxies support library.
 	</P>
       </LI>
-      <LI><P><A HREF="tao/iormanipulation/index.html">TAO_IORManipulation:
+      <LI><P><A HREF="tao/iormanipulation">TAO_IORManipulation:
 	  </A>
 	  TAO extension to manipulate IORs.
 	</P>
       </LI>
-      <LI><P><A HREF="tao/iortable/index.html">TAO_IORTable:
+      <LI><P><A HREF="tao/iortable">TAO_IORTable:
 	  </A>
 	  TAO's ad-hoc adapter for simple Object Keys.
 	</P>
@@ -69,20 +69,19 @@
 
     <hr>
     <UL>
-      <LI><P><A HREF="tao/implrepo_service/index.html">
-            Implementation Repository:
+      <LI><P><A HREF="tao/implrepo_service">Implementation Repository:
 	  </A>
 	  TAO's object activation daemon.
 	</P>
       </LI>
-      <LI><P><A HREF="tao/esf/index.html">TAO_ESF:
+      <LI><P><A HREF="tao/esf">TAO_ESF:
 	  </A>
 	  TAO's Event Service Framework,
 	  a collection of template classes used to implement TAO Event
 	  Services.
 	</P>
       </LI>
-      <LI><P><A HREF="tao/rtevent/index.html">TAO_RTEvent:
+      <LI><P><A HREF="tao/rtevent">TAO_RTEvent:
 	  </A>
 	  TAO's RT Event Service implementation.
 	</P>
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index 229bfd1feb8..f325d1c4069 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -19,7 +19,6 @@ ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG
 SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1
 !endif
 ACE_SSL_CFLAGS = -I$(ACE_ROOT) -DACE_SSL_HAS_DLL=$(DLL_FLAG)
-ACE_QOS_CFLAGS = -I$(ACE_ROOT) -DACE_QoS_HAS_DLL=$(DLL_FLAG)
 ACE_RMCAST_CFLAGS = -I$(ACE_ROOT) -DACE_RMCAST_HAS_DLL=$(DLL_FLAG)
 TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=$(DLL_FLAG)
 TAO_DOMAIN_FLAGS = -I$(ACE_ROOT)\TAO -DTAO_DOMAIN_HAS_DLL=$(DLL_FLAG)
@@ -63,7 +62,6 @@ ACE_LIB	= $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib
 SSL_LIB	= $(SSL_ROOT)\out32$(DLL_NAME)\libeay32.lib $(SSL_ROOT)\out32$(DLL_NAME)\ssleay32.lib
 !endif
 ACE_SSL_LIB = $(CORE_BINDIR)\ACE_SSL$(LIB_DECORATOR).lib
-ACE_QOS_LIB = $(CORE_BINDIR)\ACE_QoS$(LIB_DECORATOR).lib
 NETSVCS_LIB = $(CORE_BINDIR)\netsvcs$(LIB_DECORATOR).lib
 ACE_RMCAST_LIB = $(CORE_BINDIR)\ACE_RMCast$(LIB_DECORATOR).lib
 TAO_LIB	= $(CORE_BINDIR)\TAO$(LIB_DECORATOR).lib
diff --git a/include/makeinclude/outputdir.bor b/include/makeinclude/outputdir.bor
index 026dada72d0..d56853f8027 100644
--- a/include/makeinclude/outputdir.bor
+++ b/include/makeinclude/outputdir.bor
@@ -58,6 +58,8 @@ MAKE_BINDIR=$(MKDIR) "$(BINDIR)"
 MAKE_BINDIR=if not exist "$(BINDIR)" mkdir "$(BINDIR)"
 !endif
 
+# PASCAL/non-PASCAL build configurations use the same object directory
+# since their compiler options are identical.
 !ifndef OBJDIR
 OBJDIR=$(BASE_OBJDIR)\$(NAME)\$(STATIC_DIR)\$(DEBUG_DIR)\$(PASCAL_DIR)
 !endif
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 51d968c7f64..dbaceb528f4 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -45,8 +45,7 @@ CXX		= /opt/aCC/bin/aCC
 # If the user has requested building without threads, then don't set any
 # for 10.20, but for 11.00, the default is to use threads, so explicitly
 # turn them off if the user requested build without threads.
-# On HP-UX 11, even without building for threads, the *_r reentrant
-# functions are available, and _REENTRANT enables them.
+#
 ifeq ($(threads),1)
 ifeq ($(word 2,$(HPVERS_WORDS)), 11)
 THR_DEFS	= -DACE_HAS_THREADS -D_POSIX_C_SOURCE=199506L
@@ -55,12 +54,12 @@ THR_DEFS	= -DACE_HAS_THREADS -D_REENTRANT
 endif
 else
 ifeq ($(word 2,$(HPVERS_WORDS)), 11)
-THR_DEFS	= -DACE_HAS_THREADS=0 -D_REENTRANT
+THR_DEFS	= -DACE_HAS_THREADS=0
 endif
 endif
 
 # Suppress warning 302 ((...) parameter list is a non-portable feature)
-CCFLAGS		+= $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -w +W302
+CCFLAGS		+= $(CFLAGS) $(THR_DEFS) -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE -w +W302,129 
 
 # If exception support is explicitly disabled, tell the compiler.
 # This is not recommended since the run-time library can throw exceptions.
@@ -76,7 +75,7 @@ endif
 ifeq ($(word 2,$(HPVERS_WORDS)), 10)
 CCFLAGS         += +W495,667,829
 endif
-DCCFLAGS	+= -g
+DCFLAGS		+= -g
 DLD		= $(CXX) $(CCFLAGS)
 LD		= $(CXX)
 OCCFLAGS	= -O
diff --git a/include/makeinclude/platform_qnx_rtp_gcc.GNU b/include/makeinclude/platform_qnx_rtp_gcc.GNU
index 411528d1cb6..78475dcd181 100644
--- a/include/makeinclude/platform_qnx_rtp_gcc.GNU
+++ b/include/makeinclude/platform_qnx_rtp_gcc.GNU
@@ -13,20 +13,10 @@ ifeq (,$(optimize))
   optimize = 1
 endif # ! optimize
 
-#
-# This is a workaround needed only on QNX RTP.
-#
-TAO_DYNAMIC_LIBS=-lTAO_PortableServer
-TAO_COS_NAMING_LIBS=-lTAO_IORTable -lTAO_RTSched -lTAO_PortableServer -lTAO_Svc_Utils
-TAO_COS_NOTIFICATION_LIBS=-lTAO_Svc_Utils -lTAO_DynamicAny
-TAO_RT_SCHED_LIBS=-lTAO_PortableServer
-TAO_FAULT_TOLERANCE_LIBS=-lTAO_IORManip
-TAO_COS_TRADING_LIBS=-lTAO_Svc_Utils
-
 CC      = gcc
 CXX     = g++
 CFLAGS  += -pipe -W -Wall -Wpointer-arith
-CCFLAGS += $(CFLAGS) -fno-implicit-templates -fexceptions
+CCFLAGS += $(CFLAGS) -fno-implicit-templates
 
 #
 # Under the current version of QNX RTP ACE crashes
@@ -46,5 +36,3 @@ ARFLAGS = ruv
 SOFLAGS = -G $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true
-
-exceptions=1
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 028a513756e..fdb837f3e3b 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -10,11 +10,6 @@
 # NOTE: On Solaris86, you'll need to use GNU as instead of /usr/ccs/bin/as,
 #       if you want -gstabs+ and -pipe support.
 
-ACE_HAS_GNUG_PRE_2_8 := \
-  $(shell \
-    if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \
-    echo 1; else echo 0; fi)
-
 ifeq (,$(debug))
   debug = 1
 endif
@@ -30,14 +25,11 @@ ifeq ($(threads),0)
 endif # threads
 
 ifeq (,$(exceptions))
-exceptions = 0
+ exceptions = 0
 endif
-# if we are not working with old gcc ...
-ifeq ($(ACE_HAS_GNUG_PRE_2_8),0)
-ifeq ($(exceptions),0) 
-CFLAGS += -fno-exceptions
+ifeq ($(exceptions),0)
+ CFLAGS += -fno-exceptions
 endif # exceptions
-endif # ! ACE_HAS_GNUG_PRE_2_8
 
 ifeq ($(shell /bin/uname -m),i86pc)
   #### gcc on Solaris86 doesn't use -g
diff --git a/include/makeinclude/platform_unixware_udk.GNU b/include/makeinclude/platform_unixware_udk.GNU
deleted file mode 100644
index 60e85b62649..00000000000
--- a/include/makeinclude/platform_unixware_udk.GNU
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-
-# UnixWare V2.2.1.2 with g++ version 2.7.2.2 *not* using Orbix
-
-#ifndef debug
-debug = 1
-#endif
-
-#ifndef exceptions
-exceptions = 1
-#endif
-
-#ifndef threads
-threads = 1
-#endif
-
-
-CC              = CC
-CXX             = CC
-
-CFLAGS         += -Kthread 
-
-#CFLAGS          += -W -Wall -Wpointer-arith 
-CCFLAGS         += $(CFLAGS) -Tno_implicit,no_auto,none -Wf,--display_error_number
-
-#ifeq ($(exceptions),1)
-#  CCFLAGS += -fexceptions
-#endif
-
-DCFLAGS         += -g
-#DCFLAGS         += -g
-
-OCCFLAGS         += -O2
-
-DLD             = $(CXX) -g
-LD              = $(CXX)
-LIBS            += -lsocket -lnsl -lgen
-PIC             = -KPIC
-AR              = ar
-ARFLAGS         = ruv
-RANLIB          = /bin/true
-#SOFLAGS        = -assert pure-text
-SOFLAGS         = -G
-# SOBUILD - compile into .so directly
-SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-# SOLINK        = $(SOLINK.cc) -o $@ $(LDFLAGS) $<
-PRELIB          = @true
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 3d7c3049978..8092c423d93 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -120,8 +120,6 @@ ifeq ($(CPU),I80486)
   #### Note: -fno-implicit-templates doesn't seem to work well with g++
   #### cygnus-2.7.2-960126 for pc486 target.  Some member functions don't
   #### get instantiated.  Wind River knows about this problem (SPR 8483).
-  #### -fno-implicit-templates should be supported on Tornado II, so
-  #### it is added for that platform below.
   BINXSYM_NAME = xsymDec
   CFLAGS += -DCPU=I80486 -m486
   TOOLENV = 386
@@ -224,10 +222,6 @@ endif # ! ACE_CC_VERSION
 ifeq (egcs,$(findstring egcs,$(ACE_CC_VERSION)))
   ACE_HAS_GNUG_PRE_2_8 := 0
   CFLAGS += -DACE_VXWORKS=0x540
-  ifeq ($(TOOLENV),386)
-    #### Tornado II should support -fno-implicit-templates for pc486.
-    CCFLAGS += -fno-implicit-templates
-  endif # 386
   ifneq (1,$(exceptions))
     #### With exceptions, this is applied in wrapper_macros.GNU.
     #### Without, we do it here.
diff --git a/include/makeinclude/recurse.bor b/include/makeinclude/recurse.bor
index 39da3de86fe..0a353e73c45 100644
--- a/include/makeinclude/recurse.bor
+++ b/include/makeinclude/recurse.bor
@@ -5,15 +5,10 @@
 # ~~~~~~~ 
 # DIRS - list of sub-directories to invoke make in
 # MAKEFILES - list of makefiles to be run
-# NAMES - list of names of targets to be built
 #
 
 !include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
-# We want to avoid all of this recursion if this is a multi-target sub-make.
-!ifndef TARGET_NAME
-# This is not a multi-target sub-make ...
-
 !ifdef DIRS
 
 all: $(DIRS)
@@ -138,80 +133,3 @@ $(MAKEFILES_INSTALL):
        $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(<:.Install=) install
 
 !endif
-
-!ifdef NAMES
-
-# This macro may be defined in the environment (e.g. the nightly build
-# scripts) so we need to remove it.
-!undef NAME
-
-# Multi-target recursion assumes Makefile.bor. For multiple targets in
-# makefiles with other names, you must set the MAKEFILE variable to the
-# name of the file.
-!ifndef MAKEFILE
-MAKEFILE = Makefile.bor
-!endif
-
-# This ugliness is to remove extra spaces from between the items in the list.
-NAMES_ALL_1 = $(NAMES) $(BLANK_SPACE)
-NAMES_ALL_2 = $(NAMES_ALL_1: =%)
-NAMES_ALL_3 = $(NAMES_ALL_2:%%=%)
-NAMES_ALL_4 = $(NAMES_ALL_3:%%=%)
-NAMES_ALL = $(NAMES_ALL_4:%=.All )
-
-all: $(NAMES_ALL)
-
-$(NAMES_ALL):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.All=)
-
-# This ugliness is to remove extra spaces from between the items in the list.
-NAMES_CLEAN_1 = $(NAMES) $(BLANK_SPACE)
-NAMES_CLEAN_2 = $(NAMES_CLEAN_1: =%)
-NAMES_CLEAN_3 = $(NAMES_CLEAN_2:%%=%)
-NAMES_CLEAN_4 = $(NAMES_CLEAN_3:%%=%)
-NAMES_CLEAN = $(NAMES_CLEAN_4:%=.Clean )
-
-clean: $(NAMES_CLEAN)
-
-$(NAMES_CLEAN):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Clean=) clean
-
-# This ugliness is to remove extra spaces from between the items in the list.
-NAMES_REALCLEAN_1 = $(NAMES) $(BLANK_SPACE)
-NAMES_REALCLEAN_2 = $(NAMES_REALCLEAN_1: =%)
-NAMES_REALCLEAN_3 = $(NAMES_REALCLEAN_2:%%=%)
-NAMES_REALCLEAN_4 = $(NAMES_REALCLEAN_3:%%=%)
-NAMES_REALCLEAN = $(NAMES_REALCLEAN_4:%=.RealClean )
-
-realclean: $(NAMES_REALCLEAN)
-
-$(NAMES_REALCLEAN):
-	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.RealClean=) realclean
-
-# This ugliness is to remove extra spaces from between the items in the list.
-NAMES_INSTALL_1 = $(NAMES) $(BLANK_SPACE)
-NAMES_INSTALL_2 = $(NAMES_INSTALL_1: =%)
-NAMES_INSTALL_3 = $(NAMES_INSTALL_2:%%=%)
-NAMES_INSTALL_4 = $(NAMES_INSTALL_3:%%=%)
-NAMES_INSTALL = $(NAMES_INSTALL_4:%=.Install )
-
-install: $(NAMES_INSTALL)
-
-$(NAMES_INSTALL):
-       $(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f$(MAKEFILE) -DTARGET_NAME=$(<:.Install=) install
-
-!endif
-
-!else
-# This is a multi-target sub-make ...
-
-# Set the name of the current target.
-NAME = $(TARGET_NAME)
-
-# The list of object files defaults to the contents of a macro based on the
-# target name.
-!ifndef OBJFILES
-OBJFILES = $($(NAME)_OBJFILES)
-!endif
-
-!endif
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index e05ed654dbb..e4a3ceb5cd4 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -216,9 +216,8 @@ endif
 
 clean.local:
 	-$(RM) *.$(OBJEXT) *~ *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-$(RM) -r $(OBJDIRS) $(TEMPINCDIR) cxx_repository ptrepository
-	-$(RM) -r Templates.DB gcctemp.c gcctemp so_locations *.ics
-	-$(RM) -r SunWS_cache ir.out
+	-$(RM) -r $(OBJDIRS) $(TEMPINCDIR) cxx_repository ptrepository \
+Templates.DB gcctemp.c gcctemp so_locations *.ics
 
 realclean.local: clean.local
 	-$(RM) $(BIN) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2) $(BIN2:%=%_debug) $(BIN2:%=%_profile) $(BIN2:%=%_optimize) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%)
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 891187c3831..5fed6644b06 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -1,5 +1,3 @@
-# -*- Makefile -*-
-
 #----------------------------------------------------------------------------
 #  $Id$
 #----------------------------------------------------------------------------
@@ -305,7 +303,7 @@ endif # split
 ifneq ($(split),)
   override split_target = SPLIT
   override debug = 0
-  CPPFLAGS += -DACE_IS_SPLITTING
+  CFLAGS += -DACE_IS_SPLITTING
 else
   override split_target =
 endif # split
@@ -315,10 +313,10 @@ ifeq ($(debug),0)
 endif # debug
 
 ifeq ($(debug),)
-  CPPFLAGS += -DACE_NDEBUG
-# Disable the RCSID for release/non-debug builds.
-  ifeq (,$(findstring ACE_USE_RCSID,$(CPPFLAGS)))
-    CPPFLAGS += -DACE_USE_RCSID=0
+  ifeq (,$(findstring $(CFLAGS),$(CCFLAGS)))
+    CCFLAGS += -DACE_NDEBUG
+  else
+    CFLAGS  += -DACE_NDEBUG
   endif
 else
   CFLAGS  += $(DCFLAGS)
@@ -456,9 +454,9 @@ endif # pace
 
 ifneq ($(pace),)
   ifneq ($(inline),0)
-    CPPFLAGS += -DPACE_HAS_INLINE=1
+    CFLAGS += -DPACE_HAS_INLINE=1
   endif
-  CPPFLAGS += -DACE_HAS_PACE -DPACE_HAS_ALL_POSIX_FUNCS -I$(ACE_ROOT)/PACE
+  CFLAGS += -DACE_HAS_PACE -DPACE_HAS_ALL_POSIX_FUNCS -I$(ACE_ROOT)/PACE
   ACELIB = -lACE
   ifeq ($(inline),0)
     ACELIB += -lPACE
@@ -477,10 +475,10 @@ ifneq ($(profile),)
 endif # profile
 
 ifeq ($(inline),0)
-  CPPFLAGS += -DACE_NO_INLINE
+  CCFLAGS += -DACE_NO_INLINE
 else
 ifeq ($(inline),1)
-  CPPFLAGS += -D__ACE_INLINE__
+  CCFLAGS += -D__ACE_INLINE__
 endif # inline eq 1
 endif # inline eq 0
 
@@ -562,7 +560,7 @@ ifeq ($(probe),0)
 endif # probe
 
 ifeq ($(probe),1)
-    CPPFLAGS += -DACE_COMPILE_TIMEPROBES
+    CCFLAGS += -DACE_COMPILE_TIMEPROBES
 endif # probe
 
 ifeq ($(purify),0)
@@ -583,7 +581,8 @@ ifdef purify
   PURELINK += purify -best-effort -cache-dir=$(PURE_CACHE_DIR) \
               -chain-length=20 -fds-inuse-at-exit=no \
               -inuse-at-exit -max_threads=100
-  CPPFLAGS += -DACE_HAS_PURIFY -I$(ACE_PURIFY_DIR)
+  CCFLAGS += -DACE_HAS_PURIFY
+  CPPFLAGS += -I$(ACE_PURIFY_DIR)
 endif # purify
 
 ifeq ($(quantify),0)
@@ -600,7 +599,8 @@ ifdef quantify
   #### to help avoid occasional link failure.
   PRELINK += quantify -best-effort -cache-dir=$(PURE_CACHE_DIR) \
              -max_threads=100
-  CPPFLAGS += -DACE_HAS_QUANTIFY -I$(ACE_QUANTIFY_DIR)
+  CCFLAGS += -DACE_HAS_QUANTIFY
+  CPPFLAGS += -I$(ACE_QUANTIFY_DIR)
 
   ifeq ($(shell uname -p),sparc)
     PRELINK += -record-register-window-traps
@@ -614,8 +614,7 @@ endif # repo
 ifdef repo
   #### Remove -fno-implicit-templates from, and add -frepo to, CCFLAGS.
   CCFLAGS := $(strip $(subst -fno-implicit-templates,,$(CCFLAGS)))
-  CCFLAGS += -frepo
-  CPPFLAGS += -DACE_HAS_GNU_REPO
+  CCFLAGS += -frepo -DACE_HAS_GNU_REPO
 #  ace_lib_prelink := 1
 endif # repo
 
diff --git a/netsvcs/ACE-netsvcs.html b/netsvcs/ACE-netsvcs.html
index 262652c6a7d..a6f423c51b7 100644
--- a/netsvcs/ACE-netsvcs.html
+++ b/netsvcs/ACE-netsvcs.html
@@ -12,7 +12,8 @@ bgcolor="#ffffff">
 <HR>
 <H3>Overview of the ACE Network Services</H3>
 
-ACE provides a <A HREF=".">
+ACE provides a <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/netsvcs/">
 standard library</A> of network services:<P>
 
 <TABLE>
@@ -52,7 +53,8 @@ HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#config">Service
 Configurator</A>, which is an object-oriented framework that automates
 the configuration and reconfiguration of multi-service daemons.  All
 the ACE network services are configured using the Service
-Configurator.  Please refer to the <A HREF="../ACE-INSTALL.html">online
+Configurator.  Please refer to the <A
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">online
 documentation</a> for more information on installing and testing the
 ACE network services.<P>
 
diff --git a/netsvcs/clients/Logger/Makefile.bor b/netsvcs/clients/Logger/Makefile.bor
index e7fd9236428..9e8a4c7a5a9 100644
--- a/netsvcs/clients/Logger/Makefile.bor
+++ b/netsvcs/clients/Logger/Makefile.bor
@@ -1,16 +1,16 @@
 
-NAMES = \
+APPS = \
 	direct_logging \
 	indirect_logging
 
-OBJFILES=$(OBJDIR)\$(NAME).obj
-
-CFLAGS = $(ACE_CFLAGS)
+build_apps: $(APPS)
 
-CPPDIR = .
+$(APPS):
+	$(MAKE) -f Makefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
-LIBFILES = $(ACE_LIB)
+!ifdef NAME
+OBJFILES=$(OBJDIR)\$(NAME).obj
+!endif
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+!include <$(ACE_ROOT)\netsvcs\build.bor>
 
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/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp
index 822240f6a9f..1e7ac2d8823 100644
--- a/netsvcs/clients/Tokens/collection/collection.cpp
+++ b/netsvcs/clients/Tokens/collection/collection.cpp
@@ -1,6 +1,6 @@
+// ============================================================================
 // $Id$
 
-// ============================================================================
 //
 // = LIBRARY
 //    examples
@@ -29,7 +29,7 @@
 
 ACE_RCSID(collection, collection, "$Id$")
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY)
+#if defined (ACE_HAS_THREADS)
 
 static const char *server_host = ACE_DEFAULT_SERVER_HOST;
 static int server_port = ACE_DEFAULT_SERVER_PORT;
@@ -208,4 +208,4 @@ main (int, char *[])
   ACE_ERROR_RETURN ((LM_ERROR, 
 		     "threads not supported on this platform\n"), -1);
 }
-#endif /* ACE_HAS_THREADS && ACE_HAS_TOKENS_LIBRARY */
+#endif /* ACE_HAS_THREADS */
diff --git a/netsvcs/clients/Tokens/collection/rw_locks.cpp b/netsvcs/clients/Tokens/collection/rw_locks.cpp
index e48f0e5db0d..dd35de3d9c2 100644
--- a/netsvcs/clients/Tokens/collection/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/collection/rw_locks.cpp
@@ -6,10 +6,10 @@
 #include "ace/Remote_Tokens.h"
 #include "ace/Thread_Manager.h"
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY)
-
 ACE_RCSID(collection, rw_locks, "$Id$")
 
+#if defined (ACE_HAS_THREADS)
+
 static ACE_Token_Proxy *global_rlock;
 static ACE_Token_Proxy *global_wlock;
 
diff --git a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
index 9b4c12b77e1..4a7b1bc5a39 100644
--- a/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
+++ b/netsvcs/clients/Tokens/deadlock/deadlock_detection_test.cpp
@@ -1,6 +1,6 @@
+// ============================================================================
 // $Id$
 
-// ============================================================================
 //
 // = LIBRARY
 //    examples
@@ -23,10 +23,10 @@
 #include "ace/Get_Opt.h"
 #include "ace/Token_Invariants.h"
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY)
-
 ACE_RCSID(deadlock, deadlock_detection_test, "$Id$")
 
+#if defined (ACE_HAS_THREADS)
+
 typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS;
 
 static ACE_Token_Proxy *global_mutex;
diff --git a/netsvcs/clients/Tokens/invariant/invariant.cpp b/netsvcs/clients/Tokens/invariant/invariant.cpp
index f5c223c3568..b2b55df3605 100644
--- a/netsvcs/clients/Tokens/invariant/invariant.cpp
+++ b/netsvcs/clients/Tokens/invariant/invariant.cpp
@@ -1,6 +1,6 @@
+// ============================================================================
 // $Id$
 
-// ============================================================================
 //
 // = LIBRARY
 //    examples
@@ -21,10 +21,10 @@
 #include "ace/Thread_Manager.h"
 #include "ace/Token_Invariants.h"
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY)
-
 ACE_RCSID(invariant, invariant, "$Id$")
 
+#if defined (ACE_HAS_THREADS)
+
 typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS;
 
 static const char *rwname = "reader/writer";
diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp
index 1393150f751..c8435a9d461 100644
--- a/netsvcs/clients/Tokens/manual/manual.cpp
+++ b/netsvcs/clients/Tokens/manual/manual.cpp
@@ -1,5 +1,4 @@
 // $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -27,8 +26,6 @@
 #include "ace/Map_Manager.h"
 #include "ace/Service_Config.h"
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY)
-
 ACE_RCSID(manual, manual, "$Id$")
 
 typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS;
@@ -369,12 +366,3 @@ template class ACE_Map_Reverse_Iterator<STDIN_Token::TID, ACE_Token_Collection *
 #pragma instantiate ACE_Map_Iterator<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Reverse_Iterator<STDIN_Token::TID, ACE_Token_Collection *, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#else
-int 
-main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "threads or ACE_HAS_TOKENS_LIBRARY not supported on this platform\n"), -1);
-}
-#endif /* ACE_HAS_THREADS && ACE_HAS_TOKENS_LIBRARY */
diff --git a/netsvcs/clients/Tokens/mutex/test_mutex.cpp b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
index b15243dffba..a6a29a9bed3 100644
--- a/netsvcs/clients/Tokens/mutex/test_mutex.cpp
+++ b/netsvcs/clients/Tokens/mutex/test_mutex.cpp
@@ -1,6 +1,6 @@
+// ============================================================================
 // $Id$
 
-// ============================================================================
 //
 // = LIBRARY
 //    examples
@@ -22,10 +22,10 @@
 #include "ace/Thread.h"
 #include "ace/Thread_Manager.h"
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY)
-
 ACE_RCSID(mutex, test_mutex, "$Id$")
 
+#if defined (ACE_HAS_THREADS)
+
 static ACE_Token_Proxy *mutex;
 static int remote_mutexes = 0;
 static const char *server_host = ACE_DEFAULT_SERVER_HOST;
diff --git a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
index f9d8da9eb9c..37e9d0e3886 100644
--- a/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
+++ b/netsvcs/clients/Tokens/rw_lock/rw_locks.cpp
@@ -1,6 +1,6 @@
+// ============================================================================
 // $Id$
 
-// ============================================================================
 //
 // = LIBRARY
 //    examples
@@ -24,10 +24,10 @@
 #include "ace/Thread_Manager.h"
 #include "ace/Token_Invariants.h"
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_THREADS_LIBRARY)
-
 ACE_RCSID(rw_lock, rw_locks, "$Id$")
 
+#if defined (ACE_HAS_THREADS)
+
 typedef ACE_Token_Invariant_Manager ACE_TOKEN_INVARIANTS;
 
 static ACE_Token_Proxy *global_rlock;
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/Server_Logging_Handler.i b/netsvcs/lib/Server_Logging_Handler.i
deleted file mode 100644
index 57c6d26e751..00000000000
--- a/netsvcs/lib/Server_Logging_Handler.i
+++ /dev/null
@@ -1,4 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
diff --git a/netsvcs/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index 9a68d50ef8f..35cb49706b1 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -197,7 +197,7 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::scheduling_strategy (void)
 template<class SLH, class LMR, class SST> int
 ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
 {
-  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init");
+  ACE_TRACE ("ACE_Server_Logging_Acceptor<SLH, LMR, SST>::init");
 
   // Use the options hook to parse the command line arguments and set
   // options.
@@ -239,7 +239,7 @@ ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::init (int argc, char *argv[])
 template<class SLH, class LMR, class SST> int
 ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args (int argc, char *argv[])
 {
-  ACE_TRACE ("ACE_Server_Logging_Acceptor_T<SLH, LMR, SST>::parse_args");
+  ACE_TRACE ("ACE_Server_Logging_Acceptor<SLH, LMR, SST>::parse_args");
 
   this->service_port_ = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp
index c58fabbaed8..c61e2825402 100644
--- a/netsvcs/lib/Token_Handler.cpp
+++ b/netsvcs/lib/Token_Handler.cpp
@@ -5,8 +5,6 @@
 #include "ace/Get_Opt.h"
 #include "Token_Handler.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 ACE_RCSID(lib, Token_Handler, "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -331,7 +329,7 @@ ACE_Token_Handler::get_proxy (void)
 ACE_Token_Proxy *
 ACE_Token_Handler::create_proxy (void)
 {
-  ACE_TRACE ("ACE_Token_Handler::create_proxy");
+  ACE_TRACE ("ACE_Token_Handler::new_proxy");
 
   ACE_Token_Proxy *proxy;
 
@@ -656,5 +654,3 @@ ACE_TS_WLock::clone (void) const
   ACE_NEW_RETURN (temp, ACE_TS_WLock (*this), 0);
   return temp;
 }
-
-#endif /* ACE_HAS_TOKENS_LIBRARY */
diff --git a/netsvcs/lib/Token_Handler.h b/netsvcs/lib/Token_Handler.h
index 057336d79f7..9a6234c4325 100644
--- a/netsvcs/lib/Token_Handler.h
+++ b/netsvcs/lib/Token_Handler.h
@@ -29,8 +29,6 @@
 #include "ace/Token_Collection.h"
 #include "ace/Token_Request_Reply.h"
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
-
 class ACE_Svc_Export ACE_Token_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
   // = TITLE
@@ -259,5 +257,4 @@ private:
 
 ACE_SVC_FACTORY_DECLARE (ACE_Token_Acceptor)
 
-#endif /* ACE_HAS_TOKENS_LIBRARY */
 #endif /* ACE_TOKEN_HANDLER_H */
diff --git a/netsvcs/lib/netsvcs.dsp b/netsvcs/lib/netsvcs.dsp
index 5be18c2a825..b7d7626d702 100644
--- a/netsvcs/lib/netsvcs.dsp
+++ b/netsvcs/lib/netsvcs.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+# TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=NETSVCS Library - Win32 Debug

+CFG=NETSVCS Library - Win32 Alpha Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,21 +14,20 @@ CFG=NETSVCS Library - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "netsvcs.mak" CFG="NETSVCS Library - Win32Debug"

+!MESSAGE NMAKE /f "netsvcs.mak" CFG="NETSVCS Library - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "NETSVCS Library - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "NETSVCS Library - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "NETSVCS Library - Win32 Alpha Debug" (based on "Win32 (ALPHA) Dynamic-Link Library")

+!MESSAGE "NETSVCS Library - Win32 Alpha Release" (based on "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

@@ -42,11 +42,14 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\netsvcs"

+CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -69,11 +72,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\netsvcs"

+CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

+MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -83,38 +89,166 @@ LINK32=link.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

 # ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\netsvcsd.dll" /libpath:"..\..\ace"

 

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "netsvcs\Alpha Debug"

+# PROP BASE Intermediate_Dir "netsvcs\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "netsvcs"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "netsvcs"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /MDd /c

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /libpath:"..\..\ace"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "netsvcs\Alpha Release"

+# PROP BASE Intermediate_Dir "netsvcs\Alpha Release"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "netsvcs"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir "netsvcs"

+CPP=cl.exe

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /machine:ALPHA /libpath:"..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:ALPHA /libpath:"..\..\ace"

+

 !ENDIF 

 

 # Begin Target

 

 # Name "NETSVCS Library - Win32 Release"

 # Name "NETSVCS Library - Win32 Debug"

+# Name "NETSVCS Library - Win32 Alpha Debug"

+# Name "NETSVCS Library - Win32 Alpha Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Client_Logging_Handler.cpp

+

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Name_Handler.cpp

+

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Server_Logging_Handler.cpp

+

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\Token_Handler.cpp

+

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TS_Clerk_Handler.cpp

+

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

 SOURCE=.\TS_Server_Handler.cpp

+

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

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 6c7503c88ba..d797058b55d 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -82,7 +82,6 @@ main (int argc, char *argv[])
                         "TS Clerk Processor",
                         1));
 
-#if defined (ACE_HAS_TOKENS_LIBRARY)
           char token_port[] = "-p " ACE_DEFAULT_TOKEN_SERVER_PORT_STR;
           l_argv[0] = token_port;
           l_argv[1] = 0;
@@ -93,7 +92,6 @@ main (int argc, char *argv[])
                         "%p\n%a",
                         "Token Service",
                         1));
-#endif /* ACE_HAS_TOKENS_LIBRARY */
 
           char thr_logging_port[] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
           l_argv[0] = thr_logging_port;
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/servers.dsp b/netsvcs/servers/servers.dsp
index 327449b120f..b6f4622b1ce 100644
--- a/netsvcs/servers/servers.dsp
+++ b/netsvcs/servers/servers.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=NETSVCS Servers - Win32 Debug

+CFG=NETSVCS Servers - Win32 Alpha Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,20 +14,23 @@ CFG=NETSVCS Servers - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "servers.mak" CFG="NETSVCS Servers - Win32 Debug"

+!MESSAGE NMAKE /f "servers.mak" CFG="NETSVCS Servers - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "NETSVCS Servers - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "NETSVCS Servers - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Servers - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Servers - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Servers - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) Console Application")

+!MESSAGE "NETSVCS Servers - Win32 Alpha Release" (based on\

+ "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "NETSVCS Servers - Win32 Release"

 

@@ -41,9 +45,11 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,9 +72,11 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\lib" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -78,18 +86,85 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386

 # ADD LINK32 aced.lib netsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

 

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "servers_"

+# PROP BASE Intermediate_Dir "servers_"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\lib" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\lib" /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MDd /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 aced.lib netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

+# ADD LINK32 aced.lib netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Alpha Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "servers0"

+# PROP BASE Intermediate_Dir "servers0"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 ace.lib netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

+# ADD LINK32 ace.lib netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

+

 !ENDIF 

 

 # Begin Target

 

 # Name "NETSVCS Servers - Win32 Release"

 # Name "NETSVCS Servers - Win32 Debug"

+# Name "NETSVCS Servers - Win32 Alpha Debug"

+# Name "NETSVCS Servers - Win32 Alpha Release"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\main.cpp

+

+!IF  "$(CFG)" == "NETSVCS Servers - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Alpha Release"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/netsvcs/servers/svc.conf b/netsvcs/servers/svc.conf
index 6b18ec3921a..4c1bf74fe18 100644
--- a/netsvcs/servers/svc.conf
+++ b/netsvcs/servers/svc.conf
@@ -11,8 +11,7 @@
 dynamic Logger Service_Object * ACE:_make_ACE_Logging_Strategy() "-s foobar -f STDERR|OSTREAM|VERBOSE"
 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"
-# This service is disabled by default -- only enable it ACE is compiled with ACE_HAS_TOKENS_LIBRARY.
-# dynamic Token_Service Service_Object * netsvcs:_make_ACE_Token_Acceptor() "-p 20202"
+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/RPC/run_test.pl b/performance-tests/RPC/run_test.pl
deleted file mode 100755
index 408e201270f..00000000000
--- a/performance-tests/RPC/run_test.pl
+++ /dev/null
@@ -1,34 +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';
-use PerlACE::Run_Test;
-
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client", "-i 10000 -h localhost");
-
-$status = 0;
-
-$SV->Spawn ();
-
-sleep 5;
-
-$client = $CL->SpawnWaitKill (60);
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-if ($client != 0) {
-    print "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/performance-tests/TCP/README b/performance-tests/TCP/README
index ac486524c78..eeb8d65b368 100644
--- a/performance-tests/TCP/README
+++ b/performance-tests/TCP/README
@@ -6,7 +6,7 @@ simply echos packets back to the client.
 
 To run:
   1) On server host:
-     % ./tcp_test -s
+     % ./tcp_test -c
 
   2) On client host:
      % ./tcp_test -i 10000 <server host>
diff --git a/performance-tests/TCP/run_test.pl b/performance-tests/TCP/run_test.pl
deleted file mode 100755
index cd58c5ec2c7..00000000000
--- a/performance-tests/TCP/run_test.pl
+++ /dev/null
@@ -1,34 +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';
-use PerlACE::Run_Test;
-
-$SV = new PerlACE::Process ("tcp_test", "-s");
-$CL = new PerlACE::Process ("tcp_test", "-c localhost -i 50000 -b 64");
-
-$status = 0;
-
-$SV->Spawn ();
-
-sleep 5;
-
-$client = $CL->SpawnWaitKill (60);
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-if ($client != 0) {
-    print "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp
index 0f31a960742..589f6a6adba 100644
--- a/performance-tests/TCP/tcp_test.cpp
+++ b/performance-tests/TCP/tcp_test.cpp
@@ -82,7 +82,6 @@ usage (void)
               "  [-s]\n"
               "  [-c]\n"
               //              "  [-x max_sample_allowed]\n"
-              "  [-t number of threads]\n"
               "  [-a to use the ACE Select reactor]\n"
               "  [-x to use the ACE TP reactor]\n"
               "  [-w to use the ACE WFMO reactor]\n"
@@ -521,7 +520,7 @@ main (int argc, char *argv[])
     }
 
 
-  ACE_Get_Opt getopt (argc, argv, "hxwvb:I:p:sci:m:at:");
+  ACE_Get_Opt getopt (argc, argv, "hxwf:vb:I:p:sci:m:at:");
 
   while ((c = getopt ()) != -1)
     {
@@ -542,11 +541,6 @@ main (int argc, char *argv[])
             ACE_ERROR_RETURN ((LM_ERROR,
                                "\nMessage size must be greater than 0!\n\n"),
                               1);
-          else if (bufsz > BUFSIZ)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "\nbufsz must be <= %d\n",
-                               BUFSIZ),
-                              1);
 
         case 'i':
           nsamples = ACE_OS::atoi (getopt.optarg);
diff --git a/performance-tests/UDP/run_test.pl b/performance-tests/UDP/run_test.pl
deleted file mode 100755
index b545b6e398f..00000000000
--- a/performance-tests/UDP/run_test.pl
+++ /dev/null
@@ -1,34 +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';
-use PerlACE::Run_Test;
-
-$SV = new PerlACE::Process ("udp_test", "-r");
-$CL = new PerlACE::Process ("udp_test", "-t -n 10000 localhost");
-
-$status = 0;
-
-$SV->Spawn ();
-
-sleep 5;
-
-$client = $CL->SpawnWaitKill (60);
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-if ($client != 0) {
-    print "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/protocols/ace/RMCast/README b/protocols/ace/RMCast/README
deleted file mode 100644
index 2dd0c5d9cfc..00000000000
--- a/protocols/ace/RMCast/README
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-
-	This directory will contain a simple, small-scale reliable
-multicast framework for ACE.  The framework is based on the ASX
-components of the ACE library: the protocol is implemented as a stack
-of interchangeable "modules", each one in charge of a very small task.
-For example, one module implements fragmentation and reassembly, other
-modules implement retransmission, send ACK and NAK messages, and
-maintain receiver membership.
-
-	The modules are replaced to achieve different levels of
-reliability.  For example, the retransmission module can be either the
-"Best_Effort", "Semi_Reliable" or "Reliable" implementation.  In the
-first case no retransmissions are performed, but lost messages are
-detected and reported to the receiver.  The "Semi_Reliable" case
-messages are held for a pre-specified amount of time, and
-re-transmited if requested, but it is possible to loose some messages
-if multiple re-transmissions fail.  As in the "Best_Effort" case the
-lost messages are detected and flagged to the application.  Finally
-in the "Reliable" mode the senders are flowed controlled until enough
-messages are successfully transmitted.
-
-	In general the stack looks like this:
-
-
-SENDER:
-
-----------------------------------------------------------------
-Buffering	:	Save lost messages
-Retransmission	:	Retransmit 
-----------------------------------------------------------------
-Fragmentation   :	Fragment messages in smaller chunks
-Reassembly	:	and ensure that the IOVMAX limit is not
-		:	reached
-----------------------------------------------------------------
-Tranport	:	Encapsulate the specific transport media
-		:	such as TCP/IP, ATM, or shared memory
-		:	Demuxes incoming data to the right chain
-		:	Change control messages and data messages
-		:	to the right dynamic types.
-----------------------------------------------------------------
-
-RECEIVER:
-
-----------------------------------------------------------------
-Lost detection	:	Detect lost messages and send control
-		:	messages back
-----------------------------------------------------------------
-Reassembly	:	Reassemble messages, fragment control
-Fragmentation	:	data
-----------------------------------------------------------------
-Transport	:	Group membership, ACT reception,
-		:	handle keep-alive messages...
-----------------------------------------------------------------
-
-
-@@ TODO: Piggybacking...
diff --git a/protocols/ace/RMCast/RMCast_Export.h b/protocols/ace/RMCast/RMCast_Export.h
deleted file mode 100644
index 51257c4d682..00000000000
--- a/protocols/ace/RMCast/RMCast_Export.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#if !defined (ACE_RMCAST_EXPORT_H)
-#define ACE_RMCAST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
-#  define ACE_RMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
-
-#if !defined (ACE_RMCAST_HAS_DLL)
-#define ACE_RMCAST_HAS_DLL 1
-#endif /* ! ACE_RMCAST_HAS_DLL */
-
-#if defined (ACE_RMCAST_HAS_DLL)
-#  if (ACE_RMCAST_HAS_DLL == 1)
-#    if defined (ACE_RMCAST_BUILD_DLL)
-#      define ACE_RMCast_Export ACE_Proper_Export_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_RMCast_Export ACE_Proper_Import_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_RMCAST_BUILD_DLL */
-#  else
-#    define ACE_RMCast_Export
-#    define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#    define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_RMCAST_HAS_DLL == 1 */
-#else
-#  define ACE_RMCast_Export
-#  define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#  define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_RMCAST_HAS_DLL */
-
-#endif     /* ACE_RMCAST_EXPORT_H */
-
-// End of auto generated file.
diff --git a/tests/ACE_Init_Test.dsp b/tests/ACE_Init_Test.dsp
index bfcf6b8dede..7cfc470404c 100644
--- a/tests/ACE_Init_Test.dsp
+++ b/tests/ACE_Init_Test.dsp
@@ -34,8 +34,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 6

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# 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

diff --git a/tests/Atomic_Op_Test.dsp b/tests/Atomic_Op_Test.dsp
index 69cd06cda08..f552111859b 100644
--- a/tests/Atomic_Op_Test.dsp
+++ b/tests/Atomic_Op_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Atomic_Op_Test - Win32 Release

+CFG=Atomic_Op_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Atomic_Op_Test - Win32 Release
 !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 Release"

+!MESSAGE NMAKE /f "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Atomic_Op_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Atomic_Op_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Atomic_Op_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Atomic_Op_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Atomic_Op_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Atomic_Op_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Atomic_Op_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,84 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Atomic_Op_Test - Win32 Static Debug"

-# Name "Atomic_Op_Test - Win32 Static Release"

-# Name "Atomic_Op_Test - Win32 Release"

 # Name "Atomic_Op_Test - Win32 Debug"

+# Name "Atomic_Op_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\Atomic_Op_Test.cpp

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 Alpha Debug"

+

+DEP_CPP_ATOMI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_ATOMI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Auto_IncDec_Test.dsp b/tests/Auto_IncDec_Test.dsp
index c30fc63612d..205ac3bef21 100644
--- a/tests/Auto_IncDec_Test.dsp
+++ b/tests/Auto_IncDec_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Auto_IncDec_Test - Win32 Release

+CFG=Auto_IncDec_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Auto_IncDec_Test - Win32 Release
 !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 "Auto_IncDec_Test.mak" CFG="Auto_IncDec_Test - Win32 Release"

+!MESSAGE NMAKE /f "Auto_IncDec_Test.mak" CFG="Auto_IncDec_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Auto_IncDec_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Auto_IncDec_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Auto_IncDec_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Auto_IncDec_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Auto_IncDec_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Auto_IncDec_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Auto_IncDec_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Auto_IncDec_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Auto_IncDec_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Auto_IncDec_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Auto_IncDec_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,84 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Auto_IncDec_Test - Win32 Static Debug"

-# Name "Auto_IncDec_Test - Win32 Static Release"

-# Name "Auto_IncDec_Test - Win32 Release"

 # Name "Auto_IncDec_Test - Win32 Debug"

+# Name "Auto_IncDec_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\Auto_IncDec_Test.cpp

+

+!IF  "$(CFG)" == "Auto_IncDec_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Auto_IncDec_Test - Win32 Alpha Debug"

+

+DEP_CPP_AUTO_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_AUTO_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Barrier_Test.dsp b/tests/Barrier_Test.dsp
index d1503cebf4e..1241648dc12 100644
--- a/tests/Barrier_Test.dsp
+++ b/tests/Barrier_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Barrier_Test - Win32 Release

+CFG=Barrier_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 

@@ -13,39 +14,37 @@ CFG=Barrier_Test - Win32 Release
 !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 "Barrier_Test.mak" CFG="Barrier_Test - Win32 Release"

+!MESSAGE NMAKE /f "Barrier_Test.mak" CFG="Barrier_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Barrier_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Barrier_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Barrier_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Barrier_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Barrier_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Barrier_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Barrier_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Barrier_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Barrier_Test\Debug"

+# PROP BASE Target_Dir ".\Barrier_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Barrier_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Barrier_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Barrier_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Barrier_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Barrier_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Barrier_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Barrier_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Barrier_Test - Win32 Static Debug"

-# Name "Barrier_Test - Win32 Static Release"

-# Name "Barrier_Test - Win32 Release"

 # Name "Barrier_Test - Win32 Debug"

+# Name "Barrier_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Barrier_Test.cpp

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Basic_Types_Test.dsp b/tests/Basic_Types_Test.dsp
index c4fd499a7b1..dbad001444f 100644
--- a/tests/Basic_Types_Test.dsp
+++ b/tests/Basic_Types_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Basic_Types_Test - Win32 Release

+CFG=Basic_Types_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 

@@ -13,39 +14,37 @@ CFG=Basic_Types_Test - Win32 Release
 !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 "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 Release"

+!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Basic_Types_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Basic_Types_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Basic_Types_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Basic_Types_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Basic_Types_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Basic_Types_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Basic_Types_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Debug"

+# PROP BASE Target_Dir ".\Basic_Types_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Basic_Types_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Basic_Types_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Basic_Types_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Basic_Types_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Basic_Types_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Basic_Types_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Basic_Types_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Basic_Types_Test - Win32 Static Debug"

-# Name "Basic_Types_Test - Win32 Static Release"

-# Name "Basic_Types_Test - Win32 Release"

 # Name "Basic_Types_Test - Win32 Debug"

+# Name "Basic_Types_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Basic_Types_Test.cpp

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 Alpha Debug"

+

+DEP_CPP_BASIC=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BASIC=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Buffer_Stream_Test.dsp b/tests/Buffer_Stream_Test.dsp
index 3d2c826206a..1e9694ecc21 100644
--- a/tests/Buffer_Stream_Test.dsp
+++ b/tests/Buffer_Stream_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Buffer_Stream_Test - Win32 Release

+CFG=Buffer_Stream_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Buffer_Stream_Test - Win32 Release
 !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 "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 Release"

+!MESSAGE NMAKE /f "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Buffer_Stream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Buffer_Stream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Buffer_Stream_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Buffer_Stream_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Buffer_Stream_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Buffer_Stream_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\Debug"

+# PROP BASE Target_Dir ".\Buffer_Stream_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Buffer_Stream_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,166 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Buffer_Stream_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Buffer_Stream_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Buffer_Stream_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Buffer_Stream_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Buffer_Stream_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Buffer_Stream_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Buffer_Stream_Test - Win32 Static Debug"

-# Name "Buffer_Stream_Test - Win32 Static Release"

-# Name "Buffer_Stream_Test - Win32 Release"

 # Name "Buffer_Stream_Test - Win32 Debug"

+# Name "Buffer_Stream_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Buffer_Stream_Test.cpp

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 Alpha Debug"

+

+DEP_CPP_BUFFE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream.cpp"\

+	"..\ace\Stream.h"\

+	"..\ace\Stream.i"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BUFFE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/CDR_Array_Test.dsp b/tests/CDR_Array_Test.dsp
index 9cf1fea6280..dfbb238b841 100644
--- a/tests/CDR_Array_Test.dsp
+++ b/tests/CDR_Array_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=CDR_Array_Test - Win32 Release

+CFG=CDR_Array_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=CDR_Array_Test - Win32 Release
 !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 "CDR_Array_Test.mak" CFG="CDR_Array_Test - Win32 Release"

+!MESSAGE NMAKE /f "CDR_Array_Test.mak" CFG="CDR_Array_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "CDR_Array_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR_Array_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR_Array_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "CDR_Array_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_Array_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "CDR_Array_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "CDR_Array_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\CDR_Array_Test\Debug"

+# PROP BASE Intermediate_Dir ".\CDR_Array_Test\Debug"

+# PROP BASE Target_Dir ".\CDR_Array_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\CDR_Array_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,49 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "CDR_Array_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "CDR_Array_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "CDR_Array_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "CDR_Array_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "CDR_Array_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "CDR_Array_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "CDR_Array_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "CDR_Array_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "CDR_Array_Test - Win32 Static Debug"

-# Name "CDR_Array_Test - Win32 Static Release"

-# Name "CDR_Array_Test - Win32 Release"

 # Name "CDR_Array_Test - Win32 Debug"

+# Name "CDR_Array_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\CDR_Array_Test.cpp

+

 # End Source File

 # End Group

 # End Target

diff --git a/tests/CDR_File_Test.dsp b/tests/CDR_File_Test.dsp
index 77e0f1702de..96abd4ab24d 100644
--- a/tests/CDR_File_Test.dsp
+++ b/tests/CDR_File_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=CDR_File_Test - Win32 Release

+CFG=CDR_File_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 

@@ -13,39 +14,37 @@ CFG=CDR_File_Test - Win32 Release
 !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 "CDR_File_Test.mak" CFG="CDR_File_Test - Win32 Release"

+!MESSAGE NMAKE /f "CDR_File_Test.mak" CFG="CDR_File_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "CDR_File_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR_File_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR_File_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "CDR_File_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_File_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "CDR_File_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "CDR_File_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\CDR_File_Test\Debug"

+# PROP BASE Intermediate_Dir ".\CDR_File_Test\Debug"

+# PROP BASE Target_Dir ".\CDR_File_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\CDR_File_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "CDR_File_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "CDR_File_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "CDR_File_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "CDR_File_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "CDR_File_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "CDR_File_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "CDR_File_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "CDR_File_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "CDR_File_Test - Win32 Static Debug"

-# Name "CDR_File_Test - Win32 Static Release"

-# Name "CDR_File_Test - Win32 Release"

 # Name "CDR_File_Test - Win32 Debug"

+# Name "CDR_File_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\CDR_File_Test.cpp

+

+!IF  "$(CFG)" == "CDR_File_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "CDR_File_Test - Win32 Alpha Debug"

+

+DEP_CPP_CDR_F=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_CDR_F=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/CDR_Test.dsp b/tests/CDR_Test.dsp
index c14f66a6fc7..432e78cda73 100644
--- a/tests/CDR_Test.dsp
+++ b/tests/CDR_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=CDR_Test - Win32 Release

+CFG=CDR_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=CDR_Test - Win32 Release
 !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 "CDR_Test.mak" CFG="CDR_Test - Win32 Release"

+!MESSAGE NMAKE /f "CDR_Test.mak" CFG="CDR_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "CDR_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "CDR_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "CDR_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "CDR_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "CDR_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\CDR_Test\Debug"

+# PROP BASE Intermediate_Dir ".\CDR_Test\Debug"

+# PROP BASE Target_Dir ".\CDR_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\CDR_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "CDR_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "CDR_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "CDR_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "CDR_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "CDR_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "CDR_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "CDR_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "CDR_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "CDR_Test - Win32 Static Debug"

-# Name "CDR_Test - Win32 Static Release"

-# Name "CDR_Test - Win32 Release"

 # Name "CDR_Test - Win32 Debug"

+# Name "CDR_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\CDR_Test.cpp

+

+!IF  "$(CFG)" == "CDR_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "CDR_Test - Win32 Alpha Debug"

+

+DEP_CPP_CDR_T=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_CDR_T=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # End Target

diff --git a/tests/CPP_Test.cpp b/tests/CPP_Test.cpp
deleted file mode 100644
index 4c0bd291a50..00000000000
--- a/tests/CPP_Test.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-// 
-// = FILENAME
-//    CPP_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of the ACE_SOCK_Acceptor and
-//     AC_SOCK_Connector classes. The test forks two processes or
-//     spawns two threads (depending upon the platform) and then executes
-//     client and server allowing them to connect and exchange
-//     data. No user input is required as far as command line
-//     arguments are concerned.
-//
-// = AUTHOR
-//    Prashant Jain and Doug Schmidt
-// 
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/Thread.h"
-#include "ace/Service_Config.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"                             
-#include "ace/SOCK_Stream.h"
-#include "ace/INET_Addr.h"
-#include "ace/Handle_Set.h"
-#include "test_config.h"
-
-static void *
-client (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_INET_Addr *remote_addr = (ACE_INET_Addr *) arg;
-  ACE_INET_Addr server_addr (remote_addr->get_port_number (), "localhost");
-  ACE_SOCK_Stream cli_stream;
-  ACE_SOCK_Connector con;
-
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting non-blocking connect\n"));
-  // Initiate timed, non-blocking connection with server.
-  
-  // Attempt a non-blocking connect to the server, reusing the local
-  // addr if necessary.
-  if (con.connect (cli_stream, server_addr,
-		   (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "connection failed"));
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting timed connect\n"));
-
-      // Check if non-blocking connection is in progress, 
-      // and wait up to ACE_DEFAULT_TIMEOUT seconds for it to complete.
-      ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-
-      if (con.complete (cli_stream, &server_addr, &tv) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "connection failed"), 0);
-      else
-	ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected to %s\n", 
-		    server_addr.get_host_name ()));
-    }
-
-  if (cli_stream.disable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "disable"));    
-
-  // Send data to server (correctly handles "incomplete writes").
-  
-  for (char c = 'a'; c <= 'z'; c++)
-    if (cli_stream.send_n (&c, 1) == -1) 
-      ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-
-  // Explicitly close the writer-side of the connection.
-  if (cli_stream.close_writer () == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close_writer"));
-
-  char buf[1];
-
-  // Wait for handshake with server.
-  if (cli_stream.recv_n (buf, 1) != 1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "recv_n"));
-
-  // Close the connection completely.
-  if (cli_stream.close () == -1) 
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-
-  return 0;
-}
-
-static void *
-server (void *arg)
-{
-#if (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS)
-  // Insert thread into thr_mgr
-  ACE_Thread_Control thread_control (ACE_Service_Config::thr_mgr ());  
-  ACE_NEW_THREAD;
-#endif /* (defined (ACE_WIN32) || defined (VXWORKS)) && defined (ACE_HAS_THREADS) */
-
-  ACE_SOCK_Acceptor *peer_acceptor = (ACE_SOCK_Acceptor *) arg;
-
-  if (peer_acceptor->enable (ACE_NONBLOCK) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "enable"));
-
-  // Keep these objects out here to prevent excessive constructor
-  // calls...
-  ACE_SOCK_Stream new_stream;                                   
-  ACE_INET_Addr cli_addr;
-  ACE_Handle_Set handle_set;
-  ACE_Time_Value tv (ACE_DEFAULT_TIMEOUT);
-  // Performs the iterative server activities.
-
-  for (;;) 
-    {
-      char buf[BUFSIZ];                                     
-      char t = 'a';
-      
-      handle_set.reset ();
-      handle_set.set_bit (peer_acceptor->get_handle ());
-      
-      int result = ACE_OS::select (int (peer_acceptor->get_handle ()) + 1,
-				   handle_set,
-				   0, 0, &tv);
-      if (result == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-      else if (result == 0)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) select timed out, shutting down\n"));
-	  return 0;
-	}
-
-      // Create a new ACE_SOCK_Stream endpoint (note automatic restart
-      // if errno == EINTR).
-      
-      while ((result = peer_acceptor->accept (new_stream, &cli_addr)) != -1)
-	{
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) client %s connected from %d\n", 
-		      cli_addr.get_host_name (), cli_addr.get_port_number ()));
-	  
-	  // Enable non-blocking I/O.
-	  if (new_stream.enable (ACE_NONBLOCK) == -1)
-	    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "enable"), 0);
-	  
-	  handle_set.reset ();
-	  handle_set.set_bit (new_stream.get_handle ());
-	  
-	  // Read data from client (terminate on error).
-	  
-	  for (ssize_t r_bytes; ;)
-	    {
-	      if (ACE_OS::select (int (new_stream.get_handle ()) + 1,
-				  handle_set,
-				  0, 0, 0) == -1)
-		ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "select"), 0);
-	      
-	      while ((r_bytes = new_stream.recv_n (buf, 1)) > 0)
-		{
-		  ACE_ASSERT (t == buf[0]);
-		  t++;
-		}
-	      
-	      if (r_bytes == 0)
-		{
-		  ACE_DEBUG ((LM_DEBUG, 
-			      "(%P|%t) reached end of input, connection closed by client\n"));
-
-		  // Handshake back with client.
-		  if (new_stream.send_n ("", 1) != 1)
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "send_n"));
-
-		  // Close endpoint.
-		  if (new_stream.close () == -1) 
-		    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "close"));
-		  return 0;
-		}
-	      else if (r_bytes == -1)
-		{
-		  if (errno == EWOULDBLOCK)
-		    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no input available, going back to reading\n"));
-		  else
-		    ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "recv_n"), 0);
-		}
-	    }
-	}
-
-      if (result == -1)
-	{
-	  if (errno == EWOULDBLOCK)
-	    ACE_DEBUG ((LM_DEBUG, "(%P|%t) no connections available, going back to accepting\n"));
-	  else
-	    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "accept"));
-	}
-    }
-  return 0;
-}
-
-static void
-spawn (void)
-{
-  // Acceptor
-  ACE_SOCK_Acceptor peer_acceptor;
-
-  // Create a server address.
-  ACE_INET_Addr server_addr;
-
-  // Bind listener to any port and then find out what the port was.
-  if (peer_acceptor.open (ACE_Addr::sap_any) == -1
-      || peer_acceptor.get_local_addr (server_addr) == -1)
-    ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n", "open"));
-  else 
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n",
-		  server_addr.get_port_number ()));
-
-#if !defined (ACE_WIN32) && !defined (VXWORKS)
-      switch (ACE_OS::fork ())
-	{
-	case -1:
-	  ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "fork failed"));
-	  exit (-1);
-	case 0: 
-	  ACE_LOG_MSG->sync ("child");
-	  client (&server_addr);
-	default:
-	  server ((void *) &peer_acceptor);
-	  ACE_OS::wait ();
-	}
-#elif defined (ACE_HAS_THREADS)
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (server), (void *) &peer_acceptor, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      if (ACE_Service_Config::thr_mgr ()->spawn 
-	  (ACE_THR_FUNC (client), (void *) &server_addr, THR_NEW_LWP | THR_DETACHED) == -1)
-	ACE_ERROR ((LM_ERROR, "(%P|%t) %p\n%a", "thread create failed"));
-
-      // Wait for the threads to exit.
-      ACE_Service_Config::thr_mgr ()->wait ();
-#else
-      ACE_ERROR ((LM_ERROR, "(%P|%t) only one thread may be run in a process on this platform\n%a", 1));
-#endif /* ACE_HAS_THREADS */	
-    }
-}
-
-int
-main (int, char *[])
-{
-  ACE_START_TEST ("CPP_Test");
-
-  spawn ();
-
-  ACE_END_TEST;
-  return 0;
-}
diff --git a/tests/Cache_Map_Manager_Test.dsp b/tests/Cache_Map_Manager_Test.dsp
index fdb860e1453..f5aa398389c 100644
--- a/tests/Cache_Map_Manager_Test.dsp
+++ b/tests/Cache_Map_Manager_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Cache_Map_Manager_Test - Win32 Release

+CFG=Cache_Map_Manager_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Cache_Map_Manager_Test - Win32 Release
 !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 "Cache_Map_Manager_Test.mak" CFG="Cache_Map_Manager_Test - Win32 Release"

+!MESSAGE NMAKE /f "Cache_Map_Manager_Test.mak" CFG="Cache_Map_Manager_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Cache_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cache_Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Cache_Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cache_Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Cache_Map_Manager_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,84 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Cache_Map_Manager_Test - Win32 Static Debug"

-# Name "Cache_Map_Manager_Test - Win32 Static Release"

-# Name "Cache_Map_Manager_Test - Win32 Release"

 # Name "Cache_Map_Manager_Test - Win32 Debug"

+# Name "Cache_Map_Manager_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\Cache_Map_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Cache_Map_Manager_Test - Win32 Alpha Debug"

+

+DEP_CPP_CACHE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_CACHE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Cached_Accept_Conn_Test.dsp b/tests/Cached_Accept_Conn_Test.dsp
index 23f95bb6334..56149b48f15 100644
--- a/tests/Cached_Accept_Conn_Test.dsp
+++ b/tests/Cached_Accept_Conn_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Cached_Accept_Conn_Test - Win32 Release

+CFG=Cached_Accept_Conn_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Cached_Accept_Conn_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Cached_Accept_Conn_Test.mak" CFG="Cached_Accept_Conn_Test - Win32 Release"

+!MESSAGE NMAKE /f "Cached_Accept_Conn_Test.mak" CFG="Cached_Accept_Conn_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Cached_Accept_Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cached_Accept_Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cached_Accept_Conn_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Cached_Accept_Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cached_Accept_Conn_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Debug"

+# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Cached_Accept_Conn_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,196 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Cached_Accept_Conn_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Cached_Accept_Conn_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Cached_Accept_Conn_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Cached_Accept_Conn_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Cached_Accept_Conn_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Cached_Accept_Conn_Test - Win32 Static Debug"

-# Name "Cached_Accept_Conn_Test - Win32 Static Release"

-# Name "Cached_Accept_Conn_Test - Win32 Release"

 # Name "Cached_Accept_Conn_Test - Win32 Debug"

+# Name "Cached_Accept_Conn_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Cached_Accept_Conn_Test.cpp

+

+!IF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Cached_Accept_Conn_Test - Win32 Alpha Debug"

+

+DEP_CPP_CACHE=\

+	"..\ace\Acceptor.cpp"\

+	"..\ace\Acceptor.h"\

+	"..\ace\Acceptor.i"\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Dynamic.h"\

+	"..\ace\Dynamic.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map_Manager.cpp"\

+	"..\ace\Map_Manager.h"\

+	"..\ace\Map_Manager.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Svc_Handler.cpp"\

+	"..\ace\Svc_Handler.h"\

+	"..\ace\Svc_Handler.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\Cached_Accept_Conn_Test.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_CACHE=\

+	"..\ace\Cached_Accept_Connector.cpp"\

+	"..\ace\Cached_Accept_Connector.h"\

+	"..\ace\Cached_Accept_Connector.i"\

+	"..\ace\SOCK_Cached_Accept_Connector.h"\

+	"..\ace\SOCK_Cached_Accept_Connector.i"\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Cached_Conn_Test.dsp b/tests/Cached_Conn_Test.dsp
index f62bdd50fd0..330ab68018f 100644
--- a/tests/Cached_Conn_Test.dsp
+++ b/tests/Cached_Conn_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Cached_Conn_Test - Win32 Release

+CFG=Cached_Conn_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Cached_Conn_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Cached_Conn_Test.mak" CFG="Cached_Conn_Test - Win32 Release"

+!MESSAGE NMAKE /f "Cached_Conn_Test.mak" CFG="Cached_Conn_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Cached_Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cached_Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Cached_Conn_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Cached_Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cached_Conn_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Cached_Conn_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Cached_Conn_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Cached_Conn_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,84 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Cached_Conn_Test - Win32 Static Debug"

-# Name "Cached_Conn_Test - Win32 Static Release"

-# Name "Cached_Conn_Test - Win32 Release"

 # Name "Cached_Conn_Test - Win32 Debug"

+# Name "Cached_Conn_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\Cached_Conn_Test.cpp

+

+!IF  "$(CFG)" == "Cached_Conn_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Cached_Conn_Test - Win32 Alpha Debug"

+

+DEP_CPP_CACHE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_CACHE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Capabilities_Test.dsp b/tests/Capabilities_Test.dsp
index eb6a82b926b..1182b530f04 100644
--- a/tests/Capabilities_Test.dsp
+++ b/tests/Capabilities_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Capabilities_Test - Win32 Release

+CFG=Capabilities_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 

@@ -13,39 +14,37 @@ CFG=Capabilities_Test - Win32 Release
 !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 "Capabilities_Test.mak" CFG="Capabilities_Test - Win32 Release"

+!MESSAGE NMAKE /f "Capabilities_Test.mak" CFG="Capabilities_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Capabilities_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Capabilities_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Capabilities_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Capabilities_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Capabilities_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Capabilities_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Capabilities_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Capabilities_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Capabilities_Test\Debug"

+# PROP BASE Target_Dir ".\Capabilities_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Capabilities_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,55 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Capabilities_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Capabilities_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Capabilities_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Capabilities_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Capabilities_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Capabilities_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Capabilities_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Capabilities_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Capabilities_Test - Win32 Static Debug"

-# Name "Capabilities_Test - Win32 Static Release"

-# Name "Capabilities_Test - Win32 Release"

 # Name "Capabilities_Test - Win32 Debug"

+# Name "Capabilities_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Capabilities_Test.cpp

+

+!IF  "$(CFG)" == "Capabilities_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Capabilities_Test - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Collection_Test.dsp b/tests/Collection_Test.dsp
index 6cf11542d14..9cbe8adfac9 100644
--- a/tests/Collection_Test.dsp
+++ b/tests/Collection_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Collection_Test - Win32 Release

+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 

@@ -13,39 +14,37 @@ CFG=Collection_Test - Win32 Release
 !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 Release"

+!MESSAGE NMAKE /f "Collection_Test.mak" CFG="Collection_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Collection_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Collection_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Collection_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) 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 Static Debug"

+!IF  "$(CFG)" == "Collection_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Collection_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Collection_Test\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 Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Collection_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /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 "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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 Debug"

+!ELSEIF  "$(CFG)" == "Collection_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Collection_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Collection_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Collection_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Collection_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Collection_Test - Win32 Static Debug"

-# Name "Collection_Test - Win32 Static Release"

-# Name "Collection_Test - Win32 Release"

 # Name "Collection_Test - Win32 Debug"

+# Name "Collection_Test - Win32 Alpha 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

+

+!IF  "$(CFG)" == "Collection_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Collection_Test - Win32 Alpha Debug"

+

+DEP_CPP_COLLE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_COLLE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Config_Test.dsp b/tests/Config_Test.dsp
index a02b9ef6cb2..ae0cd65d337 100644
--- a/tests/Config_Test.dsp
+++ b/tests/Config_Test.dsp
@@ -1,166 +1,264 @@
-# Microsoft Developer Studio Project File - Name="Config_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Config_Test - Win32 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 "Config_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 "Config_Test.mak" CFG="Config_Test - Win32 Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Config_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Config_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Config_Test - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Config_Test - Win32 Static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Config_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Config_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Config_Test - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Config_Test - Win32 Static Debug"

-# Name "Config_Test - Win32 Static Release"

-# Name "Config_Test - Win32 Release"

-# Name "Config_Test - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=.\Config_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=.\Config_Test.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\test_config.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="Config_Test" - Package Owner=<4>


+# Microsoft Developer Studio Generated Build File, Format Version 6.00


+# ** DO NOT EDIT **


+


+# TARGTYPE "Win32 (x86) Console Application" 0x0103


+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603


+


+CFG=Config_Test - Win32 PharLap ETS Debug


+!MESSAGE This is not a valid makefile. To build this project using NMAKE,


+!MESSAGE use the Export Makefile command and run


+!MESSAGE 


+!MESSAGE NMAKE /f "Config_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 "Config_Test.mak" CFG="Config_Test - Win32 PharLap ETS Debug"


+!MESSAGE 


+!MESSAGE Possible choices for configuration are:


+!MESSAGE 


+!MESSAGE "Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")


+!MESSAGE "Config_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")


+!MESSAGE 


+


+# Begin Project


+# PROP AllowPerConfigDependencies 0


+# PROP Scc_ProjName ""


+# PROP Scc_LocalPath ""


+


+!IF  "$(CFG)" == "Config_Test - Win32 Debug"


+


+# PROP BASE Use_MFC 0


+# PROP BASE Use_Debug_Libraries 1


+# PROP BASE Output_Dir ".\Config_Test\Debug"


+# PROP BASE Intermediate_Dir ".\Config_Test\Debug"


+# PROP BASE Target_Dir ".\Config_Test"


+# PROP Use_MFC 0


+# PROP Use_Debug_Libraries 1


+# PROP Output_Dir "."


+# PROP Intermediate_Dir ".\DLL\Debug"


+# PROP Ignore_Export_Lib 0


+# PROP Target_Dir ".\Config_Test"


+CPP=cl.exe


+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c


+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c


+# SUBTRACT CPP /YX


+RSC=rc.exe


+# ADD BASE RSC /l 0x409 /d "_DEBUG"


+# ADD RSC /l 0x409 /d "_DEBUG"


+BSC32=bscmake.exe


+# ADD BASE BSC32 /nologo


+# ADD BSC32 /nologo


+LINK32=link.exe


+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386


+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"


+


+!ELSEIF  "$(CFG)" == "Config_Test - Win32 Alpha Debug"


+


+# PROP BASE Use_MFC 0


+# PROP BASE Use_Debug_Libraries 1


+# PROP BASE Output_Dir "Config_Test\Alpha Debug"


+# PROP BASE Intermediate_Dir "Config_Test\Alpha Debug"


+# PROP BASE Ignore_Export_Lib 0


+# PROP BASE Target_Dir "Config_Test"


+# PROP Use_MFC 0


+# PROP Use_Debug_Libraries 1


+# PROP Output_Dir ""


+# PROP Intermediate_Dir "Debug"


+# PROP Ignore_Export_Lib 0


+# PROP Target_Dir "Config_Test"


+CPP=cl.exe


+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c


+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c


+# SUBTRACT CPP /YX


+RSC=rc.exe


+# ADD BASE RSC /l 0x409 /d "_DEBUG"


+# ADD RSC /l 0x409 /d "_DEBUG"


+BSC32=bscmake.exe


+# ADD BASE BSC32 /nologo


+# ADD BSC32 /nologo


+LINK32=link.exe


+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"


+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"


+


+!ENDIF 


+


+# Begin Target


+


+# Name "Config_Test - Win32 Debug"


+# Name "Config_Test - Win32 Alpha Debug"


+# Begin Group "Source Files"


+


+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"


+# Begin Source File


+


+SOURCE=.\Config_Test.cpp


+


+!IF  "$(CFG)" == "Config_Test - Win32 Debug"


+


+!ELSEIF  "$(CFG)" == "Config_Test - Win32 Alpha Debug"


+


+DEP_CPP_CONFIG_=\


+	"..\ace\Acceptor.cpp"\


+	"..\ace\Acceptor.h"\


+	"..\ace\Acceptor.i"\


+	"..\ace\ACE.h"\


+	"..\ace\ACE.i"\


+	"..\ace\Addr.h"\


+	"..\ace\Addr.i"\


+	"..\ace\Atomic_Op.i"\


+	"..\ace\Auto_Ptr.cpp"\


+	"..\ace\Auto_Ptr.h"\


+	"..\ace\Auto_Ptr.i"\


+	"..\ace\config-win32-common.h"\


+	"..\ace\config-win32.h"\


+	"..\ace\config.h"\


+	"..\ace\Connector.cpp"\


+	"..\ace\Connector.h"\


+	"..\ace\Connector.i"\


+	"..\ace\Containers.cpp"\


+	"..\ace\Containers.h"\


+	"..\ace\Containers.i"\


+	"..\ace\Dynamic.h"\


+	"..\ace\Dynamic.i"\


+	"..\ace\Event_Handler.h"\


+	"..\ace\Event_Handler.i"\


+	"..\ace\Free_List.cpp"\


+	"..\ace\Free_List.h"\


+	"..\ace\Free_List.i"\


+	"..\ace\Get_Opt.h"\


+	"..\ace\Get_Opt.i"\


+	"..\ace\Handle_Set.h"\


+	"..\ace\Handle_Set.i"\


+	"..\ace\Hash_Map_Manager.cpp"\


+	"..\ace\Hash_Map_Manager.h"\


+	"..\ace\INET_Addr.h"\


+	"..\ace\INET_Addr.i"\


+	"..\ace\IO_Cntl_Msg.h"\


+	"..\ace\IPC_SAP.h"\


+	"..\ace\IPC_SAP.i"\


+	"..\ace\Log_Msg.h"\


+	"..\ace\Log_Priority.h"\


+	"..\ace\Log_Record.h"\


+	"..\ace\Log_Record.i"\


+	"..\ace\Malloc.h"\


+	"..\ace\Malloc.i"\


+	"..\ace\Malloc_T.cpp"\


+	"..\ace\Malloc_T.h"\


+	"..\ace\Malloc_T.i"\


+	"..\ace\Managed_Object.cpp"\


+	"..\ace\Managed_Object.h"\


+	"..\ace\Managed_Object.i"\


+	"..\ace\Map_Manager.cpp"\


+	"..\ace\Map_Manager.h"\


+	"..\ace\Map_Manager.i"\


+	"..\ace\Mem_Map.h"\


+	"..\ace\Mem_Map.i"\


+	"..\ace\Memory_Pool.h"\


+	"..\ace\Memory_Pool.i"\


+	"..\ace\Message_Block.h"\


+	"..\ace\Message_Block.i"\


+	"..\ace\Message_Queue.cpp"\


+	"..\ace\Message_Queue.h"\


+	"..\ace\Message_Queue.i"\


+	"..\ace\Module.cpp"\


+	"..\ace\Module.h"\


+	"..\ace\Module.i"\


+	"..\ace\Object_Manager.h"\


+	"..\ace\Object_Manager.i"\


+	"..\ace\OS.h"\


+	"..\ace\OS.i"\


+	"..\ace\Reactor.h"\


+	"..\ace\Reactor.i"\


+	"..\ace\Reactor_Impl.h"\


+	"..\ace\Service_Config.h"\


+	"..\ace\Service_Config.i"\


+	"..\ace\Service_Object.h"\


+	"..\ace\Service_Object.i"\


+	"..\ace\Service_Types.h"\


+	"..\ace\Service_Types.i"\


+	"..\ace\Shared_Object.h"\


+	"..\ace\Shared_Object.i"\


+	"..\ace\Signal.h"\


+	"..\ace\Signal.i"\


+	"..\ace\SOCK.h"\


+	"..\ace\SOCK.i"\


+	"..\ace\SOCK_Acceptor.h"\


+	"..\ace\SOCK_Acceptor.i"\


+	"..\ace\SOCK_Connector.h"\


+	"..\ace\SOCK_Connector.i"\


+	"..\ace\SOCK_IO.h"\


+	"..\ace\SOCK_IO.i"\


+	"..\ace\SOCK_Stream.h"\


+	"..\ace\SOCK_Stream.i"\


+	"..\ace\SString.h"\


+	"..\ace\SString.i"\


+	"..\ace\Strategies.h"\


+	"..\ace\Strategies_T.cpp"\


+	"..\ace\Strategies_T.h"\


+	"..\ace\Stream_Modules.cpp"\


+	"..\ace\Stream_Modules.h"\


+	"..\ace\Stream_Modules.i"\


+	"..\ace\SV_Semaphore_Complex.h"\


+	"..\ace\SV_Semaphore_Complex.i"\


+	"..\ace\SV_Semaphore_Simple.h"\


+	"..\ace\SV_Semaphore_Simple.i"\


+	"..\ace\Svc_Conf_Tokens.h"\


+	"..\ace\Svc_Handler.cpp"\


+	"..\ace\Svc_Handler.h"\


+	"..\ace\Svc_Handler.i"\


+	"..\ace\Synch.h"\


+	"..\ace\Synch.i"\


+	"..\ace\Synch_Options.h"\


+	"..\ace\Synch_T.cpp"\


+	"..\ace\Synch_T.h"\


+	"..\ace\Synch_T.i"\


+	"..\ace\Task.h"\


+	"..\ace\Task.i"\


+	"..\ace\Task_T.cpp"\


+	"..\ace\Task_T.h"\


+	"..\ace\Task_T.i"\


+	"..\ace\Thread.h"\


+	"..\ace\Thread.i"\


+	"..\ace\Thread_Manager.h"\


+	"..\ace\Thread_Manager.i"\


+	"..\ace\Time_Value.h"\


+	"..\ace\Timer_Queue.h"\


+	"..\ace\Timer_Queue_T.cpp"\


+	"..\ace\Timer_Queue_T.h"\


+	"..\ace\Timer_Queue_T.i"\


+	"..\ace\Trace.h"\


+	"..\ace\Version.h"\


+	"..\ace\WFMO_Reactor.h"\


+	"..\ace\WFMO_Reactor.i"\


+	"..\ace\ws2tcpip.h"\


+	".\Config_Test.h"\


+	".\test_config.h"\


+	


+NODEP_CPP_CONFIG_=\


+	"..\ace\stdcpp.h"\


+	


+


+!ENDIF 


+


+# End Source File


+# End Group


+# Begin Group "Header Files"


+


+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"


+# Begin Source File


+


+SOURCE=.\Config_Test.h


+# End Source File


+# Begin Source File


+


+SOURCE=.\test_config.h


+# End Source File


+# End Group


+# Begin Group "Resource Files"


+


+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"


+# End Group


+# End Target


+# End Project


diff --git a/tests/Conn_Test.dsp b/tests/Conn_Test.dsp
index fee899d9b0d..ad42cc7b2c4 100644
--- a/tests/Conn_Test.dsp
+++ b/tests/Conn_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Conn_Test - Win32 Release

+CFG=Conn_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Conn_Test - Win32 Release
 !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 "Conn_Test.mak" CFG="Conn_Test - Win32 Release"

+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Conn_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Conn_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Conn_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Conn_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Conn_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Conn_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Conn_Test\Debug"

+# PROP BASE Target_Dir ".\Conn_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Conn_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,196 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Conn_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Conn_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Conn_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Conn_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Conn_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Conn_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Conn_Test - Win32 Static Debug"

-# Name "Conn_Test - Win32 Static Release"

-# Name "Conn_Test - Win32 Release"

 # Name "Conn_Test - Win32 Debug"

+# Name "Conn_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Conn_Test.cpp

+

+!IF  "$(CFG)" == "Conn_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 Alpha Debug"

+

+DEP_CPP_CONN_=\

+	"..\ace\Acceptor.cpp"\

+	"..\ace\Acceptor.h"\

+	"..\ace\Acceptor.i"\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Connector.cpp"\

+	"..\ace\Connector.h"\

+	"..\ace\Connector.i"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Dynamic.h"\

+	"..\ace\Dynamic.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map_Manager.cpp"\

+	"..\ace\Map_Manager.h"\

+	"..\ace\Map_Manager.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Svc_Handler.cpp"\

+	"..\ace\Svc_Handler.h"\

+	"..\ace\Svc_Handler.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\Conn_Test.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_CONN_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp
index e8603c12ebd..f1aa694315c 100644
--- a/tests/DLL_Test.cpp
+++ b/tests/DLL_Test.cpp
@@ -6,7 +6,7 @@
 //    tests
 //
 // = FILENAME
-//    DLL_Test.cpp
+ //    DLL_Test.cpp
 //
 // = DESCRIPTION
 //    This test illustrates the use of <ACE_DLL> wrapper class.
@@ -16,6 +16,8 @@
 //
 // ============================================================================
 
+#define ACE_BUILD_SVC_DLL
+
 #include "test_config.h"
 #include "DLL_Test.h"
 #include "ace/DLL.h"
@@ -23,13 +25,22 @@
 
 ACE_RCSID(tests, DLL_Test, "$Id$")
 
-#if defined (ACE_WIN32) && defined (_DEBUG) 
-# define OBJ_SUFFIX ACE_TEXT ("d") ACE_DLL_SUFFIX
-#else /* ACE_WIN32 && _DEBUG */
-# define OBJ_SUFFIX ACE_DLL_SUFFIX
-#endif /* ACE_WIN32 && _DEBUG */
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// Considering UNIX OS to be default. On Win32 platforms, the symbols
+// are got form the .exe as one cant have .exe and .dll for the same
+// .cpp. Also, on Win32 platforms one cant use the .obj to obtain
+// symbols dynamically at runtime.
 
-#define OBJ_PREFIX ACE_TEXT ("./") ACE_DLL_PREFIX
+#if defined (ACE_WIN32)
+#  define OBJ_SUFFIX ACE_TEXT (".exe")
+#  define OBJ_PREFIX ACE_TEXT ("")
+#else
+#  define OBJ_SUFFIX ACE_DLL_SUFFIX
+#  define OBJ_PREFIX "./" ACE_DLL_PREFIX
+#endif /*ACE_WIN32*/
 
 ACE_TCHAR const *
 cdecl_decoration (ACE_TCHAR const *func_name)
@@ -45,12 +56,30 @@ cdecl_decoration (ACE_TCHAR const *func_name)
 #endif /* __BORLANDC__ */
 }
 
-// Declare the type of the symbol:
-typedef Hello *(*Hello_Factory)(void);
+// This function returns the Hello object pointer.
+
+extern "C" ACE_Svc_Export Hello *get_hello (void);
+
+Hello *
+get_hello (void)
+{
+  Hello *hello = 0;
+
+  ACE_NEW_RETURN (hello,
+                  Hello,
+                  NULL);
+
+  return hello;
+}
+
+typedef Hello *(*TC) (void);
 
 int
-main (int, ACE_TCHAR *[])
+main (int argc, ACE_TCHAR *argv[])
 {
+  ACE_UNUSED_ARG (argc);
+  ACE_UNUSED_ARG (argv);
+
   ACE_START_TEST (ACE_TEXT ("DLL_Test"));
 
 // Protection against this test being run on platforms not supporting Dlls.
@@ -68,7 +97,7 @@ main (int, ACE_TCHAR *[])
 
   // Just because the ANSI C++ spec says you can no longer cast a
   // void* to a function pointer. Doesn't allow:
-  // TC f = (Hello_Factory) dll.symbol ("get_hello");
+  // TC f = (TC) dll.symbol ("get_hello");
   void *foo;
 
   ACE_TCHAR const *cdecl_str = cdecl_decoration (ACE_TEXT ("get_hello"));
@@ -76,14 +105,14 @@ main (int, ACE_TCHAR *[])
 
   // Cast the void* to long first.
   long tmp = ACE_reinterpret_cast (long, foo);
-  Hello_Factory factory = ACE_reinterpret_cast (Hello_Factory, tmp);
-  if (factory == 0)
+  TC f = ACE_reinterpret_cast (Hello * (*)(void), tmp);
+  if (f == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
 		       dll.error ()),
                       -1);
 
-  auto_ptr<Hello> my_hello (factory ());
+  auto_ptr<Hello> my_hello (f ());
 
   // Make the method calls, as the object pointer is available.
   my_hello->say_hello ();
diff --git a/tests/DLL_Test.dsp b/tests/DLL_Test.dsp
index 3e5526da5ef..bf78b2461bd 100644
--- a/tests/DLL_Test.dsp
+++ b/tests/DLL_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=DLL_Test - Win32 Release

+CFG=DLL_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 

@@ -13,39 +14,38 @@ CFG=DLL_Test - Win32 Release
 !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 Release"

+!MESSAGE NMAKE /f "DLL_Test.mak" CFG="DLL_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "DLL_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLL_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "DLL_Test - Win32 Alpha Debug" (based on\

+ "Win32 (ALPHA) 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 Static Debug"

+!IF  "$(CFG)" == "DLL_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\DLL_Test\Debug"

+# PROP BASE Intermediate_Dir ".\DLL_Test\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 Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\DLL_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +53,117 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /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 "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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 Debug"

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "DLL_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "DLL_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "DLL_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "DLL_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "DLL_Test - Win32 Static Debug"

-# Name "DLL_Test - Win32 Static Release"

-# Name "DLL_Test - Win32 Release"

 # Name "DLL_Test - Win32 Debug"

+# Name "DLL_Test - Win32 Alpha 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

+

+!IF  "$(CFG)" == "DLL_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\stdcpp.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\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/DLL_Test.h b/tests/DLL_Test.h
index 160d09846ce..d19a488f8d9 100644
--- a/tests/DLL_Test.h
+++ b/tests/DLL_Test.h
@@ -1,48 +1,54 @@
-// ================================================================
-/**
- * @file DLL_Test.h
- *
- * $Id$
- *
- * @author Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-// ================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    DLL_Test.h
+//
+// = DESCRIPTION
+//     This file has the class definitions needed for template generation in
+//     DLL_Test.cpp.  They have to be in a separate file so AIX xlC can
+//     find them at auto-instantiate time.
+//
+// = AUTHOR
+//     Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef ACE_TESTS_DLL_TEST_H
 #define ACE_TESTS_DLL_TEST_H
 
-#include "ace/Log_Msg.h"
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-/**
- * @class Hello
- *
- * @brief Define the interface used by the DLL_Test
- */
+#include "ace/Log_Msg.h"
+
 class Hello
 {
+  // = TITLE
+  //    The Hello class in the dynamically linkable library.
+  //
+  // = DESCRIPTION
+  //    This class is used in this example to show how a library can
+  //    be loaded on demand and its methods called on getting the
+  //    symbols from the library.
 public:
-  /// Destructor
-  virtual ~Hello (void) {}
-
-  /**
-   * @name Methods invoked by the test
-   *
-   * The test invokes two methods, a non-virtual method and a virtual
-   * method implemented in the shared library.
-   */
-  //@{
+
   void say_hello (void)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("Hello\n")));
-  }
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("Hello\n")));
+    }
 
-  virtual void say_next (void) = 0;
-  //@}
+  void say_next (void)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("How are you?\n")));
+    }
 };
 
-#endif /* ACE_TESTS_DLL_TEST_H */
+#endif /* ACE_TESTS_MAP_TEST_H */
diff --git a/tests/DLL_Test_Impl.cpp b/tests/DLL_Test_Impl.cpp
deleted file mode 100644
index bd53cca1ed0..00000000000
--- a/tests/DLL_Test_Impl.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    DLL_Test.cpp
-//
-// = DESCRIPTION
-//    This test illustrates the use of <ACE_DLL> wrapper class.
-//
-// = AUTHOR
-//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "DLL_Test_Impl.h"
-
-ACE_RCSID(tests, DLL_Test_Impl, "$Id$")
-
-Hello_Impl::Hello_Impl (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "Hello_Impl::Hello_Impl\n"));
-}
-
-Hello_Impl::~Hello_Impl (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "Hello_Impl::~Hello_Impl\n"));
-}
-
-void
-Hello_Impl::say_next (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("How are you?\n")));
-}
-
-extern "C" ACE_Svc_Export Hello *
-get_hello (void)
-{
-  Hello *hello = 0;
-
-  ACE_NEW_RETURN (hello,
-                  Hello_Impl,
-                  NULL);
-
-  return hello;
-}
-
-class Static_Constructor_Test
-{
-public:
-  Static_Constructor_Test (void)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Static_Constructor_Test::Static_Constructor_Test\n"));
-  }
-  ~Static_Constructor_Test (void)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Static_Constructor_Test::~Static_Constructor_Test\n"));
-  }
-};
-
-static Static_Constructor_Test the_instance;
diff --git a/tests/DLL_Test_Impl.dsp b/tests/DLL_Test_Impl.dsp
deleted file mode 100644
index bac562a3015..00000000000
--- a/tests/DLL_Test_Impl.dsp
+++ /dev/null
@@ -1,169 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DLL_Test DLL" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=DLL_Test DLL - 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 NMAKE /f "DLL_Test_Impl.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_Impl.mak" CFG="DLL_Test DLL - Win32 Static Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "DLL_Test DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "DLL_Test DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "DLL_Test DLL - Win32 Static Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "DLL_Test DLL - Win32 Static Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "DLL_Test DLL - 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 "DLL\Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /D "ACE_BUILD_SVC_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /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 /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test DLL - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /D "ACE_BUILD_SVC_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test DLL - Win32 Static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /D "ACE_BUILD_SVC_DLL" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /D "ACE_BUILD_SVC_DLL" /D "ACE_AS_STATIC_LIBS" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /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 aced.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace"

-# ADD LINK32 acesd.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test DLL - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /D "ACE_BUILD_SVC_DLL" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /D "ACE_BUILD_SVC_DLL" /D "ACE_AS_STATIC_LIBS" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /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 ace.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace"

-# ADD LINK32 aces.lib advapi32.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "DLL_Test DLL - Win32 Release"

-# Name "DLL_Test DLL - Win32 Debug"

-# Name "DLL_Test DLL - Win32 Static Debug"

-# Name "DLL_Test DLL - Win32 Static Release"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\DLL_Test_Impl.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\DLL_Test_Impl.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/tests/DLL_Test_Impl.h b/tests/DLL_Test_Impl.h
deleted file mode 100644
index 371a7871af8..00000000000
--- a/tests/DLL_Test_Impl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    DLL_Test_Impl.h
-//
-// = AUTHOR
-//     Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_TESTS_DLL_TEST_IMPL_H
-#define ACE_TESTS_DLL_TEST_IMPL_H
-
-#include "DLL_Test.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class Hello_Impl : public Hello
-{
-  // = TITLE
-  //    The Hello class in the dynamically linkable library.
-  //
-  // = DESCRIPTION
-  //    This class is used in this example to show how a library can
-  //    be loaded on demand and its methods called on getting the
-  //    symbols from the library.
-public:
-  Hello_Impl (void);
-  // Constructor
-
-  ~Hello_Impl (void);
-  // Destructor
-
-  void say_next (void);
-  // See the documentation in the base class
-};
-
-#endif /* ACE_TESTS_DLL_TEST_IMPL_H */
diff --git a/tests/DLList_Test.dsp b/tests/DLList_Test.dsp
index b2fc0ad5bec..bac4ab235ef 100644
--- a/tests/DLList_Test.dsp
+++ b/tests/DLList_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=DLList_Test - Win32 Release

+CFG=DLList_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=DLList_Test - Win32 Release
 !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 "DLList_Test.mak" CFG="DLList_Test - Win32 Release"

+!MESSAGE NMAKE /f "DLList_Test.mak" CFG="DLList_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "DLList_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLList_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLList_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "DLList_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLList_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "DLList_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "DLList_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\DLList_Test\Debug"

+# PROP BASE Intermediate_Dir ".\DLList_Test\Debug"

+# PROP BASE Target_Dir ".\DLList_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\DLList_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "DLList_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "DLList_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "DLList_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "DLList_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "DLList_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "DLList_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "DLList_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "DLList_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "DLList_Test - Win32 Static Debug"

-# Name "DLList_Test - Win32 Static Release"

-# Name "DLList_Test - Win32 Release"

 # Name "DLList_Test - Win32 Debug"

+# Name "DLList_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\DLList_Test.cpp

+

+!IF  "$(CFG)" == "DLList_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "DLList_Test - Win32 Alpha Debug"

+

+DEP_CPP_DLLIS=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_DLLIS=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Dirent_Test.dsp b/tests/Dirent_Test.dsp
index 07fe6cda3fe..a45c76986ee 100644
--- a/tests/Dirent_Test.dsp
+++ b/tests/Dirent_Test.dsp
@@ -4,7 +4,7 @@
 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Dirent_Test - Win32 Release

+CFG=Dirent_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 

@@ -13,13 +13,10 @@ CFG=Dirent_Test - Win32 Release
 !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 "Dirent_Test.mak" CFG="Dirent_Test - Win32 Release"

+!MESSAGE NMAKE /f "Dirent_Test.mak" CFG="Dirent_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Dirent_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Dirent_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Dirent_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Dirent_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -29,84 +26,6 @@ CFG=Dirent_Test - Win32 Release
 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "Dirent_Test - Win32 Static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Dirent_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Dirent_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Dirent_Test - Win32 Debug"

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "Debug"

@@ -115,11 +34,11 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# 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" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -127,16 +46,11 @@ 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 

-

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /pdb:"./Dirent_Test.pdb" /debug /machine:I386 /out:"./Dirent_Test.exe" /libpath:"..\ace"

+# SUBTRACT LINK32 /pdbtype:<none>

 # Begin Target

 

-# Name "Dirent_Test - Win32 Static Debug"

-# Name "Dirent_Test - Win32 Static Release"

-# Name "Dirent_Test - Win32 Release"

 # Name "Dirent_Test - Win32 Debug"

 # Begin Group "Source Files"

 

diff --git a/tests/Dynamic_Priority_Test.cpp b/tests/Dynamic_Priority_Test.cpp
index eb9c1b3adea..5f6ea6e0961 100644
--- a/tests/Dynamic_Priority_Test.cpp
+++ b/tests/Dynamic_Priority_Test.cpp
@@ -411,7 +411,7 @@ performance_producer (void *args)
 
       // Set a character in the current message block at its
       // read pointer position, and adjust the write pointer.
-      *mb->wr_ptr () = 'a';
+      *mb->rd_ptr () = 'a';
       mb->wr_ptr (1);
 
       // Enqueue the message block in priority order.
diff --git a/tests/Dynamic_Priority_Test.dsp b/tests/Dynamic_Priority_Test.dsp
index 26bbcb01127..acf39473db7 100644
--- a/tests/Dynamic_Priority_Test.dsp
+++ b/tests/Dynamic_Priority_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Dynamic_Priority_Test - Win32 Release

+CFG=Dynamic_Priority_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 

@@ -13,39 +14,37 @@ CFG=Dynamic_Priority_Test - Win32 Release
 !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 "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 Release"

+!MESSAGE NMAKE /f "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Dynamic_Priority_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Dynamic_Priority_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Dynamic_Priority_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Dynamic_Priority_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Dynamic_Priority_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Dynamic_Priority_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Debug"

+# PROP BASE Target_Dir ".\Dynamic_Priority_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Dynamic_Priority_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Dynamic_Priority_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Dynamic_Priority_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Dynamic_Priority_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Dynamic_Priority_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Dynamic_Priority_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Dynamic_Priority_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Dynamic_Priority_Test - Win32 Static Debug"

-# Name "Dynamic_Priority_Test - Win32 Static Release"

-# Name "Dynamic_Priority_Test - Win32 Release"

 # Name "Dynamic_Priority_Test - Win32 Debug"

+# Name "Dynamic_Priority_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Dynamic_Priority_Test.cpp

+

+!IF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Alpha Debug"

+

+DEP_CPP_DYNAM=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_DYNAM=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Enum_Interfaces_Test.dsp b/tests/Enum_Interfaces_Test.dsp
index 19e3dac3a45..010eec99a4e 100644
--- a/tests/Enum_Interfaces_Test.dsp
+++ b/tests/Enum_Interfaces_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Enum_Interfaces_Test - Win32 Release

+CFG=Enum_Interfaces_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Enum_Interfaces_Test - Win32 Release
 !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 "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 Release"

+!MESSAGE NMAKE /f "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Enum_Interfaces_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Enum_Interfaces_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Enum_Interfaces_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Enum_Interfaces_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Enum_Int"

+# PROP BASE Intermediate_Dir "Enum_Int"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Enum_Interfaces_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Enum_Int"

+# PROP BASE Intermediate_Dir "Enum_Int"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,74 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Enum_Interfaces_Test - Win32 Static Debug"

-# Name "Enum_Interfaces_Test - Win32 Static Release"

-# Name "Enum_Interfaces_Test - Win32 Release"

 # Name "Enum_Interfaces_Test - Win32 Debug"

+# Name "Enum_Interfaces_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Enum_Interfaces_Test.cpp

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 Alpha Debug"

+

+DEP_CPP_ENUM_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_ENUM_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Env_Value_Test.dsp b/tests/Env_Value_Test.dsp
index 9b5ffc15227..0721bced20d 100644
--- a/tests/Env_Value_Test.dsp
+++ b/tests/Env_Value_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Env_Value_Test - Win32 Release

+CFG=Env_Value_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Env_Value_Test - Win32 Release
 !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 "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 Release"

+!MESSAGE NMAKE /f "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Env_Value_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Env_Value_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Env_Value_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Env_Value_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Env_Value_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Env_Value_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Env_Value_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Env_Value_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Env_Value_Test\Debug"

+# PROP BASE Target_Dir ".\Env_Value_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Env_Value_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Env_Value_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Env_Value_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Env_Value_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Env_Value_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Env_Value_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Env_Value_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Env_Value_Test - Win32 Static Debug"

-# Name "Env_Value_Test - Win32 Static Release"

-# Name "Env_Value_Test - Win32 Release"

 # Name "Env_Value_Test - Win32 Debug"

+# Name "Env_Value_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Env_Value_Test.cpp

+

+!IF  "$(CFG)" == "Env_Value_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 Alpha Debug"

+

+DEP_CPP_ENV_V=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_ENV_V=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Future_Set_Test.dsp b/tests/Future_Set_Test.dsp
index e06aece8fce..bb179e5fb2d 100644
--- a/tests/Future_Set_Test.dsp
+++ b/tests/Future_Set_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Future_Set_Test - Win32 Release

+CFG=Future_Set_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Future_Set_Test - Win32 Release
 !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 "Future_Set_Test.mak" CFG="Future_Set_Test - Win32 Release"

+!MESSAGE NMAKE /f "Future_Set_Test.mak" CFG="Future_Set_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Future_Set_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Set_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Future_Set_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Future_Set_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Future_Set_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Future_Set_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Future_Set_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Future_Set_Test\Debug"

+# PROP BASE Target_Dir ".\Future_Set_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Future_Set_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,166 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Future_Set_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Future_Set_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Future_Set_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Future_Set_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Future_Set_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Future_Set_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Future_Set_Test - Win32 Static Debug"

-# Name "Future_Set_Test - Win32 Static Release"

-# Name "Future_Set_Test - Win32 Release"

 # Name "Future_Set_Test - Win32 Debug"

+# Name "Future_Set_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Future_Set_Test.cpp

+

+!IF  "$(CFG)" == "Future_Set_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Future_Set_Test - Win32 Alpha Debug"

+

+DEP_CPP_FUTUR=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Activation_Queue.h"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Future.cpp"\

+	"..\ace\Future.h"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Method_Request.h"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_FUTUR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Future_Test.dsp b/tests/Future_Test.dsp
index 27706d9da8c..2e431a52aba 100644
--- a/tests/Future_Test.dsp
+++ b/tests/Future_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Future_Test - Win32 Release

+CFG=Future_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Future_Test - Win32 Release
 !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 "Future_Test.mak" CFG="Future_Test - Win32 Release"

+!MESSAGE NMAKE /f "Future_Test.mak" CFG="Future_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Future_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Future_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Future_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Future_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Future_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Future_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Future_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Future_Test\Debug"

+# PROP BASE Target_Dir ".\Future_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Future_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,166 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Future_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Future_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Future_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Future_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Future_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Future_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Future_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Future_Test - Win32 Static Debug"

-# Name "Future_Test - Win32 Static Release"

-# Name "Future_Test - Win32 Release"

 # Name "Future_Test - Win32 Debug"

+# Name "Future_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Future_Test.cpp

+

+!IF  "$(CFG)" == "Future_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 Alpha Debug"

+

+DEP_CPP_FUTUR=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Activation_Queue.h"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Future.cpp"\

+	"..\ace\Future.h"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Method_Request.h"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_FUTUR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Handle_Set_Test.dsp b/tests/Handle_Set_Test.dsp
index 0c0183a5824..14724a0ef92 100644
--- a/tests/Handle_Set_Test.dsp
+++ b/tests/Handle_Set_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Handle_Set_Test - Win32 Release

+CFG=Handle_Set_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Handle_Set_Test - Win32 Release
 !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 "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 Release"

+!MESSAGE NMAKE /f "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Handle_Set_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Handle_Set_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Handle_Set_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Handle_Set_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Handle_Set_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Handle_Set_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Handle_Set_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Handle_Set_Test\Debug"

+# PROP BASE Target_Dir ".\Handle_Set_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Handle_Set_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,124 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Handle_Set_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Handle_Set_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Handle_Set_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Handle_Set_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Handle_Set_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Handle_Set_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Handle_Set_Test - Win32 Static Debug"

-# Name "Handle_Set_Test - Win32 Static Release"

-# Name "Handle_Set_Test - Win32 Release"

 # Name "Handle_Set_Test - Win32 Debug"

+# Name "Handle_Set_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Handle_Set_Test.cpp

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 Alpha Debug"

+

+DEP_CPP_HANDL=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\High_Res_Timer.h"\

+	"..\ace\High_Res_Timer.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_HANDL=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Hash_Map_Bucket_Iterator_Test.dsp b/tests/Hash_Map_Bucket_Iterator_Test.dsp
index 458709e86d0..8043aec64ee 100644
--- a/tests/Hash_Map_Bucket_Iterator_Test.dsp
+++ b/tests/Hash_Map_Bucket_Iterator_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Hash_Map_Bucket_Iterator_Test - Win32 Release

+CFG=Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Hash_Map_Bucket_Iterator_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Hash_Map_Bucket_Iterator_Test.mak" CFG="Hash_Map_Bucket_Iterator_Test - Win32 Release"

+!MESSAGE NMAKE /f "Hash_Map_Bucket_Iterator_Test.mak" CFG="Hash_Map_Bucket_Iterator_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# 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 "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Hash_Map_Bucket_Iterator_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Hash_Map"

+# PROP BASE Intermediate_Dir "Hash_Map"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,120 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug"

-# Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Release"

-# Name "Hash_Map_Bucket_Iterator_Test - Win32 Release"

 # Name "Hash_Map_Bucket_Iterator_Test - Win32 Debug"

+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Hash_Map_Bucket_Iterator_Test.cpp

+

+!IF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Bucket_Iterator_Test - Win32 Alpha Debug"

+

+DEP_CPP_HASH_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_HASH_=\

+	"..\ace\stdcpp.h"\

+	".\Hash_Map_Bucket_Iterator_Test.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Hash_Map_Manager_Test.dsp b/tests/Hash_Map_Manager_Test.dsp
index a328669044c..4ce682bcfbd 100644
--- a/tests/Hash_Map_Manager_Test.dsp
+++ b/tests/Hash_Map_Manager_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Hash_Map_Manager_Test - Win32 Release

+CFG=Hash_Map_Manager_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Hash_Map_Manager_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 Release"

+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Hash_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Hash_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Hash_Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Hash_Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# 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 "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Hash_Map_Manager_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Hash_Map"

+# PROP BASE Intermediate_Dir "Hash_Map"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,120 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Hash_Map_Manager_Test - Win32 Static Debug"

-# Name "Hash_Map_Manager_Test - Win32 Static Release"

-# Name "Hash_Map_Manager_Test - Win32 Release"

 # Name "Hash_Map_Manager_Test - Win32 Debug"

+# Name "Hash_Map_Manager_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Hash_Map_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 Alpha Debug"

+

+DEP_CPP_HASH_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_HASH_=\

+	"..\ace\stdcpp.h"\

+	".\Hash_Map_Manager_Test.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/High_Res_Timer_Test.dsp b/tests/High_Res_Timer_Test.dsp
index 837214c90cf..e337dd0d9c0 100644
--- a/tests/High_Res_Timer_Test.dsp
+++ b/tests/High_Res_Timer_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=High_Res_Timer_Test - Win32 Release

+CFG=High_Res_Timer_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 

@@ -13,39 +14,37 @@ CFG=High_Res_Timer_Test - Win32 Release
 !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 "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 Release"

+!MESSAGE NMAKE /f "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "High_Res_Timer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "High_Res_Timer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "High_Res_Timer_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "High_Res_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "High_Res_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "High_Res_Timer_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "High_Res_Timer_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\High_Res_Timer_Test\Debug"

+# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\Debug"

+# PROP BASE Target_Dir ".\High_Res_Timer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\High_Res_Timer_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "High_Res_Timer_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "High_Res_Timer_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "High_Res_Timer_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "High_Res_Timer_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "High_Res_Timer_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "High_Res_Timer_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "High_Res_Timer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "High_Res_Timer_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "High_Res_Timer_Test - Win32 Static Debug"

-# Name "High_Res_Timer_Test - Win32 Static Release"

-# Name "High_Res_Timer_Test - Win32 Release"

 # Name "High_Res_Timer_Test - Win32 Debug"

+# Name "High_Res_Timer_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\High_Res_Timer_Test.cpp

+

+!IF  "$(CFG)" == "High_Res_Timer_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "High_Res_Timer_Test - Win32 Alpha Debug"

+

+DEP_CPP_HIGH_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_HIGH_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/IOStream_Test.dsp b/tests/IOStream_Test.dsp
index 88b31b60879..9799047be3c 100644
--- a/tests/IOStream_Test.dsp
+++ b/tests/IOStream_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=IOStream_Test - Win32 Release

+CFG=IOStream_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=IOStream_Test - Win32 Release
 !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 "IOStream_Test.mak" CFG="IOStream_Test - Win32 Release"

+!MESSAGE NMAKE /f "IOStream_Test.mak" CFG="IOStream_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "IOStream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "IOStream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IOStream_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "IOStream_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "IOStream_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "IOStream_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "IOStream_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\IOStream_Test\Debug"

+# PROP BASE Intermediate_Dir ".\IOStream_Test\Debug"

+# PROP BASE Target_Dir ".\IOStream_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\IOStream_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,191 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "IOStream_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "IOStream_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "IOStream_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "IOStream_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "IOStream_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "IOStream_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "IOStream_Test - Win32 Static Debug"

-# Name "IOStream_Test - Win32 Static Release"

-# Name "IOStream_Test - Win32 Release"

 # Name "IOStream_Test - Win32 Debug"

+# Name "IOStream_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\IOStream_Test.cpp

+

+!IF  "$(CFG)" == "IOStream_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "IOStream_Test - Win32 Alpha Debug"

+

+DEP_CPP_IOSTR=\

+	"..\ace\Acceptor.cpp"\

+	"..\ace\Acceptor.h"\

+	"..\ace\Acceptor.i"\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Dynamic.h"\

+	"..\ace\Dynamic.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\IOStream.h"\

+	"..\ace\IOStream_T.cpp"\

+	"..\ace\IOStream_T.h"\

+	"..\ace\IOStream_T.i"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Svc_Handler.cpp"\

+	"..\ace\Svc_Handler.h"\

+	"..\ace\Svc_Handler.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_IOSTR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Lazy_Map_Manager_Test.dsp b/tests/Lazy_Map_Manager_Test.dsp
index 6e652aa6e74..aef9d13f488 100644
--- a/tests/Lazy_Map_Manager_Test.dsp
+++ b/tests/Lazy_Map_Manager_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Lazy_Map_Manager_Test - Win32 Release

+CFG=Lazy_Map_Manager_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Lazy_Map_Manager_Test - Win32 Release
 !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 "Lazy_Map_Manager_Test.mak" CFG="Lazy_Map_Manager_Test - Win32 Release"

+!MESSAGE NMAKE /f "Lazy_Map_Manager_Test.mak" CFG="Lazy_Map_Manager_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Lazy_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Lazy_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Lazy_Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Lazy_Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Lazy_Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Lazy_Map_Manager_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,84 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Lazy_Map_Manager_Test - Win32 Static Debug"

-# Name "Lazy_Map_Manager_Test - Win32 Static Release"

-# Name "Lazy_Map_Manager_Test - Win32 Release"

 # Name "Lazy_Map_Manager_Test - Win32 Debug"

+# Name "Lazy_Map_Manager_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\Lazy_Map_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Lazy_Map_Manager_Test - Win32 Alpha Debug"

+

+DEP_CPP_LAZY_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_LAZY_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Log_Msg_Test.cpp b/tests/Log_Msg_Test.cpp
index 99331ef2f6a..cffc6454f92 100644
--- a/tests/Log_Msg_Test.cpp
+++ b/tests/Log_Msg_Test.cpp
@@ -276,12 +276,10 @@ test_log_msg_features (const ACE_TCHAR *program)
                             sizeof array);
 
   // Disable the LM_DEBUG and LM_INFO messages.
-  u_long priority_mask =
-    ACE_LOG_MSG->priority_mask (ACE_Log_Msg::PROCESS);
+  u_long priority_mask = ACE_LOG_MSG->priority_mask ();
   ACE_CLR_BITS (priority_mask,
                 LM_DEBUG | LM_INFO);
-  ACE_LOG_MSG->priority_mask (priority_mask,
-                              ACE_Log_Msg::PROCESS);
+  ACE_LOG_MSG->priority_mask (priority_mask);
 
   ACE_DEBUG ((LM_INFO,
               "This LM_INFO message should not print!\n"));
diff --git a/tests/Log_Msg_Test.dsp b/tests/Log_Msg_Test.dsp
index 261382749b9..fbae6adfa03 100644
--- a/tests/Log_Msg_Test.dsp
+++ b/tests/Log_Msg_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Log_Msg_Test - Win32 Release

+CFG=Log_Msg_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 

@@ -13,104 +14,53 @@ CFG=Log_Msg_Test - Win32 Release
 !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 "Log_Msg_Test.mak" CFG="Log_Msg_Test - Win32 Release"

+!MESSAGE NMAKE /f "Log_Msg_Test.mak" CFG="Log_Msg_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Log_Msg_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Log_Msg_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Log_Msg_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Log_Msg_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Log_Msg_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Log_Msg_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Log_Msg_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Notify_P"

+# PROP BASE Intermediate_Dir "Notify_P"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /Fr /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Log_Msg_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Log_Msg_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Log_Msg_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Log_Msg_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Notify_P"

+# PROP BASE Intermediate_Dir "Notify_P"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,29 +68,36 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # 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"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Log_Msg_Test - Win32 Static Debug"

-# Name "Log_Msg_Test - Win32 Static Release"

-# Name "Log_Msg_Test - Win32 Release"

 # Name "Log_Msg_Test - Win32 Debug"

+# Name "Log_Msg_Test - Win32 Alpha Debug"

 # Begin Source File

 

 SOURCE=.\Log_Msg_Test.cpp

+

+!IF  "$(CFG)" == "Log_Msg_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Log_Msg_Test - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/tests/MEM_Stream_Test.dsp b/tests/MEM_Stream_Test.dsp
index a7e5304fa34..47d747a2fbd 100644
--- a/tests/MEM_Stream_Test.dsp
+++ b/tests/MEM_Stream_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=MEM_Stream_Test - Win32 Release

+CFG=MEM_Stream_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=MEM_Stream_Test - Win32 Release
 !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 "MEM_Stream_Test.mak" CFG="MEM_Stream_Test - Win32 Release"

+!MESSAGE NMAKE /f "MEM_Stream_Test.mak" CFG="MEM_Stream_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MEM_Stream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MEM_Stream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MEM_Stream_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "MEM_Stream_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MEM_Stream_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "MEM_Stream_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "MEM_Stream_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\MEM_Stream_Test\Debug"

+# PROP BASE Intermediate_Dir ".\MEM_Stream_Test\Debug"

+# PROP BASE Target_Dir ".\MEM_Stream_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\MEM_Stream_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,162 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "MEM_Stream_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "MEM_Stream_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "MEM_Stream_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MEM_Stream_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "MEM_Stream_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "MEM_Stream_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "MEM_Stream_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "MEM_Stream_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "MEM_Stream_Test - Win32 Static Debug"

-# Name "MEM_Stream_Test - Win32 Static Release"

-# Name "MEM_Stream_Test - Win32 Release"

 # Name "MEM_Stream_Test - Win32 Debug"

+# Name "MEM_Stream_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\MEM_Stream_Test.cpp

+

+!IF  "$(CFG)" == "MEM_Stream_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "MEM_Stream_Test - Win32 Alpha Debug"

+

+DEP_CPP_REACT=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/MM_Shared_Memory_Test.dsp b/tests/MM_Shared_Memory_Test.dsp
index 7e1db889206..28267b80155 100644
--- a/tests/MM_Shared_Memory_Test.dsp
+++ b/tests/MM_Shared_Memory_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=MM_Shared_Memory_Test - Win32 Release

+CFG=MM_Shared_Memory_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 

@@ -13,39 +14,37 @@ CFG=MM_Shared_Memory_Test - Win32 Release
 !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 "MM_Shared_Memory_Test.mak" CFG="MM_Shared_Memory_Test - Win32 Release"

+!MESSAGE NMAKE /f "MM_Shared_Memory_Test.mak" CFG="MM_Shared_Memory_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MM_Shared_Memory_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MM_Shared_Memory_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MM_Shared_Memory_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "MM_Shared_Memory_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MM_Shared_Memory_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\Debug"

+# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\Debug"

+# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\MM_Shared_Memory_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,122 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "MM_Shared_Memory_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "MM_Shared_Memory_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "MM_Shared_Memory_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "MM_Shared_Memory_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "MM_Shared_Memory_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "MM_Shared_Memory_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "MM_Shared_Memory_Test - Win32 Static Debug"

-# Name "MM_Shared_Memory_Test - Win32 Static Release"

-# Name "MM_Shared_Memory_Test - Win32 Release"

 # Name "MM_Shared_Memory_Test - Win32 Debug"

+# Name "MM_Shared_Memory_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\MM_Shared_Memory_Test.cpp

+

+!IF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 Alpha Debug"

+

+DEP_CPP_MM_SH=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Shared_Memory.h"\

+	"..\ace\Shared_Memory_MM.h"\

+	"..\ace\Shared_Memory_MM.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MM_SH=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/MT_Reactor_Timer_Test.dsp b/tests/MT_Reactor_Timer_Test.dsp
index aa89da0f747..b1e3819e992 100644
--- a/tests/MT_Reactor_Timer_Test.dsp
+++ b/tests/MT_Reactor_Timer_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=MT_Reactor_Timer_Test - Win32 Release

+CFG=MT_Reactor_Timer_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=MT_Reactor_Timer_Test - Win32 Release
 !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 Release"

+!MESSAGE NMAKE /f "MT_Reactor_Timer_Test.mak" CFG="MT_Reactor_Timer_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MT_Reactor_Timer_Test - Win32 Static Debug" (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 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "MT_Reactor_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_Reactor_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) 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 Static Debug"

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\MT_Reactor_Timer_Test\Debug"

+# PROP BASE Intermediate_Dir ".\MT_Reactor_Timer_Test\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 Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\MT_Reactor_Timer_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /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 "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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 Debug"

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "MT_Reactor_Timer_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "MT_Reactor_Timer_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "MT_Reactor_Timer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "MT_Reactor_Timer_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "MT_Reactor_Timer_Test - Win32 Static Debug"

-# Name "MT_Reactor_Timer_Test - Win32 Static Release"

-# Name "MT_Reactor_Timer_Test - Win32 Release"

 # Name "MT_Reactor_Timer_Test - Win32 Debug"

+# Name "MT_Reactor_Timer_Test - Win32 Alpha 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

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 Alpha Debug"

+

+DEP_CPP_MT_RE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MT_RE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/MT_SOCK_Test.dsp b/tests/MT_SOCK_Test.dsp
index 093077449ee..e13d5b8eb6d 100644
--- a/tests/MT_SOCK_Test.dsp
+++ b/tests/MT_SOCK_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=MT_SOCK_Test - Win32 Release

+CFG=MT_SOCK_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=MT_SOCK_Test - Win32 Release
 !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_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Release"

+!MESSAGE NMAKE /f "MT_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "MT_SOCK_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_SOCK_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_SOCK_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "MT_SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_SOCK_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "MT_SOCK_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "MT_SOCK_"

+# PROP BASE Intermediate_Dir "MT_SOCK_"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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_SOCK_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "MT_SOCK0"

+# PROP BASE Intermediate_Dir "MT_SOCK0"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,29 +68,119 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # 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"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "MT_SOCK_Test - Win32 Static Debug"

-# Name "MT_SOCK_Test - Win32 Static Release"

-# Name "MT_SOCK_Test - Win32 Release"

 # Name "MT_SOCK_Test - Win32 Debug"

+# Name "MT_SOCK_Test - Win32 Alpha Debug"

 # Begin Source File

 

 SOURCE=.\MT_SOCK_Test.cpp

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 Alpha Debug"

+

+DEP_CPP_MT_SO=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MT_SO=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/tests/Makefile b/tests/Makefile
index beae3247d01..6002121af0f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -182,7 +182,10 @@ endif
 #       Local targets
 #----------------------------------------------------------------------------
 
-libDLL_Test.$(SOEXT): DLL_Test_Impl.cpp DLL_Test_Impl.h
+libDLL_Test.$(SOEXT): DLL_Test.cpp
+ifdef TEMPINCDIR
+	$(RM) .obj/DLL_Test.o
+endif
 	@$(MAKE) -f Makefile.DLL_Test
 
 realclean: clean
@@ -355,7 +358,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp
 
 .obj/Atomic_Op_Test.o .obj/Atomic_Op_Test.so .shobj/Atomic_Op_Test.o .shobj/Atomic_Op_Test.so: Atomic_Op_Test.cpp \
- test_config.h \
+ $(ACE_ROOT)/tests/test_config.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -515,7 +518,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- test_config.h
+ $(ACE_ROOT)/tests/test_config.h
 
 .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/pre.h \
@@ -865,8 +868,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- test_config.h \
+ $(ACE_ROOT)/ace/OS.i test_config.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -1888,7 +1890,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Memory_Pool.i
 
 .obj/Config_Test.o .obj/Config_Test.so .shobj/Config_Test.o .shobj/Config_Test.so: Config_Test.cpp \
- test_config.h \
+ $(ACE_ROOT)/tests/test_config.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -2433,8 +2435,7 @@ 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
@@ -3096,8 +3097,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- test_config.h \
- $(ACE_ROOT)/ace/OS.h \
+ test_config.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
@@ -4469,8 +4469,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- MEM_Stream_Test.h
+ $(ACE_ROOT)/ace/Acceptor.cpp
 
 .obj/Mem_Map_Test.o .obj/Mem_Map_Test.so .shobj/Mem_Map_Test.o .shobj/Mem_Map_Test.so: Mem_Map_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -5870,8 +5869,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- test_config.h \
+ $(ACE_ROOT)/ace/OS.i test_config.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/ACE.h \
@@ -9906,9 +9904,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl
+ $(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/pre.h \
@@ -10071,7 +10067,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.cpp
 
 .obj/Timeprobe_Test.o .obj/Timeprobe_Test.so .shobj/Timeprobe_Test.o .shobj/Timeprobe_Test.so: Timeprobe_Test.cpp \
- test_config.h \
+ $(ACE_ROOT)/tests/test_config.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -10215,8 +10211,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
  $(ACE_ROOT)/ace/OS_Errno.inl \
- test_config.h \
- $(ACE_ROOT)/ace/OS.h \
+ test_config.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
  $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
@@ -10971,7 +10966,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Profile_Timer.i
 
 .obj/Thread_Pool_Reactor_Test.o .obj/Thread_Pool_Reactor_Test.so .shobj/Thread_Pool_Reactor_Test.o .shobj/Thread_Pool_Reactor_Test.so: Thread_Pool_Reactor_Test.cpp \
- test_config.h \
+ $(ACE_ROOT)/tests/test_config.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
@@ -11171,7 +11166,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
  $(ACE_ROOT)/ace/Select_Reactor_T.i \
  $(ACE_ROOT)/ace/TP_Reactor.i \
- Thread_Pool_Reactor_Test.h
+ $(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/pre.h \
diff --git a/tests/Makefile.DLL_Test b/tests/Makefile.DLL_Test
index de2d53aebb6..fba42dca16e 100644
--- a/tests/Makefile.DLL_Test
+++ b/tests/Makefile.DLL_Test
@@ -10,7 +10,7 @@
 
 LIB     = libDLL_Test.a
 SHLIB   = libDLL_Test.$(SOEXT)
-FILES   = DLL_Test_Impl
+FILES   = DLL_Test
 LSRC    = $(addsuffix .cpp,$(FILES))
 
 LIBS   += $(ACELIB)
@@ -46,4 +46,61 @@ endif
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 
+.obj/DLL_Test.o .obj/DLL_Test.so .shobj/DLL_Test.o .shobj/DLL_Test.so: DLL_Test.cpp test_config.h \
+ $(ACE_ROOT)/ace/pre.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/post.h \
+ $(ACE_ROOT)/ace/ace_wchar.h \
+ $(ACE_ROOT)/ace/ACE_export.h \
+ $(ACE_ROOT)/ace/svc_export.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/OS_Dirent.h \
+ $(ACE_ROOT)/ace/OS_Export.h \
+ $(ACE_ROOT)/ace/OS_Dirent.inl \
+ $(ACE_ROOT)/ace/OS_String.h \
+ $(ACE_ROOT)/ace/OS_String.inl \
+ $(ACE_ROOT)/ace/OS_Memory.h \
+ $(ACE_ROOT)/ace/OS_Memory.inl \
+ $(ACE_ROOT)/ace/OS_TLI.h \
+ $(ACE_ROOT)/ace/OS_TLI.inl \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.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 \
+ 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
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/tests/Makefile.bor b/tests/Makefile.bor
index 5535176af23..e9381321cfa 100644
--- a/tests/Makefile.bor
+++ b/tests/Makefile.bor
@@ -2,7 +2,9 @@
 # Makefile for building the ACE tests
 #
 
-NAMES = \
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+TESTS = \
 	Aio_Platform_Test \
 	ARGV_Test \
 	Atomic_Op_Test \
@@ -19,8 +21,7 @@ NAMES = \
 	CDR_Test \
 	Collection_Test \
 	Conn_Test \
-	Config_Test \
-	Dirent_Test \
+        Config_Test \
 	DLL_Test \
 	DLList_Test \
 	Dynamic_Priority_Test \
@@ -39,7 +40,7 @@ NAMES = \
 	Malloc_Test \
 	Map_Manager_Test \
 	Map_Test \
-	MEM_Stream_Test \
+        MEM_Stream_Test \
 	Mem_Map_Test \
 	Message_Block_Test \
 	Message_Queue_Notifications_Test \
@@ -69,8 +70,7 @@ NAMES = \
 	Reactors_Test \
 	Reader_Writer_Test \
 	Recursive_Mutex_Test \
-        Refcounted_Auto_Ptr_Test \
-        Reverse_Lock_Test \
+	Reverse_Lock_Test \
 	Semaphore_Test \
 	Service_Config_Test \
 	Signal_Test \
@@ -99,7 +99,21 @@ NAMES = \
 	UPIPE_SAP_Test \
 	XtReactor_Test
 
-DIRS = RMCast
+!ifdef TARGET_NAME
+NAME = $(TARGET_NAME)
+!else
+!undef NAME
+
+all: $(TESTS)
+
+$(TESTS):
+	$(MAKE) -fMakefile.bor -DTARGET_NAME=$@ $(MAKE_FLAGS)
+
+clean: $(TESTS:_Test=_Test.Clean)
+
+$(TESTS:_Test=_Test.Clean):
+	$(MAKE) -fMakefile.bor -DTARGET_NAME=$(@:.Clean=) $(MAKE_FLAGS) clean
+!endif
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
@@ -109,5 +123,4 @@ CPPDIR = .
 
 LIBFILES = $(ACE_LIB)
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/tests/Malloc_Test.cpp b/tests/Malloc_Test.cpp
index 946ebb74019..9f39f51652b 100644
--- a/tests/Malloc_Test.cpp
+++ b/tests/Malloc_Test.cpp
@@ -361,16 +361,16 @@ template class ACE_Based_Pointer<Long_Test>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
 #pragma instantiate auto_ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >
-#pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >
+#pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex, ACE_PI_Control_Block> >;
 #else
 #pragma instantiate auto_ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >
-#pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >
+#pragma instantiate ACE_Auto_Basic_Ptr< ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Process_Mutex> >;
 #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */
 #pragma instantiate ACE_Based_Pointer<Test_Data>
 #pragma instantiate ACE_Based_Pointer_Basic<Test_Data>
 #pragma instantiate ACE_Based_Pointer_Basic<long>
 #pragma instantiate ACE_Based_Pointer_Basic<Long_Test>
-#pragma instantiate ACE_Based_Pointer<Long_Test>
+#pragma instantiate ACE_Based_Pointer_Basic<Long>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #else
diff --git a/tests/Malloc_Test.dsp b/tests/Malloc_Test.dsp
index 5271a3eba6a..8a181ac90fd 100644
--- a/tests/Malloc_Test.dsp
+++ b/tests/Malloc_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Malloc_Test - Win32 Release

+CFG=Malloc_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 

@@ -13,39 +14,37 @@ CFG=Malloc_Test - Win32 Release
 !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 "Malloc_Test.mak" CFG="Malloc_Test - Win32 Release"

+!MESSAGE NMAKE /f "Malloc_Test.mak" CFG="Malloc_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Malloc_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Malloc_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Malloc_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Malloc_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Malloc_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Malloc_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Malloc_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Malloc_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Malloc_Test\Debug"

+# PROP BASE Target_Dir ".\Malloc_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Malloc_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Malloc_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Malloc_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Malloc_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Malloc_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Malloc_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Malloc_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Malloc_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Malloc_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Malloc_Test - Win32 Static Debug"

-# Name "Malloc_Test - Win32 Static Release"

-# Name "Malloc_Test - Win32 Release"

 # Name "Malloc_Test - Win32 Debug"

+# Name "Malloc_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Malloc_Test.cpp

+

+!IF  "$(CFG)" == "Malloc_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Malloc_Test - Win32 Alpha Debug"

+

+DEP_CPP_MALLO=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MALLO=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Map_Manager_Test.dsp b/tests/Map_Manager_Test.dsp
index 28a16ae66a9..f12a82892c0 100644
--- a/tests/Map_Manager_Test.dsp
+++ b/tests/Map_Manager_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Map_Manager_Test - Win32 Release

+CFG=Map_Manager_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Map_Manager_Test - Win32 Release
 !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_Manager_Test.mak" CFG="Map_Manager_Test - Win32 Release"

+!MESSAGE NMAKE /f "Map_Manager_Test.mak" CFG="Map_Manager_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Map_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Map_Manager_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Map_Manager_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Map_Manager_Test\Debug"

+# PROP BASE Target_Dir ".\Map_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Map_Manager_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,143 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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_Manager_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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_Manager_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Map_Manager_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Map_Manager_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Map_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Map_Manager_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Map_Manager_Test - Win32 Static Debug"

-# Name "Map_Manager_Test - Win32 Static Release"

-# Name "Map_Manager_Test - Win32 Release"

 # Name "Map_Manager_Test - Win32 Debug"

+# Name "Map_Manager_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Map_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 Alpha Debug"

+

+DEP_CPP_MAP_M=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\High_Res_Timer.h"\

+	"..\ace\High_Res_Timer.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map_Manager.cpp"\

+	"..\ace\Map_Manager.h"\

+	"..\ace\Map_Manager.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MAP_M=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Map_Test.dsp b/tests/Map_Test.dsp
index 3cf80ff10b2..30c433509ce 100644
--- a/tests/Map_Test.dsp
+++ b/tests/Map_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Map_Test - Win32 Release

+CFG=Map_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Map_Test - Win32 Release
 !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 Release"

+!MESSAGE NMAKE /f "Map_Test.mak" CFG="Map_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Map_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Map_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) 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 Static Debug"

+!IF  "$(CFG)" == "Map_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Map_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Map_Test\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 Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Map_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,143 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /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 "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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 Debug"

+!ELSEIF  "$(CFG)" == "Map_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Map_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Map_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Map_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Map_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Map_Test - Win32 Static Debug"

-# Name "Map_Test - Win32 Static Release"

-# Name "Map_Test - Win32 Release"

 # Name "Map_Test - Win32 Debug"

+# Name "Map_Test - Win32 Alpha 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

+

+!IF  "$(CFG)" == "Map_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Map_Test - Win32 Alpha Debug"

+

+DEP_CPP_MAP_T=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\High_Res_Timer.h"\

+	"..\ace\High_Res_Timer.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map.cpp"\

+	"..\ace\Map.h"\

+	"..\ace\Map.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\Profile_Timer.h"\

+	"..\ace\Profile_Timer.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MAP_T=\

+	"..\ace\Hash_Map.cpp"\

+	"..\ace\Hash_Map.h"\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Mem_Map_Test.dsp b/tests/Mem_Map_Test.dsp
index 2c8c16c70de..41eea32690e 100644
--- a/tests/Mem_Map_Test.dsp
+++ b/tests/Mem_Map_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Mem_Map_Test - Win32 Release

+CFG=Mem_Map_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 

@@ -13,39 +14,37 @@ CFG=Mem_Map_Test - Win32 Release
 !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 "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Release"

+!MESSAGE NMAKE /f "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Mem_Map_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mem_Map_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mem_Map_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Mem_Map_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Mem_Map_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Mem_Map_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Mem_Map_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Mem_Map_Test\Debug"

+# PROP BASE Target_Dir ".\Mem_Map_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Mem_Map_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,88 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Mem_Map_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Mem_Map_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Mem_Map_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Mem_Map_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Mem_Map_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Mem_Map_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Mem_Map_Test - Win32 Static Debug"

-# Name "Mem_Map_Test - Win32 Static Release"

-# Name "Mem_Map_Test - Win32 Release"

 # Name "Mem_Map_Test - Win32 Debug"

+# Name "Mem_Map_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Mem_Map_Test.cpp

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 Alpha Debug"

+

+DEP_CPP_MEM_M=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MEM_M=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Message_Block_Test.dsp b/tests/Message_Block_Test.dsp
index 031ddb0c14a..53d56fa3c91 100644
--- a/tests/Message_Block_Test.dsp
+++ b/tests/Message_Block_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Message_Block_Test - Win32 Release

+CFG=Message_Block_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Message_Block_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 Release"

+!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Block_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Block_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Block_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Message_Block_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Block_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Message_Block_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Message_Block_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Message_Block_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Message_Block_Test\Debug"

+# PROP BASE Target_Dir ".\Message_Block_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Message_Block_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,167 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Message_Block_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Message_Block_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Message_Block_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Message_Block_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Message_Block_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Message_Block_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Message_Block_Test - Win32 Static Debug"

-# Name "Message_Block_Test - Win32 Static Release"

-# Name "Message_Block_Test - Win32 Release"

 # Name "Message_Block_Test - Win32 Debug"

+# Name "Message_Block_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Message_Block_Test.cpp

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 Alpha Debug"

+

+DEP_CPP_MESSA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\High_Res_Timer.h"\

+	"..\ace\High_Res_Timer.i"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Message_Queue_Notifications_Test.dsp b/tests/Message_Queue_Notifications_Test.dsp
index 65460ee8d94..baac76b7c5b 100644
--- a/tests/Message_Queue_Notifications_Test.dsp
+++ b/tests/Message_Queue_Notifications_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Message_Queue_Notifications_Test - Win32 Release

+CFG=Message_Queue_Notifications_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Message_Queue_Notifications_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 Release"

+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Notifications_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Message_Queue_Notifications_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\Debug"

+# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Message_Queue_Notifications_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,167 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Message_Queue_Notifications_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Message_Queue_Notifications_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Message_Queue_Notifications_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Message_Queue_Notifications_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Message_Queue_Notifications_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Message_Queue_Notifications_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Message_Queue_Notifications_Test - Win32 Static Debug"

-# Name "Message_Queue_Notifications_Test - Win32 Static Release"

-# Name "Message_Queue_Notifications_Test - Win32 Release"

 # Name "Message_Queue_Notifications_Test - Win32 Debug"

+# Name "Message_Queue_Notifications_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Message_Queue_Notifications_Test.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 Alpha Debug"

+

+DEP_CPP_MESSA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\High_Res_Timer.h"\

+	"..\ace\High_Res_Timer.i"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Message_Queue_Test.dsp b/tests/Message_Queue_Test.dsp
index e8d5cf3dfda..56832152d97 100644
--- a/tests/Message_Queue_Test.dsp
+++ b/tests/Message_Queue_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Message_Queue_Test - Win32 Release

+CFG=Message_Queue_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Message_Queue_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 Release"

+!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Message_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Message_Queue_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Message_Queue_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Test\Debug"

+# PROP BASE Target_Dir ".\Message_Queue_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Message_Queue_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,151 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Message_Queue_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Message_Queue_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Message_Queue_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Message_Queue_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Message_Queue_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Message_Queue_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Message_Queue_Test - Win32 Static Debug"

-# Name "Message_Queue_Test - Win32 Static Release"

-# Name "Message_Queue_Test - Win32 Release"

 # Name "Message_Queue_Test - Win32 Debug"

+# Name "Message_Queue_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Message_Queue_Test.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 Alpha Debug"

+

+DEP_CPP_MESSA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Message_Queue_Test_Ex.dsp b/tests/Message_Queue_Test_Ex.dsp
index 7d188a3af42..473c65bef71 100644
--- a/tests/Message_Queue_Test_Ex.dsp
+++ b/tests/Message_Queue_Test_Ex.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Message_Queue_Test_Ex - Win32 Release

+CFG=Message_Queue_Test_Ex - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Message_Queue_Test_Ex - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Message_Queue_Test_Ex.mak" CFG="Message_Queue_Test_Ex - Win32 Release"

+!MESSAGE NMAKE /f "Message_Queue_Test_Ex.mak" CFG="Message_Queue_Test_Ex - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Test_Ex - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Test_Ex - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Message_Queue_Test_Ex - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Message_Queue_Test_Ex - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Test_Ex - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Message_Queue_Test_Ex - Win32 Static Debug"

+!IF  "$(CFG)" == "Message_Queue_Test_Ex - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Message_Queue_Test_Ex\Debug"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Test_Ex\Debug"

+# PROP BASE Target_Dir ".\Message_Queue_Test_Ex"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Message_Queue_Test_Ex"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,151 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Message_Queue_Test_Ex - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Message_Queue_Test_Ex - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Message_Queue_Test_Ex - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Message_Queue_Test_Ex - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Message_Queue_Test_Ex\Alpha Debug"

+# PROP BASE Intermediate_Dir "Message_Queue_Test_Ex\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Message_Queue_Test_Ex"

 # 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" /FD /c

+# PROP Target_Dir "Message_Queue_Test_Ex"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Message_Queue_Test_Ex - Win32 Static Debug"

-# Name "Message_Queue_Test_Ex - Win32 Static Release"

-# Name "Message_Queue_Test_Ex - Win32 Release"

 # Name "Message_Queue_Test_Ex - Win32 Debug"

+# Name "Message_Queue_Test_Ex - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Message_Queue_Test_Ex.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Test_Ex - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test_Ex - Win32 Alpha Debug"

+

+DEP_CPP_MESSA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Naming_Test.dsp b/tests/Naming_Test.dsp
index 7ffd2b845b1..729b5435291 100644
--- a/tests/Naming_Test.dsp
+++ b/tests/Naming_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Naming_Test - Win32 Release

+CFG=Naming_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Naming_Test - Win32 Release
 !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 "Naming_Test.mak" CFG="Naming_Test - Win32 Release"

+!MESSAGE NMAKE /f "Naming_Test.mak" CFG="Naming_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Naming_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Naming_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Naming_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Naming_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Naming_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Naming_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Naming_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Naming_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Naming_Test\Debug"

+# PROP BASE Target_Dir ".\Naming_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Naming_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,157 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Naming_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Naming_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Naming_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Naming_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Naming_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Naming_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Naming_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Naming_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Naming_Test - Win32 Static Debug"

-# Name "Naming_Test - Win32 Static Release"

-# Name "Naming_Test - Win32 Release"

 # Name "Naming_Test - Win32 Debug"

+# Name "Naming_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Naming_Test.cpp

+

+!IF  "$(CFG)" == "Naming_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Naming_Test - Win32 Alpha Debug"

+

+DEP_CPP_NAMIN=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\High_Res_Timer.h"\

+	"..\ace\High_Res_Timer.i"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Name_Proxy.h"\

+	"..\ace\Name_Request_Reply.h"\

+	"..\ace\Name_Space.h"\

+	"..\ace\Naming_Context.h"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_NAMIN=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/New_Fail_Test.dsp b/tests/New_Fail_Test.dsp
index f07128979a3..fd508a74c02 100644
--- a/tests/New_Fail_Test.dsp
+++ b/tests/New_Fail_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=New_Fail_Test - Win32 Release

+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 

@@ -13,39 +14,37 @@ CFG=New_Fail_Test - Win32 Release
 !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 Release"

+!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 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "New_Fail_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "New_Fail_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) 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 Static Debug"

+!IF  "$(CFG)" == "New_Fail_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\New_Fail_Test\Debug"

+# PROP BASE Intermediate_Dir ".\New_Fail_Test\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 Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\New_Fail_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /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 "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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 Debug"

+!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "New_Fail_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "New_Fail_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "New_Fail_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "New_Fail_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "New_Fail_Test - Win32 Static Debug"

-# Name "New_Fail_Test - Win32 Static Release"

-# Name "New_Fail_Test - Win32 Release"

 # Name "New_Fail_Test - Win32 Debug"

+# Name "New_Fail_Test - Win32 Alpha 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

+

+!IF  "$(CFG)" == "New_Fail_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 Alpha Debug"

+

+DEP_CPP_NEW_F=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_NEW_F=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Notify_Performance_Test.dsp b/tests/Notify_Performance_Test.dsp
index 8353eaba4fc..582732364fd 100644
--- a/tests/Notify_Performance_Test.dsp
+++ b/tests/Notify_Performance_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Notify_Performance_Test - Win32 Release

+CFG=Notify_Performance_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Notify_Performance_Test - Win32 Release
 !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 "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 Release"

+!MESSAGE NMAKE /f "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Notify_Performance_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Notify_Performance_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Notify_Performance_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Notify_Performance_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Notify_Performance_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Notify_Performance_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Notify_P"

+# PROP BASE Intermediate_Dir "Notify_P"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Notify_Performance_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Notify_P"

+# PROP BASE Intermediate_Dir "Notify_P"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,29 +68,150 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # 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"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Notify_Performance_Test - Win32 Static Debug"

-# Name "Notify_Performance_Test - Win32 Static Release"

-# Name "Notify_Performance_Test - Win32 Release"

 # Name "Notify_Performance_Test - Win32 Debug"

+# Name "Notify_Performance_Test - Win32 Alpha Debug"

 # Begin Source File

 

 SOURCE=.\Notify_Performance_Test.cpp

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 Alpha Debug"

+

+DEP_CPP_NOTIF=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\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\IO_Cntl_Msg.h"\

+	"..\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_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map_Manager.cpp"\

+	"..\ace\Map_Manager.h"\

+	"..\ace\Map_Manager.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Pipe.h"\

+	"..\ace\Pipe.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.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_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\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\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_NOTIF=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/tests/OS_Test.dsp b/tests/OS_Test.dsp
index b649eb14ef0..fa45f66fb5b 100644
--- a/tests/OS_Test.dsp
+++ b/tests/OS_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=OS_Test - Win32 Release

+CFG=OS_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 

@@ -13,39 +14,37 @@ CFG=OS_Test - Win32 Release
 !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 "OS_Test.mak" CFG="OS_Test - Win32 Release"

+!MESSAGE NMAKE /f "OS_Test.mak" CFG="OS_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "OS_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "OS_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "OS_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "OS_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "OS_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "OS_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "OS_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\OS_Test\Debug"

+# PROP BASE Intermediate_Dir ".\OS_Test\Debug"

+# PROP BASE Target_Dir ".\OS_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\OS_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,73 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "OS_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "OS_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "OS_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "OS_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "OS_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "OS_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "OS_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "OS_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "OS_Test - Win32 Static Debug"

-# Name "OS_Test - Win32 Static Release"

-# Name "OS_Test - Win32 Release"

 # Name "OS_Test - Win32 Debug"

+# Name "OS_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\OS_Test.cpp

+

+!IF  "$(CFG)" == "OS_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "OS_Test - Win32 Alpha Debug"

+

+DEP_CPP_OS=\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_OS=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Object_Manager_Test.dsp b/tests/Object_Manager_Test.dsp
index fa6eafc8f71..ab93570c7d9 100644
--- a/tests/Object_Manager_Test.dsp
+++ b/tests/Object_Manager_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Object_Manager_Test - Win32 Release

+CFG=Object_Manager_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Object_Manager_Test - Win32 Release
 !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 "Object_Manager_Test.mak" CFG="Object_Manager_Test - Win32 Release"

+!MESSAGE NMAKE /f "Object_Manager_Test.mak" CFG="Object_Manager_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Object_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Object_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Object_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Object_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Object_Manager_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Object_Manager_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Object_Manager_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Debug"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Object_Manager_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,55 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Object_Manager_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Object_Manager_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Object_Manager_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Object_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Object_Manager_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Object_Manager_Test - Win32 Static Debug"

-# Name "Object_Manager_Test - Win32 Static Release"

-# Name "Object_Manager_Test - Win32 Release"

 # Name "Object_Manager_Test - Win32 Debug"

+# Name "Object_Manager_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Object_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Object_Manager_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Object_Manager_Test - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/OrdMultiSet_Test.dsp b/tests/OrdMultiSet_Test.dsp
index 438f0ac3667..24ba893f810 100644
--- a/tests/OrdMultiSet_Test.dsp
+++ b/tests/OrdMultiSet_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=OrdMultiSet_Test - Win32 Release

+CFG=OrdMultiSet_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=OrdMultiSet_Test - Win32 Release
 !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 "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 Release"

+!MESSAGE NMAKE /f "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "OrdMultiSet_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "OrdMultiSet_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "OrdMultiSet_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "OrdMultiSet_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "OrdMultiSet_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\OrdMultiSet_Test\Debug"

+# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\Debug"

+# PROP BASE Target_Dir ".\OrdMultiSet_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\OrdMultiSet_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "OrdMultiSet_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "OrdMultiSet_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "OrdMultiSet_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "OrdMultiSet_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "OrdMultiSet_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "OrdMultiSet_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "OrdMultiSet_Test - Win32 Static Debug"

-# Name "OrdMultiSet_Test - Win32 Static Release"

-# Name "OrdMultiSet_Test - Win32 Release"

 # Name "OrdMultiSet_Test - Win32 Debug"

+# Name "OrdMultiSet_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\OrdMultiSet_Test.cpp

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 Alpha Debug"

+

+DEP_CPP_ORDMU=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_ORDMU=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Pipe_Test.dsp b/tests/Pipe_Test.dsp
index a7545318ff6..7c5957d1bc7 100644
--- a/tests/Pipe_Test.dsp
+++ b/tests/Pipe_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Pipe_Test - Win32 Release

+CFG=Pipe_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Pipe_Test - Win32 Release
 !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 "Pipe_Test.mak" CFG="Pipe_Test - Win32 Release"

+!MESSAGE NMAKE /f "Pipe_Test.mak" CFG="Pipe_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Pipe_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Pipe_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Pipe_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Pipe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Pipe_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Pipe_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Pipe_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Pipe_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Pipe_Test\Debug"

+# PROP BASE Target_Dir ".\Pipe_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Pipe_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,92 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Pipe_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Pipe_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Pipe_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Pipe_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Pipe_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Pipe_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Pipe_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Pipe_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Pipe_Test - Win32 Static Debug"

-# Name "Pipe_Test - Win32 Static Release"

-# Name "Pipe_Test - Win32 Release"

 # Name "Pipe_Test - Win32 Debug"

+# Name "Pipe_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Pipe_Test.cpp

+

+!IF  "$(CFG)" == "Pipe_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Pipe_Test - Win32 Alpha Debug"

+

+DEP_CPP_PIPE_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Pipe.h"\

+	"..\ace\Pipe.i"\

+	"..\ace\Process.h"\

+	"..\ace\Process.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_PIPE_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Priority_Buffer_Test.dsp b/tests/Priority_Buffer_Test.dsp
index 83c3be66ffe..d72645af0bc 100644
--- a/tests/Priority_Buffer_Test.dsp
+++ b/tests/Priority_Buffer_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Priority_Buffer_Test - Win32 Release

+CFG=Priority_Buffer_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Priority_Buffer_Test - Win32 Release
 !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 "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 Release"

+!MESSAGE NMAKE /f "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Buffer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Buffer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Buffer_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Priority_Buffer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Buffer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Priority_Buffer_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\Debug"

+# PROP BASE Target_Dir ".\Priority_Buffer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Priority_Buffer_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,151 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Priority_Buffer_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Priority_Buffer_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Priority_Buffer_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Priority_Buffer_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Priority_Buffer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Priority_Buffer_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Priority_Buffer_Test - Win32 Static Debug"

-# Name "Priority_Buffer_Test - Win32 Static Release"

-# Name "Priority_Buffer_Test - Win32 Release"

 # Name "Priority_Buffer_Test - Win32 Debug"

+# Name "Priority_Buffer_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Priority_Buffer_Test.cpp

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 Alpha Debug"

+

+DEP_CPP_PRIOR=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Priority_Reactor_Test.dsp b/tests/Priority_Reactor_Test.dsp
index 224db6d08f8..57fa3ed77d0 100644
--- a/tests/Priority_Reactor_Test.dsp
+++ b/tests/Priority_Reactor_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Priority_Reactor_Test - Win32 Release

+CFG=Priority_Reactor_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Priority_Reactor_Test - Win32 Release
 !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 "Priority_Reactor_Test.mak" CFG="Priority_Reactor_Test - Win32 Release"

+!MESSAGE NMAKE /f "Priority_Reactor_Test.mak" CFG="Priority_Reactor_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Reactor_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Reactor_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Reactor_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Priority_Reactor_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Reactor_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Priority_Reactor_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Priority_Reactor_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Priority"

+# PROP BASE Intermediate_Dir "Priority"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Priority_Reactor_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Priority"

+# PROP BASE Intermediate_Dir "Priority"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,29 +68,187 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Priority_Reactor_Test - Win32 Static Debug"

-# Name "Priority_Reactor_Test - Win32 Static Release"

-# Name "Priority_Reactor_Test - Win32 Release"

 # Name "Priority_Reactor_Test - Win32 Debug"

+# Name "Priority_Reactor_Test - Win32 Alpha Debug"

 # Begin Source File

 

 SOURCE=.\Priority_Reactor_Test.cpp

+

+!IF  "$(CFG)" == "Priority_Reactor_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 Alpha Debug"

+

+DEP_CPP_PRIOR=\

+	"..\ace\Acceptor.cpp"\

+	"..\ace\Acceptor.h"\

+	"..\ace\Acceptor.i"\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Connector.cpp"\

+	"..\ace\Connector.h"\

+	"..\ace\Connector.i"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Dynamic.h"\

+	"..\ace\Dynamic.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\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_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map_Manager.cpp"\

+	"..\ace\Map_Manager.h"\

+	"..\ace\Map_Manager.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Pipe.h"\

+	"..\ace\Pipe.i"\

+	"..\ace\Priority_Reactor.h"\

+	"..\ace\Priority_Reactor.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_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Svc_Handler.cpp"\

+	"..\ace\Svc_Handler.h"\

+	"..\ace\Svc_Handler.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Token.h"\

+	"..\ace\Token.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\Priority_Reactor_Test.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/tests/Priority_Task_Test.dsp b/tests/Priority_Task_Test.dsp
index f28be7faa04..b0beac67af8 100644
--- a/tests/Priority_Task_Test.dsp
+++ b/tests/Priority_Task_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Priority_Task_Test - Win32 Release

+CFG=Priority_Task_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Priority_Task_Test - Win32 Release
 !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 "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 Release"

+!MESSAGE NMAKE /f "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Priority_Task_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Task_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Priority_Task_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Priority_Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Task_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Priority_Task_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Priority_Task_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Priority_Task_Test\Debug"

+# PROP BASE Target_Dir ".\Priority_Task_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Priority_Task_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,164 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Priority_Task_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Priority_Task_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Priority_Task_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Priority_Task_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Priority_Task_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Priority_Task_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Priority_Task_Test - Win32 Static Debug"

-# Name "Priority_Task_Test - Win32 Static Release"

-# Name "Priority_Task_Test - Win32 Release"

 # Name "Priority_Task_Test - Win32 Debug"

+# Name "Priority_Task_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Priority_Task_Test.cpp

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 Alpha Debug"

+

+DEP_CPP_PRIOR=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\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_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Process_Manager_Test.dsp b/tests/Process_Manager_Test.dsp
index a6e89bf761d..13328442f3b 100644
--- a/tests/Process_Manager_Test.dsp
+++ b/tests/Process_Manager_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Process_Manager_Test - Win32 Release

+CFG=PROCESS_MANAGER_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 

@@ -13,39 +14,37 @@ CFG=Process_Manager_Test - Win32 Release
 !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 "Process_Manager_Test.mak" CFG="Process_Manager_Test - Win32 Release"

+!MESSAGE NMAKE /f "Process_Manager_Test.mak" CFG="PROCESS_MANAGER_TEST - WIN32 DEBUG"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Process_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Process_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Process_Manager_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Process_Manager_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Process_Manager_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Process_Manager_Test\Debug"

+# PROP BASE Target_Dir ".\Process_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Process_Manager_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,55 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Process_Manager_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Process_Manager_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Process_Manager_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Process_Manager_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Process_Manager_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Process_Manager_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Process_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Process_Manager_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Process_Manager_Test - Win32 Static Debug"

-# Name "Process_Manager_Test - Win32 Static Release"

-# Name "Process_Manager_Test - Win32 Release"

 # Name "Process_Manager_Test - Win32 Debug"

+# Name "Process_Manager_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Process_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Process_Manager_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Process_Manager_Test - Win32 Alpha Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Process_Mutex_Test.dsp b/tests/Process_Mutex_Test.dsp
index c7370b216b3..a4a32f05627 100644
--- a/tests/Process_Mutex_Test.dsp
+++ b/tests/Process_Mutex_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Process_Mutex_Test - Win32 Release

+CFG=Process_Mutex_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Process_Mutex_Test - Win32 Release
 !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 "Process_Mutex_Test.mak" CFG="Process_Mutex_Test - Win32 Release"

+!MESSAGE NMAKE /f "Process_Mutex_Test.mak" CFG="Process_Mutex_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Process_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Mutex_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Process_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Process_Mutex_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Process_Mutex_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Process_Mutex_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\Debug"

+# PROP BASE Target_Dir ".\Process_Mutex_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Process_Mutex_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,104 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Process_Mutex_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Process_Mutex_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Process_Mutex_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Process_Mutex_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Process_Mutex_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Process_Mutex_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Process_Mutex_Test - Win32 Static Debug"

-# Name "Process_Mutex_Test - Win32 Static Release"

-# Name "Process_Mutex_Test - Win32 Release"

 # Name "Process_Mutex_Test - Win32 Debug"

+# Name "Process_Mutex_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Process_Mutex_Test.cpp

+

+!IF  "$(CFG)" == "Process_Mutex_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 Alpha Debug"

+

+DEP_CPP_PROCE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Process.h"\

+	"..\ace\Process.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_PROCE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Process_Strategy_Test.dsp b/tests/Process_Strategy_Test.dsp
index e3e838bf47d..fcbec2913be 100644
--- a/tests/Process_Strategy_Test.dsp
+++ b/tests/Process_Strategy_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Process_Strategy_Test - Win32 Release

+CFG=PROCESS_STRATEGY_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 

@@ -13,39 +14,37 @@ CFG=Process_Strategy_Test - Win32 Release
 !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 "Process_Strategy_Test.mak" CFG="Process_Strategy_Test - Win32 Release"

+!MESSAGE NMAKE /f "Process_Strategy_Test.mak" CFG="PROCESS_STRATEGY_TEST - WIN32 DEBUG"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Process_Strategy_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Strategy_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Process_Strategy_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Process_Strategy_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Strategy_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Process_Strategy_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Process_Strategy_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Process_Strategy_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\Debug"

+# PROP BASE Target_Dir ".\Process_Strategy_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Process_Strategy_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,193 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Process_Strategy_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Process_Strategy_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Process_Strategy_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Process_Strategy_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Process_Strategy_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Process_Strategy_Test - Win32 Static Debug"

-# Name "Process_Strategy_Test - Win32 Static Release"

-# Name "Process_Strategy_Test - Win32 Release"

 # Name "Process_Strategy_Test - Win32 Debug"

+# Name "Process_Strategy_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Process_Strategy_Test.cpp

+

+!IF  "$(CFG)" == "Process_Strategy_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 Alpha Debug"

+

+DEP_CPP_PROCE=\

+	"..\ace\Acceptor.cpp"\

+	"..\ace\Acceptor.h"\

+	"..\ace\Acceptor.i"\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Dynamic.h"\

+	"..\ace\Dynamic.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\Singleton.cpp"\

+	"..\ace\Singleton.h"\

+	"..\ace\Singleton.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Svc_Handler.cpp"\

+	"..\ace\Svc_Handler.h"\

+	"..\ace\Svc_Handler.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\Process_Strategy_Test.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_PROCE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/RB_Tree_Test.dsp b/tests/RB_Tree_Test.dsp
index 971f24ec4d7..09b69ac1ac4 100644
--- a/tests/RB_Tree_Test.dsp
+++ b/tests/RB_Tree_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=RB_Tree_Test - Win32 Release

+CFG=RB_Tree_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=RB_Tree_Test - Win32 Release
 !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 "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 Release"

+!MESSAGE NMAKE /f "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "RB_Tree_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "RB_Tree_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "RB_Tree_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "RB_Tree_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "RB_Tree_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "RB_Tree_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "RB_Tree_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "RB_Tree_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "RB_Tree_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "RB_Tree_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "RB_Tree_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,84 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "RB_Tree_Test - Win32 Static Debug"

-# Name "RB_Tree_Test - Win32 Static Release"

-# Name "RB_Tree_Test - Win32 Release"

 # Name "RB_Tree_Test - Win32 Debug"

+# Name "RB_Tree_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\RB_Tree_Test.cpp

+

+!IF  "$(CFG)" == "RB_Tree_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "RB_Tree_Test - Win32 Alpha Debug"

+

+DEP_CPP_RB_TR=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_RB_TR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/RMCast/Makefile.bor b/tests/RMCast/Makefile.bor
index 6606e571664..4ea559be0c3 100644
--- a/tests/RMCast/Makefile.bor
+++ b/tests/RMCast/Makefile.bor
@@ -8,26 +8,34 @@
 #
 #----------------------------------------------------------------------------
 
-NAMES = \
-	RMCast_Fragment_Test \
-	RMCast_Membership_Test \
-	RMCast_Reassembly_Test \
-	RMCast_Reordering_Test \
-	RMCast_Retransmission_Test \
-	RMCast_UDP_Best_Effort_Test
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
+
+TESTS = \
+         RMCast_Fragment_Test \
+         RMCast_Membership_Test \
+         RMCast_Reassembly_Test \
+         RMCast_Reordering_Test \
+         RMCast_Retransmission_Test \
+         RMCast_UDP_Best_Effort_Test
+
+all_tests: $(TESTS)
+
+$(TESTS):
+         $(MAKE) -fMakefile.bor -DNAME=$@ $(MAKE_FLAGS) $(BINDIR)\$@.exe
 
 OBJFILES = $(OBJDIR)\$(NAME).obj
 
 CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(ACE_RMCAST_CFLAGS) \
-	-I..
+         $(ACE_CFLAGS) \
+         $(ACE_RMCAST_CFLAGS) \
+         -I..
 
 CPPDIR = .;..
 
 LIBFILES = \
-	$(ACE_LIB) \
-	$(ACE_RMCAST_LIB)
+         $(ACE_LIB) \
+         $(ACE_RMCAST_LIB)
 
-!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+
diff --git a/tests/Reactor_Exceptions_Test.dsp b/tests/Reactor_Exceptions_Test.dsp
index 90feeb1e411..b13e42a537d 100644
--- a/tests/Reactor_Exceptions_Test.dsp
+++ b/tests/Reactor_Exceptions_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Exceptions_Test - Win32 Release

+CFG=Reactor_Exceptions_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Reactor_Exceptions_Test - Win32 Release
 !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 "Reactor_Exceptions_Test.mak" CFG="Reactor_Exceptions_Test - Win32 Release"

+!MESSAGE NMAKE /f "Reactor_Exceptions_Test.mak" CFG="Reactor_Exceptions_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Exceptions_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Exceptions_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Exceptions_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Reactor_Exceptions_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Exceptions_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Reactor_Exceptions_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Reactor_Exceptions_Test\Debug"

+# PROP BASE Target_Dir ".\Reactor_Exceptions_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Reactor_Exceptions_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,138 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reactor_Exceptions_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Reactor_Exceptions_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Reactor_Exceptions_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Reactor_Exceptions_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Reactor_Exceptions_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Reactor_Exceptions_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Reactor_Exceptions_Test - Win32 Static Debug"

-# Name "Reactor_Exceptions_Test - Win32 Static Release"

-# Name "Reactor_Exceptions_Test - Win32 Release"

 # Name "Reactor_Exceptions_Test - Win32 Debug"

+# Name "Reactor_Exceptions_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Reactor_Exceptions_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 Alpha Debug"

+

+DEP_CPP_REACT=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Dgram.h"\

+	"..\ace\SOCK_Dgram.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Reactor_Notify_Test.dsp b/tests/Reactor_Notify_Test.dsp
index f61f0bd4c3d..1c9ca9a9df7 100644
--- a/tests/Reactor_Notify_Test.dsp
+++ b/tests/Reactor_Notify_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Notify_Test - Win32 Release

+CFG=Reactor_Notify_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Reactor_Notify_Test - Win32 Release
 !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 "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 Release"

+!MESSAGE NMAKE /f "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Notify_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Notify_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Notify_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Reactor_Notify_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Notify_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Reactor_Notify_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\Debug"

+# PROP BASE Target_Dir ".\Reactor_Notify_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Reactor_Notify_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,164 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reactor_Notify_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Reactor_Notify_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Reactor_Notify_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Reactor_Notify_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Reactor_Notify_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Reactor_Notify_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Reactor_Notify_Test - Win32 Static Debug"

-# Name "Reactor_Notify_Test - Win32 Static Release"

-# Name "Reactor_Notify_Test - Win32 Release"

 # Name "Reactor_Notify_Test - Win32 Debug"

+# Name "Reactor_Notify_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Reactor_Notify_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 Alpha Debug"

+

+DEP_CPP_REACT=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Pipe.h"\

+	"..\ace\Pipe.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Reactor_Performance_Test.dsp b/tests/Reactor_Performance_Test.dsp
index 7df9aefe69e..161e248e52c 100644
--- a/tests/Reactor_Performance_Test.dsp
+++ b/tests/Reactor_Performance_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Performance_Test - Win32 Release

+CFG=Reactor_Performance_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Reactor_Performance_Test - Win32 Release
 !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 "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 Release"

+!MESSAGE NMAKE /f "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Performance_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Performance_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Performance_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Reactor_Performance_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Performance_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Reactor_"

+# PROP BASE Intermediate_Dir "Reactor_"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reactor_Performance_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Reactor_"

+# PROP BASE Intermediate_Dir "Reactor_"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,29 +68,188 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I ".." /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # 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"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Reactor_Performance_Test - Win32 Static Debug"

-# Name "Reactor_Performance_Test - Win32 Static Release"

-# Name "Reactor_Performance_Test - Win32 Release"

 # Name "Reactor_Performance_Test - Win32 Debug"

+# Name "Reactor_Performance_Test - Win32 Alpha Debug"

 # Begin Source File

 

 SOURCE=.\Reactor_Performance_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 Alpha Debug"

+

+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"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.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\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\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IO_Cntl_Msg.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_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map_Manager.cpp"\

+	"..\ace\Map_Manager.h"\

+	"..\ace\Map_Manager.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Pipe.h"\

+	"..\ace\Pipe.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.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_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Svc_Handler.cpp"\

+	"..\ace\Svc_Handler.h"\

+	"..\ace\Svc_Handler.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Token.h"\

+	"..\ace\Token.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Target

 # End Project

diff --git a/tests/Reactor_Timer_Test.dsp b/tests/Reactor_Timer_Test.dsp
index 9f9f03c104a..497e8eb4623 100644
--- a/tests/Reactor_Timer_Test.dsp
+++ b/tests/Reactor_Timer_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactor_Timer_Test - Win32 Release

+CFG=Reactor_Timer_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Reactor_Timer_Test - Win32 Release
 !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 "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 Release"

+!MESSAGE NMAKE /f "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactor_Timer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Timer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactor_Timer_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Reactor_Timer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Timer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Reactor_Timer_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\Debug"

+# PROP BASE Target_Dir ".\Reactor_Timer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Reactor_Timer_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,126 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reactor_Timer_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Reactor_Timer_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Reactor_Timer_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Reactor_Timer_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Reactor_Timer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Reactor_Timer_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Reactor_Timer_Test - Win32 Static Debug"

-# Name "Reactor_Timer_Test - Win32 Static Release"

-# Name "Reactor_Timer_Test - Win32 Release"

 # Name "Reactor_Timer_Test - Win32 Debug"

+# Name "Reactor_Timer_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Reactor_Timer_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 Alpha Debug"

+

+DEP_CPP_REACT=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Reactors_Test.dsp b/tests/Reactors_Test.dsp
index 1fa7ae23a39..e7f05942552 100644
--- a/tests/Reactors_Test.dsp
+++ b/tests/Reactors_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reactors_Test - Win32 Release

+CFG=Reactors_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Reactors_Test - Win32 Release
 !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 "Reactors_Test.mak" CFG="Reactors_Test - Win32 Release"

+!MESSAGE NMAKE /f "Reactors_Test.mak" CFG="Reactors_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reactors_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactors_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reactors_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Reactors_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactors_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Reactors_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Reactors_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Reactors_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Reactors_Test\Debug"

+# PROP BASE Target_Dir ".\Reactors_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Reactors_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,162 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reactors_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Reactors_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Reactors_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Reactors_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Reactors_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Reactors_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Reactors_Test - Win32 Static Debug"

-# Name "Reactors_Test - Win32 Static Release"

-# Name "Reactors_Test - Win32 Release"

 # Name "Reactors_Test - Win32 Debug"

+# Name "Reactors_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Reactors_Test.cpp

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 Alpha Debug"

+

+DEP_CPP_REACT=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Reader_Writer_Test.dsp b/tests/Reader_Writer_Test.dsp
index ed4b596945a..0c74566bca7 100644
--- a/tests/Reader_Writer_Test.dsp
+++ b/tests/Reader_Writer_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reader_Writer_Test - Win32 Release

+CFG=Reader_Writer_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Reader_Writer_Test - Win32 Release
 !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 "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 Release"

+!MESSAGE NMAKE /f "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Reader_Writer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reader_Writer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reader_Writer_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Reader_Writer_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reader_Writer_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Reader_Writer_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Reader_Writer_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\Debug"

+# PROP BASE Target_Dir ".\Reader_Writer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Reader_Writer_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,121 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reader_Writer_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Reader_Writer_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Reader_Writer_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Reader_Writer_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Reader_Writer_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Reader_Writer_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Reader_Writer_Test - Win32 Static Debug"

-# Name "Reader_Writer_Test - Win32 Static Release"

-# Name "Reader_Writer_Test - Win32 Release"

 # Name "Reader_Writer_Test - Win32 Debug"

+# Name "Reader_Writer_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Reader_Writer_Test.cpp

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 Alpha Debug"

+

+DEP_CPP_READE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_READE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Recursive_Mutex_Test.dsp b/tests/Recursive_Mutex_Test.dsp
index ed0e290ba10..f6d71b3a233 100644
--- a/tests/Recursive_Mutex_Test.dsp
+++ b/tests/Recursive_Mutex_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Recursive_Mutex_Test - Win32 Release

+CFG=Recursive_Mutex_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Recursive_Mutex_Test - Win32 Release
 !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 "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 Release"

+!MESSAGE NMAKE /f "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Recursive_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Recursive_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Recursive_Mutex_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Recursive_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Recursive_Mutex_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\Debug"

+# PROP BASE Target_Dir ".\Recursive_Mutex_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Recursive_Mutex_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,121 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Recursive_Mutex_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Recursive_Mutex_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Recursive_Mutex_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Recursive_Mutex_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Recursive_Mutex_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Recursive_Mutex_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Recursive_Mutex_Test - Win32 Static Debug"

-# Name "Recursive_Mutex_Test - Win32 Static Release"

-# Name "Recursive_Mutex_Test - Win32 Release"

 # Name "Recursive_Mutex_Test - Win32 Debug"

+# Name "Recursive_Mutex_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Recursive_Mutex_Test.cpp

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 Alpha Debug"

+

+DEP_CPP_RECUR=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_RECUR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Refcounted_Auto_Ptr_Test.cpp b/tests/Refcounted_Auto_Ptr_Test.cpp
index 9a171a7a0c1..1b64a7de9fe 100644
--- a/tests/Refcounted_Auto_Ptr_Test.cpp
+++ b/tests/Refcounted_Auto_Ptr_Test.cpp
@@ -339,7 +339,7 @@ main (int, ACE_TCHAR *[])
 
     Printer_var r (printer1);
 
-    for (int i = 0; i < n_loops; i++)
+    for(int i = 0; i < n_loops; i++)
       // Spawn off the methods, which run in a separate thread as
       // active object invocations.
       scheduler->print (r);
@@ -359,7 +359,10 @@ main (int, ACE_TCHAR *[])
 #endif /* ACE_HAS_THREADS */
   ACE_END_TEST;
 
+#if defined (DIGITAL_UNIX)
+  // Never terminates on Tru64 5.1 [Bug
   ACE_OS::exit (0);
-  /* NOTREACHED */
+#endif /* DIGITAL_UNIX */
+
   return 0;
 }
diff --git a/tests/Refcounted_Auto_Ptr_Test.dsp b/tests/Refcounted_Auto_Ptr_Test.dsp
index 43d45af779b..faf9c0b1303 100644
--- a/tests/Refcounted_Auto_Ptr_Test.dsp
+++ b/tests/Refcounted_Auto_Ptr_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Refcounted_Auto_Ptr_Test - Win32 Release

+CFG=Refcounted_Auto_Ptr_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Refcounted_Auto_Ptr_Test - Win32 Release
 !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 "Refcounted_Auto_Ptr_Test.mak" CFG="Refcounted_Auto_Ptr_Test - Win32 Release"

+!MESSAGE NMAKE /f "Refcounted_Auto_Ptr_Test.mak" CFG="Refcounted_Auto_Ptr_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Refcounted_Auto_Ptr_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Refcounted_Auto_Ptr_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Refcounted_Auto_Ptr_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Refcounted_Auto_Ptr_Test\Debug"

+# PROP BASE Target_Dir ".\Refcounted_Auto_Ptr_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Refcounted_Auto_Ptr_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,166 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Refcounted_Auto_Ptr_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Refcounted_Auto_Ptr_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Refcounted_Auto_Ptr_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Refcounted_Auto_Ptr_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Refcounted_Auto_Ptr_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Refcounted_Auto_Ptr_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Refcounted_Auto_Ptr_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Refcounted_Auto_Ptr_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Refcounted_Auto_Ptr_Test - Win32 Static Debug"

-# Name "Refcounted_Auto_Ptr_Test - Win32 Static Release"

-# Name "Refcounted_Auto_Ptr_Test - Win32 Release"

 # Name "Refcounted_Auto_Ptr_Test - Win32 Debug"

+# Name "Refcounted_Auto_Ptr_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Refcounted_Auto_Ptr_Test.cpp

+

+!IF  "$(CFG)" == "Refcounted_Auto_Ptr_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Refcounted_Auto_Ptr_Test - Win32 Alpha Debug"

+

+DEP_CPP_FUTUR=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Activation_Queue.h"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Future.cpp"\

+	"..\ace\Future.h"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Method_Request.h"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_FUTUR=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Reverse_Lock_Test.dsp b/tests/Reverse_Lock_Test.dsp
index c3bb78b241d..9cc18d529bf 100644
--- a/tests/Reverse_Lock_Test.dsp
+++ b/tests/Reverse_Lock_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reverse_Lock_Test - Win32 Release

+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 

@@ -13,39 +14,37 @@ CFG=Reverse_Lock_Test - Win32 Release
 !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 Release"

+!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 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Reverse_Lock_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reverse_Lock_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) 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 Static Debug"

+!IF  "$(CFG)" == "Reverse_Lock_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Reverse_Lock_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\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 Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Reverse_Lock_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /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 "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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 Debug"

+!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Reverse_Lock_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Reverse_Lock_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Reverse_Lock_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Reverse_Lock_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Reverse_Lock_Test - Win32 Static Debug"

-# Name "Reverse_Lock_Test - Win32 Static Release"

-# Name "Reverse_Lock_Test - Win32 Release"

 # Name "Reverse_Lock_Test - Win32 Debug"

+# Name "Reverse_Lock_Test - Win32 Alpha 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

+

+!IF  "$(CFG)" == "Reverse_Lock_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 Alpha Debug"

+

+DEP_CPP_REVER=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_REVER=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/SOCK_Connector_Test.dsp b/tests/SOCK_Connector_Test.dsp
index 99344ec43a3..9d1a3096cd4 100644
--- a/tests/SOCK_Connector_Test.dsp
+++ b/tests/SOCK_Connector_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SOCK_Connector_Test - Win32 Release

+CFG=SOCK_Connector_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 

@@ -13,39 +14,37 @@ CFG=SOCK_Connector_Test - Win32 Release
 !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 "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 Release"

+!MESSAGE NMAKE /f "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SOCK_Connector_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Connector_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Connector_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "SOCK_Connector_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Connector_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Debug"

+# PROP BASE Target_Dir ".\SOCK_Connector_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\SOCK_Connector_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SOCK_Connector_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "SOCK_Connector_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "SOCK_Connector_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SOCK_Connector_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "SOCK_Connector_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "SOCK_Connector_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "SOCK_Connector_Test - Win32 Static Debug"

-# Name "SOCK_Connector_Test - Win32 Static Release"

-# Name "SOCK_Connector_Test - Win32 Release"

 # Name "SOCK_Connector_Test - Win32 Debug"

+# Name "SOCK_Connector_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\SOCK_Connector_Test.cpp

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 Alpha Debug"

+

+DEP_CPP_SOCK_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/SOCK_Send_Recv_Test.dsp b/tests/SOCK_Send_Recv_Test.dsp
index 913e2b5b2ee..bd2dfb0edf4 100644
--- a/tests/SOCK_Send_Recv_Test.dsp
+++ b/tests/SOCK_Send_Recv_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SOCK_Send_Recv_Test - Win32 Release

+CFG=SOCK_Send_Recv_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 

@@ -13,39 +14,37 @@ CFG=SOCK_Send_Recv_Test - Win32 Release
 !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 "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 Release"

+!MESSAGE NMAKE /f "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SOCK_Send_Recv_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Send_Recv_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Send_Recv_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "SOCK_Send_Recv_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Send_Recv_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Debug"

+# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\SOCK_Send_Recv_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SOCK_Send_Recv_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "SOCK_Send_Recv_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "SOCK_Send_Recv_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SOCK_Send_Recv_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "SOCK_Send_Recv_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "SOCK_Send_Recv_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "SOCK_Send_Recv_Test - Win32 Static Debug"

-# Name "SOCK_Send_Recv_Test - Win32 Static Release"

-# Name "SOCK_Send_Recv_Test - Win32 Release"

 # Name "SOCK_Send_Recv_Test - Win32 Debug"

+# Name "SOCK_Send_Recv_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\SOCK_Send_Recv_Test.cpp

+

+!IF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Alpha Debug"

+

+DEP_CPP_SOCK_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/SOCK_Test.dsp b/tests/SOCK_Test.dsp
index f80fe9a6bc9..17925d6e1c7 100644
--- a/tests/SOCK_Test.dsp
+++ b/tests/SOCK_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SOCK_Test - Win32 Release

+CFG=SOCK_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=SOCK_Test - Win32 Release
 !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 "SOCK_Test.mak" CFG="SOCK_Test - Win32 Release"

+!MESSAGE NMAKE /f "SOCK_Test.mak" CFG="SOCK_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SOCK_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "SOCK_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "SOCK_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "SOCK_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "SOCK_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\SOCK_Test\Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Test\Debug"

+# PROP BASE Target_Dir ".\SOCK_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\SOCK_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,138 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SOCK_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "SOCK_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "SOCK_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SOCK_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "SOCK_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "SOCK_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "SOCK_Test - Win32 Static Debug"

-# Name "SOCK_Test - Win32 Static Release"

-# Name "SOCK_Test - Win32 Release"

 # Name "SOCK_Test - Win32 Debug"

+# Name "SOCK_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\SOCK_Test.cpp

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 Alpha Debug"

+

+DEP_CPP_SOCK_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Acceptor.h"\

+	"..\ace\SOCK_Acceptor.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/SPIPE_Test.dsp b/tests/SPIPE_Test.dsp
index f0371fae112..21c4d75f463 100644
--- a/tests/SPIPE_Test.dsp
+++ b/tests/SPIPE_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SPIPE_Test - Win32 Release

+CFG=SPIPE_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=SPIPE_Test - Win32 Release
 !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 "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Release"

+!MESSAGE NMAKE /f "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SPIPE_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SPIPE_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "SPIPE_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "SPIPE_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SPIPE_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "SPIPE_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "SPIPE_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\SPIPE_Test\SPIPE_Te"

+# PROP BASE Intermediate_Dir ".\SPIPE_Test\SPIPE_Te"

+# PROP BASE Target_Dir ".\SPIPE_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\SPIPE_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,132 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SPIPE_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "SPIPE_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "SPIPE_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SPIPE_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "SPIPE_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "SPIPE_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "SPIPE_Test - Win32 Static Debug"

-# Name "SPIPE_Test - Win32 Static Release"

-# Name "SPIPE_Test - Win32 Release"

 # Name "SPIPE_Test - Win32 Debug"

+# Name "SPIPE_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\SPIPE_Test.cpp

+

+!IF  "$(CFG)" == "SPIPE_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 Alpha Debug"

+

+DEP_CPP_SPIPE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\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\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SPIPE.h"\

+	"..\ace\SPIPE.i"\

+	"..\ace\SPIPE_Acceptor.h"\

+	"..\ace\SPIPE_Addr.h"\

+	"..\ace\SPIPE_Addr.i"\

+	"..\ace\SPIPE_Connector.h"\

+	"..\ace\SPIPE_Connector.i"\

+	"..\ace\SPIPE_Stream.h"\

+	"..\ace\SPIPE_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SPIPE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/SString_Test.cpp b/tests/SString_Test.cpp
index f61b125c3d3..fce49aa4091 100644
--- a/tests/SString_Test.cpp
+++ b/tests/SString_Test.cpp
@@ -65,7 +65,7 @@ main (int, ACE_TCHAR *[])
     // Forward search.
     ACE_ASSERT (s1.find (s3) == 2);
     ACE_ASSERT (s3.find (s1) == ACE_CString::npos);
-    ACE_ASSERT (s1.find (s3, 2) == 2);
+    ACE_ASSERT (s1.find (s3, 2) == 0);
     ACE_ASSERT (s3.find (s1, 1) == ACE_CString::npos);
     ACE_ASSERT (s1.find (s2) == ACE_CString::npos);
     ACE_ASSERT (s1.find ('o') == 4);
@@ -121,7 +121,7 @@ main (int, ACE_TCHAR *[])
     // Forward search.
     ACE_ASSERT (s1.find (s3) == 2);
     ACE_ASSERT (s3.find (s1) == ACE_CString::npos);
-    ACE_ASSERT (s1.find (s3, 2) == 2);
+    ACE_ASSERT (s1.find (s3, 2) == 0);
     ACE_ASSERT (s3.find (s1, 1) == ACE_CString::npos);
     ACE_ASSERT (s1.find (s2) == ACE_CString::npos);
     ACE_ASSERT (s1.find ('o') == 4);
@@ -177,7 +177,7 @@ main (int, ACE_TCHAR *[])
     // Forward search.
     ACE_ASSERT (s1.find (s3) == 2);
     ACE_ASSERT (s3.find (s1) == ACE_WString::npos);
-    ACE_ASSERT (s1.find (s3, 2) == 2);
+    ACE_ASSERT (s1.find (s3, 2) == 0);
     ACE_ASSERT (s3.find (s1, 1) == ACE_WString::npos);
     ACE_ASSERT (s1.find (s2) == ACE_WString::npos);
     ACE_ASSERT (s1.find ('o') == 4);
diff --git a/tests/SString_Test.dsp b/tests/SString_Test.dsp
index e66258f329a..20ef9f7acec 100644
--- a/tests/SString_Test.dsp
+++ b/tests/SString_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SString_Test - Win32 Release

+CFG=SString_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=SString_Test - Win32 Release
 !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 "SString_Test.mak" CFG="SString_Test - Win32 Release"

+!MESSAGE NMAKE /f "SString_Test.mak" CFG="SString_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SString_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SString_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "SString_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "SString_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SString_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "SString_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "SString_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\SString_Test\Debug"

+# PROP BASE Intermediate_Dir ".\SString_Test\Debug"

+# PROP BASE Target_Dir ".\SString_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\SString_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,86 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SString_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SString_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "SString_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "SString_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SString_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "SString_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "SString_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "SString_Test - Win32 Static Debug"

-# Name "SString_Test - Win32 Static Release"

-# Name "SString_Test - Win32 Release"

 # Name "SString_Test - Win32 Debug"

+# Name "SString_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\SString_Test.cpp

+

+!IF  "$(CFG)" == "SString_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 Alpha Debug"

+

+DEP_CPP_SSTRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SSTRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/SV_Shared_Memory_Test.dsp b/tests/SV_Shared_Memory_Test.dsp
index 9702affa0cc..ec93bff170c 100644
--- a/tests/SV_Shared_Memory_Test.dsp
+++ b/tests/SV_Shared_Memory_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SV_Shared_Memory_Test - Win32 Release

+CFG=SV_Shared_Memory_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=SV_Shared_Memory_Test - Win32 Release
 !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 "SV_Shared_Memory_Test.mak" CFG="SV_Shared_Memory_Test - Win32 Release"

+!MESSAGE NMAKE /f "SV_Shared_Memory_Test.mak" CFG="SV_Shared_Memory_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "SV_Shared_Memory_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "SV_Shared_Memory_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "SV_Shared_Memory_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "SV_Shared_Memory_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SV_Shared_Memory_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\Debug"

+# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\Debug"

+# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\SV_Shared_Memory_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,117 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SV_Shared_Memory_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "SV_Shared_Memory_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "SV_Shared_Memory_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SV_Shared_Memory_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "SV_Shared_Memory_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "SV_Shared_Memory_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "SV_Shared_Memory_Test - Win32 Static Debug"

-# Name "SV_Shared_Memory_Test - Win32 Static Release"

-# Name "SV_Shared_Memory_Test - Win32 Release"

 # Name "SV_Shared_Memory_Test - Win32 Debug"

+# Name "SV_Shared_Memory_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\SV_Shared_Memory_Test.cpp

+

+!IF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 Alpha Debug"

+

+DEP_CPP_SV_SH=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SV_SH=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Semaphore_Test.dsp b/tests/Semaphore_Test.dsp
index 76f4c13717f..6d04cf202b0 100644
--- a/tests/Semaphore_Test.dsp
+++ b/tests/Semaphore_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Semaphore_Test - Win32 Release

+CFG=Semaphore_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Semaphore_Test - Win32 Release
 !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 "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 Release"

+!MESSAGE NMAKE /f "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Semaphore_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Semaphore_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Semaphore_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Semaphore_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Semaphore_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Semaphore_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Semaphore_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# 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 "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Semaphore_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Semaphor"

+# PROP BASE Intermediate_Dir "Semaphor"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,105 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Semaphore_Test - Win32 Static Debug"

-# Name "Semaphore_Test - Win32 Static Release"

-# Name "Semaphore_Test - Win32 Release"

 # Name "Semaphore_Test - Win32 Debug"

+# Name "Semaphore_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp"

 # Begin Source File

 

 SOURCE=.\Semaphore_Test.cpp

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 Alpha Debug"

+

+DEP_CPP_SEMAP=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SEMAP=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Service_Config_Test.dsp b/tests/Service_Config_Test.dsp
index 190cc4a74ac..42628db342c 100644
--- a/tests/Service_Config_Test.dsp
+++ b/tests/Service_Config_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Service_Config_Test - Win32 Release

+CFG=Service_Config_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Service_Config_Test - Win32 Release
 !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 "Service_Config_Test.mak" CFG="Service_Config_Test - Win32 Release"

+!MESSAGE NMAKE /f "Service_Config_Test.mak" CFG="Service_Config_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Service_Config_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Service_Config_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Service_Config_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Service_Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Service_Config_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Service_Config_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Service_Config_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Service_Config_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Service_Config_Test\Debug"

+# PROP BASE Target_Dir ".\Service_Config_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Service_Config_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,133 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Service_Config_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Service_Config_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Service_Config_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Service_Config_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Service_Config_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Service_Config_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Service_Config_Test - Win32 Static Debug"

-# Name "Service_Config_Test - Win32 Static Release"

-# Name "Service_Config_Test - Win32 Release"

 # Name "Service_Config_Test - Win32 Debug"

+# Name "Service_Config_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Service_Config_Test.cpp

+

+!IF  "$(CFG)" == "Service_Config_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 Alpha Debug"

+

+DEP_CPP_SERVI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SERVI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

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/Sigset_Ops_Test.dsp b/tests/Sigset_Ops_Test.dsp
index 60e793ef5b5..0806911e05b 100644
--- a/tests/Sigset_Ops_Test.dsp
+++ b/tests/Sigset_Ops_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Sigset_Ops_Test - Win32 Release

+CFG=Sigset_Ops_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Sigset_Ops_Test - Win32 Release
 !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 "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 Release"

+!MESSAGE NMAKE /f "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Sigset_Ops_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Sigset_Ops_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Sigset_Ops_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Sigset_Ops_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Sigset_Ops_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Sigset_Ops_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Sigset_Ops_Test\Debug"

+# PROP BASE Target_Dir ".\Sigset_Ops_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Sigset_Ops_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,86 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Sigset_Ops_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Sigset_Ops_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Sigset_Ops_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Sigset_Ops_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Sigset_Ops_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Sigset_Ops_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Sigset_Ops_Test - Win32 Static Debug"

-# Name "Sigset_Ops_Test - Win32 Static Release"

-# Name "Sigset_Ops_Test - Win32 Release"

 # Name "Sigset_Ops_Test - Win32 Debug"

+# Name "Sigset_Ops_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Sigset_Ops_Test.cpp

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 Alpha Debug"

+

+DEP_CPP_SIGSE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SIGSE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Simple_Message_Block_Test.dsp b/tests/Simple_Message_Block_Test.dsp
index 92f9cdfd721..5fab718108a 100644
--- a/tests/Simple_Message_Block_Test.dsp
+++ b/tests/Simple_Message_Block_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Simple_Message_Block_Test - Win32 Release

+CFG=Simple_Message_Block_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Simple_Message_Block_Test - Win32 Release
 !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 "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 Release"

+!MESSAGE NMAKE /f "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple_Message_Block_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Simple_Message_Block_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Simple_Message_Block_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Simple_Message_Block_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Simple_Message_Block_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\Debug"

+# PROP BASE Target_Dir ".\Simple_Message_Block_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Simple_Message_Block_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Simple_Message_Block_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Simple_Message_Block_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Simple_Message_Block_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Simple_Message_Block_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Simple_Message_Block_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Simple_Message_Block_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Simple_Message_Block_Test - Win32 Static Debug"

-# Name "Simple_Message_Block_Test - Win32 Static Release"

-# Name "Simple_Message_Block_Test - Win32 Release"

 # Name "Simple_Message_Block_Test - Win32 Debug"

+# Name "Simple_Message_Block_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Simple_Message_Block_Test.cpp

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 Alpha Debug"

+

+DEP_CPP_SIMPL=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SIMPL=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Svc_Handler_Test.dsp b/tests/Svc_Handler_Test.dsp
index 49dbea8ac19..27d4c3ac20f 100644
--- a/tests/Svc_Handler_Test.dsp
+++ b/tests/Svc_Handler_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Svc_Handler_Test - Win32 Release

+CFG=Svc_Handler_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Svc_Handler_Test - Win32 Release
 !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 "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 Release"

+!MESSAGE NMAKE /f "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Svc_Handler_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Svc_Handler_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Svc_Handler_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Svc_Handler_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Svc_Handler_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Svc_Handler_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Svc_Handler_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Svc_Handler_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Debug"

+# PROP BASE Target_Dir ".\Svc_Handler_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Svc_Handler_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,162 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Svc_Handler_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Svc_Handler_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Svc_Handler_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Svc_Handler_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Svc_Handler_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Svc_Handler_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Svc_Handler_Test - Win32 Static Debug"

-# Name "Svc_Handler_Test - Win32 Static Release"

-# Name "Svc_Handler_Test - Win32 Release"

 # Name "Svc_Handler_Test - Win32 Debug"

+# Name "Svc_Handler_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Svc_Handler_Test.cpp

+

+!IF  "$(CFG)" == "Svc_Handler_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Svc_Handler_Test - Win32 Alpha Debug"

+

+DEP_CPP_SVC_H=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_SVC_H=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp
index ea14892df29..be4be43f1a7 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -148,15 +148,9 @@ worker (void *c)
       delete ip;
 #endif /* ! ACE_HAS_PTHREADS_DRAFT4 */
 
-      // We don't do keyfree for ACE_HAS_PTHREADS_DRAFT4 (or 6) since it
-      // is not supported there, and will generate an error anyway. Unless
-      // ACE_HAS_TSS_EMULATION is turned on, then it should work.
-#if !(defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)) \
-    || defined (ACE_HAS_TSS_EMULATION)
       if (ACE_Thread::keyfree (key) == -1)
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
                     ACE_TEXT ("ACE_Thread::keyfree")));
-#endif /* !(PTHREADS_DRAFT4 or 6) || defined (ACE_HAS_TSS_EMULATION) */
 
       // Cause an error.
       ACE_OS::read (ACE_INVALID_HANDLE, 0, 0);
@@ -224,21 +218,14 @@ worker (void *c)
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
                     ACE_TEXT ("ACE_Thread::setspecific")));
 
-#  if !defined (ACE_HAS_PTHREADS_DRAFT4)
+#if !defined (ACE_HAS_PTHREADS_DRAFT4)
       // See comment in cleanup () above.
       delete ip;
-#  endif /* ! ACE_HAS_PTHREADS_DRAFT4 */
-
-      // We don't do keyfree for ACE_HAS_PTHREADS_DRAFT4 (or 6) since it
-      // is not supported there, and will generate an error anyway. Unless
-      // ACE_HAS_TSS_EMULATION is turned on, then it should work.
-#  if !(defined (ACE_HAS_PTHREADS_DRAFT4) || \
-        defined (ACE_HAS_PTHREADS_DRAFT6)  ) \
-      || defined (ACE_HAS_TSS_EMULATION)
+#endif /* ! ACE_HAS_PTHREADS_DRAFT4 */
+
       if (ACE_Thread::keyfree (key) == -1)
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"),
                     ACE_TEXT ("ACE_Thread::keyfree")));
-#  endif /* !(PTHREADS_DRAFT4 or 6) || defined (ACE_HAS_TSS_EMULATION) */
 #endif /* ! __Lynx__ || ACE_HAS_TSS_EMULATION */
     }
 
diff --git a/tests/TSS_Test.dsp b/tests/TSS_Test.dsp
index 3b775c9aa59..aabd8fa375c 100644
--- a/tests/TSS_Test.dsp
+++ b/tests/TSS_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=TSS_Test - Win32 Release

+CFG=TSS_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=TSS_Test - Win32 Release
 !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 "TSS_Test.mak" CFG="TSS_Test - Win32 Release"

+!MESSAGE NMAKE /f "TSS_Test.mak" CFG="TSS_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "TSS_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "TSS_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "TSS_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "TSS_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "TSS_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "TSS_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "TSS_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\TSS_Test\Debug"

+# PROP BASE Intermediate_Dir ".\TSS_Test\Debug"

+# PROP BASE Target_Dir ".\TSS_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\TSS_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,120 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "TSS_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "TSS_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "TSS_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "TSS_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "TSS_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "TSS_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "TSS_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "TSS_Test - Win32 Static Debug"

-# Name "TSS_Test - Win32 Static Release"

-# Name "TSS_Test - Win32 Release"

 # Name "TSS_Test - Win32 Debug"

+# Name "TSS_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\TSS_Test.cpp

+

+!IF  "$(CFG)" == "TSS_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 Alpha Debug"

+

+DEP_CPP_TSS_T=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	".\TSS_Test_Errno.h"\

+	

+NODEP_CPP_TSS_T=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Task_Test.dsp b/tests/Task_Test.dsp
index d4bb138ced0..0ddd7d9b197 100644
--- a/tests/Task_Test.dsp
+++ b/tests/Task_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Task_Test - Win32 Release

+CFG=Task_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Task_Test - Win32 Release
 !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 "Task_Test.mak" CFG="Task_Test - Win32 Release"

+!MESSAGE NMAKE /f "Task_Test.mak" CFG="Task_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Task_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Task_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Task_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Task_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Task_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Task_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Task_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Task_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Task_Test\Debug"

+# PROP BASE Target_Dir ".\Task_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Task_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,162 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Task_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Task_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Task_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Task_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Task_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Task_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Task_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Task_Test - Win32 Static Debug"

-# Name "Task_Test - Win32 Static Release"

-# Name "Task_Test - Win32 Release"

 # Name "Task_Test - Win32 Debug"

+# Name "Task_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Task_Test.cpp

+

+!IF  "$(CFG)" == "Task_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 Alpha Debug"

+

+DEP_CPP_TASK_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_TASK_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Thread_Manager_Test.dsp b/tests/Thread_Manager_Test.dsp
index 498b3057df7..d758588a1d4 100644
--- a/tests/Thread_Manager_Test.dsp
+++ b/tests/Thread_Manager_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Manager_Test - Win32 Release

+CFG=Thread_Manager_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Thread_Manager_Test - Win32 Release
 !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 "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 Release"

+!MESSAGE NMAKE /f "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Manager_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Thread_Manager_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Manager_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Thread_Manager_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Thread_Manager_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\Debug"

+# PROP BASE Target_Dir ".\Thread_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Thread_Manager_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Thread_Manager_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Thread_Manager_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Thread_Manager_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Thread_Manager_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Thread_Manager_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Thread_Manager_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Thread_Manager_Test - Win32 Static Debug"

-# Name "Thread_Manager_Test - Win32 Static Release"

-# Name "Thread_Manager_Test - Win32 Release"

 # Name "Thread_Manager_Test - Win32 Debug"

+# Name "Thread_Manager_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Thread_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 Alpha Debug"

+

+DEP_CPP_THREA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Thread_Mutex_Test.cpp b/tests/Thread_Mutex_Test.cpp
index 821cac7e9e6..e24cebdf7b7 100644
--- a/tests/Thread_Mutex_Test.cpp
+++ b/tests/Thread_Mutex_Test.cpp
@@ -20,21 +20,11 @@
 
 #include "test_config.h"
 #include "ace/Thread_Manager.h"
-#include "ace/Process_Mutex.h"
 
 ACE_RCSID(tests, Thread_Mutex_Test, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
-// For all platforms except for Windows use the ACE_Thread_Mutex.
-// Since Windows only supports timed process mutexes and not
-// timed thread mutexes, use ACE_Process_Mutex.
-#if defined (ACE_HAS_WTHREADS)
-#define ACE_TEST_MUTEX  ACE_Process_Mutex
-#else
-#define ACE_TEST_MUTEX  ACE_Thread_Mutex
-#endif
-
 #if !defined (ACE_HAS_MUTEX_TIMEOUTS)
 
 static int reported_notsup = 0;
@@ -45,7 +35,7 @@ static int reported_notsup = 0;
 static void *
 test (void *args)
 {
-  ACE_TEST_MUTEX *mutex = (ACE_TEST_MUTEX *) args;
+  ACE_Thread_Mutex *mutex = (ACE_Thread_Mutex *) args;
   ACE_UNUSED_ARG (mutex); // Suppress ghs warning about unused local "mutex".
   ACE_OS::srand (ACE_OS::time (0));
 
@@ -67,7 +57,7 @@ test (void *args)
 
       if (mutex->acquire (timeout) != 0)
         {
-          if (errno == ETIMEDOUT || errno == EBUSY)
+          if (errno == ETIMEDOUT)
             {
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("(%P|%t) = mutex acquisition ")
@@ -134,7 +124,7 @@ static void
 spawn (void)
 {
 #if defined (ACE_HAS_THREADS)
-  ACE_TEST_MUTEX mutex;
+  ACE_Thread_Mutex mutex;
 
   const u_int n_threads =
 #if defined (__Lynx__)
diff --git a/tests/Thread_Mutex_Test.dsp b/tests/Thread_Mutex_Test.dsp
index 6d1f5355ef8..00f42f9a8d0 100644
--- a/tests/Thread_Mutex_Test.dsp
+++ b/tests/Thread_Mutex_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Mutex_Test - Win32 Release

+CFG=Thread_Mutex_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 

@@ -13,39 +14,37 @@ CFG=Thread_Mutex_Test - Win32 Release
 !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 "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Release"

+!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Mutex_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Thread_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Debug"

+# PROP BASE Target_Dir ".\Thread_Mutex_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Thread_Mutex_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Thread_Mutex_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Thread_Mutex_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Thread_Mutex_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Thread_Mutex_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Thread_Mutex_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Thread_Mutex_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Thread_Mutex_Test - Win32 Static Debug"

-# Name "Thread_Mutex_Test - Win32 Static Release"

-# Name "Thread_Mutex_Test - Win32 Release"

 # Name "Thread_Mutex_Test - Win32 Debug"

+# Name "Thread_Mutex_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Thread_Mutex_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 Alpha Debug"

+

+DEP_CPP_THREA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp
index b072a8f1c04..b4bcd78af69 100644
--- a/tests/Thread_Pool_Reactor_Test.cpp
+++ b/tests/Thread_Pool_Reactor_Test.cpp
@@ -111,10 +111,10 @@ parse_arg (int argc, ACE_TCHAR *argv[])
           break;
         default:
           ACE_ERROR ((LM_ERROR,
-                      "Usage: Thread_Pool_Reactor_Test [-r <hostname:port#>]"
-                      "\t[-s <server thr#>] [-c <client thr#>] [-d <delay>]"
-                      "\t[-i <client conn attempt#>]"
-                      "[-n <client request# per conn>]\n"));
+                      ACE_TEXT ("Usage: Thread_Pool_Reactor_Test [-r <hostname:port#>]")
+                      ACE_TEXT ("\t[-s <server thr#>] [-c <client thr#>] [-d <delay>]")
+                      ACE_TEXT ("\t[-i <client conn attempt#>]")
+                      ACE_TEXT ("[-n <client request# per conn>]\n")));
           break;
         }
     }
@@ -134,25 +134,26 @@ Request_Handler::handle_input (ACE_HANDLE fd)
 {
   ACE_TCHAR buffer[BUFSIZ];
   ACE_TCHAR len = 0;
-  ssize_t result = this->peer ().recv (&len, sizeof (ACE_TCHAR));
+  ssize_t result = this->peer ().recv (&len,
+                                       sizeof (ACE_TCHAR));
 
   if (result > 0
-      && this->peer ().recv_n (buffer, len * sizeof (ACE_TCHAR)) 
-          == ACE_static_cast (ssize_t, len * sizeof (ACE_TCHAR)))
+      && this->peer ().recv_n (buffer, len) == len)
     {
       ++this->nr_msgs_rcvd_;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%t) svr input; fd: 0x%x; input: %s\n",
+                  ACE_TEXT ("(%t) svr input; fd: 0x%x; input: %s\n"),
                   fd,
                   buffer));
-      if (ACE_OS::strcmp (buffer, ACE_TEXT ("shutdown")) == 0)
+      if (ACE_OS::strcmp (buffer,
+                          ACE_TEXT ("shutdown")) == 0)
           ACE_Reactor::end_event_loop ();
       return 0;
     }
   else
     ACE_DEBUG ((LM_DEBUG,
-                "(%t) Request_Handler: 0x%x peer closed (0x%x)\n",
+                ACE_TEXT ("(%t) Request_Handler: 0x%x peer closed (0x%x)\n"),
                 this, fd));
   return -1;
 }
@@ -161,14 +162,14 @@ int
 Request_Handler::handle_close (ACE_HANDLE fd, ACE_Reactor_Mask)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) svr close; fd: 0x%x, rcvd %d msgs\n",
+              ACE_TEXT ("(%t) svr close; fd: 0x%x, rcvd %d msgs\n"),
               fd,
               this->nr_msgs_rcvd_));
   if (this->nr_msgs_rcvd_ != cli_req_no)
     ACE_ERROR((LM_ERROR,
-               "(%t) Handler 0x%x: Expected %d messages; got %d\n",
+               ACE_TEXT ("(%t) Handler 0x%x: Expected %d messages; got %d\n"),
                this,
-               cli_req_no, 
+               cli_req_no,
                this->nr_msgs_rcvd_));
   this->destroy ();
   return 0;
@@ -182,16 +183,16 @@ svr_worker (void *)
   while (!ACE_Reactor::event_loop_done ())
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%t) handling events ....\n"));
+                  ACE_TEXT ("(%t) handling events ....\n")));
 
       if (ACE_Reactor::instance ()->handle_events () == -1)
         ACE_ERROR ((LM_ERROR,
-                    "(%t) %p\n",
-                    "Error handling events"));
+                    ACE_TEXT ("(%t) %p\n"),
+                    ACE_TEXT ("Error handling events")));
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) I am done handling events. Bye, bye\n"));
+              ACE_TEXT ("(%t) I am done handling events. Bye, bye\n")));
   return 0;
 }
 
@@ -210,23 +211,23 @@ cli_worker (void *arg)
       if (connect.connect (stream, addr) < 0)
         {
           ACE_ERROR ((LM_ERROR,
-                      "(%t) %p\n",
-                      "connect"));
+                      ACE_TEXT ("(%t) %p\n"),
+                      ACE_TEXT ("connect")));
           continue;
         }
 
       for (size_t j = 0; j < cli_req_no; j++)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      "(%t) conn_worker handle 0x%x, req %d\n",
+                      ACE_TEXT ("(%t) conn_worker handle 0x%x, req %d\n"),
                       stream.get_handle (),
                       j+1));
           if (stream.send_n (arg,
-                             (len + 1) * sizeof (ACE_TCHAR)) == -1)
+                             len + sizeof (ACE_TCHAR)) == -1)
             {
               ACE_ERROR ((LM_ERROR,
-                          "(%t) %p\n",
-                          "send_n"));
+                          ACE_TEXT ("(%t) %p\n"),
+                          ACE_TEXT ("send_n")));
               continue;
             }
           ACE_OS::sleep (delay);
@@ -244,13 +245,13 @@ worker (void *)
   ACE_OS::sleep (3);
   const ACE_TCHAR *msg = ACE_TEXT ("Message from Connection worker");
   ACE_TCHAR buf [BUFSIZ];
-  buf[0] = ACE_OS::strlen (msg) + 1;
+  buf[0] = (ACE_OS::strlen (msg) + 1) * sizeof (ACE_TCHAR);
   ACE_OS::strcpy (&buf[1], msg);
 
   ACE_INET_Addr addr (rendezvous);
 
   ACE_DEBUG((LM_DEBUG,
-             "(%t) Spawning %d client threads...\n",
+             ACE_TEXT ("(%t) Spawning %d client threads...\n"),
              cli_thrno));
   int grp = ACE_Thread_Manager::instance ()->spawn_n (cli_thrno,
                                                       &cli_worker,
@@ -260,25 +261,25 @@ worker (void *)
   ACE_Thread_Manager::instance ()->wait_grp (grp);
 
   ACE_DEBUG ((LM_DEBUG,
-              "(%t) Client threads done; shutting down...\n"));
+              ACE_TEXT ("(%t) Client threads done; shutting down...\n")));
   ACE_SOCK_Stream stream;
   ACE_SOCK_Connector connect;
 
   if (connect.connect (stream, addr) == -1)
     ACE_ERROR ((LM_ERROR,
-                "(%t) %p Error while connecting\n",
-                "connect"));
+                ACE_TEXT ("(%t) %p Error while connecting\n"),
+                ACE_TEXT ("connect")));
 
-  const ACE_TCHAR *sbuf = ACE_TEXT ("\011shutdown");
+  const char *sbuf = "\011shutdown";
 
   ACE_DEBUG ((LM_DEBUG,
-              "shutdown stream handle = %x\n",
+              ACE_TEXT ("shutdown stream handle = %x\n"),
               stream.get_handle ()));
 
-  if (stream.send_n (sbuf, (ACE_OS::strlen (sbuf) + 1) * sizeof (ACE_TCHAR)) == -1)
+  if (stream.send_n (sbuf, ACE_OS::strlen (sbuf) + 1) == -1)
     ACE_ERROR ((LM_ERROR,
-                "(%t) %p\n",
-                "send_n"));
+                ACE_TEXT ("(%t) %p\n"),
+                ACE_TEXT ("send_n")));
 
   stream.close ();
 
@@ -342,8 +343,8 @@ main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Thread_Pool_Reactor_Test"));
 
-  ACE_ERROR ((LM_INFO, 
-              "threads not supported on this platform\n"));
+  ACE_ERROR ((LM_INFO,
+              ACE_TEXT ("threads not supported on this platform\n")));
 
   ACE_END_TEST;
   return 0;
diff --git a/tests/Thread_Pool_Reactor_Test.dsp b/tests/Thread_Pool_Reactor_Test.dsp
index 6ce7c7008ec..baa354bfab9 100644
--- a/tests/Thread_Pool_Reactor_Test.dsp
+++ b/tests/Thread_Pool_Reactor_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Pool_Reactor_Test - Win32 Release

+CFG=Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,104 +14,53 @@ CFG=Thread_Pool_Reactor_Test - Win32 Release
 !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 "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 Release"

+!MESSAGE NMAKE /f "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Pool_Reactor_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Pool_Reactor_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Pool_Reactor_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Thread_Pool_Reactor_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# 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" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Thread_Pool_Reactor_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Output_Dir "Atomic_O"

+# PROP BASE Intermediate_Dir "Atomic_O"

+# PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

@@ -118,32 +68,84 @@ 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 /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Thread_Pool_Reactor_Test - Win32 Static Debug"

-# Name "Thread_Pool_Reactor_Test - Win32 Static Release"

-# Name "Thread_Pool_Reactor_Test - Win32 Release"

 # Name "Thread_Pool_Reactor_Test - Win32 Debug"

+# Name "Thread_Pool_Reactor_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

 # Begin Source File

 

 SOURCE=.\Thread_Pool_Reactor_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Reactor_Test - Win32 Alpha Debug"

+

+DEP_CPP_THREA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp
index e8a6decd8e8..0efeb6137dc 100644
--- a/tests/Thread_Pool_Test.cpp
+++ b/tests/Thread_Pool_Test.cpp
@@ -222,14 +222,14 @@ Thread_Pool::test_queue_deactivation_shutdown (void)
                       ACE_TEXT ("(%t) enter a new message for ")
                       ACE_TEXT ("the task pool...")));
           n = ACE_OS::read (ACE_STDIN,
-                            mb->wr_ptr (),
+                            mb->rd_ptr (),
                             mb->size ());
         }
       else
         {
           static size_t count = 0;
 
-          ACE_OS::sprintf (mb->wr_ptr (),
+          ACE_OS::sprintf (mb->rd_ptr (),
                            "%d\n",
                            count);
           n = ACE_OS::strlen (mb->rd_ptr ());
@@ -312,14 +312,14 @@ Thread_Pool::test_empty_message_shutdown (void)
                       ACE_TEXT ("(%t) enter a new message for ")
                       ACE_TEXT ("the task pool...")));
           n = ACE_OS::read (ACE_STDIN,
-                            mb->wr_ptr (),
+                            mb->rd_ptr (),
                             mb->size ());
         }
       else
         {
           static size_t count = 0;
 
-          ACE_OS::sprintf (mb->wr_ptr (),
+          ACE_OS::sprintf (mb->rd_ptr (),
                            "%d\n",
                            count);
           n = ACE_OS::strlen (mb->rd_ptr ());
diff --git a/tests/Thread_Pool_Test.dsp b/tests/Thread_Pool_Test.dsp
index 832d30ff6ef..9331a03eeca 100644
--- a/tests/Thread_Pool_Test.dsp
+++ b/tests/Thread_Pool_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Pool_Test - Win32 Release

+CFG=Thread_Pool_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Thread_Pool_Test - Win32 Release
 !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 "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 Release"

+!MESSAGE NMAKE /f "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Thread_Pool_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Pool_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Thread_Pool_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Thread_Pool_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Thread_Pool_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Thread_Pool_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\Debug"

+# PROP BASE Target_Dir ".\Thread_Pool_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Thread_Pool_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,162 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Thread_Pool_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Thread_Pool_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Thread_Pool_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Thread_Pool_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Thread_Pool_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Thread_Pool_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Thread_Pool_Test - Win32 Static Debug"

-# Name "Thread_Pool_Test - Win32 Static Release"

-# Name "Thread_Pool_Test - Win32 Release"

 # Name "Thread_Pool_Test - Win32 Debug"

+# Name "Thread_Pool_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Thread_Pool_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 Alpha Debug"

+

+DEP_CPP_THREA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Time_Service_Test.dsp b/tests/Time_Service_Test.dsp
index 331c3d9835f..486a6ae52a6 100644
--- a/tests/Time_Service_Test.dsp
+++ b/tests/Time_Service_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Time_Service_Test - Win32 Release

+CFG=Time_Service_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Time_Service_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Release"

+!MESSAGE NMAKE /f "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Time_Service_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Time_Service_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Time_Service_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Time_Service_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Service_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Time_Service_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Time_Service_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Time_Service_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Time_Service_Test\Debug"

+# PROP BASE Target_Dir ".\Time_Service_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Time_Service_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,88 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Time_Service_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Time_Service_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Time_Service_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Time_Service_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Time_Service_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Time_Service_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Time_Service_Test - Win32 Static Debug"

-# Name "Time_Service_Test - Win32 Static Release"

-# Name "Time_Service_Test - Win32 Release"

 # Name "Time_Service_Test - Win32 Debug"

+# Name "Time_Service_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Time_Service_Test.cpp

+

+!IF  "$(CFG)" == "Time_Service_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 Alpha Debug"

+

+DEP_CPP_TIME_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\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\Process.h"\

+	"..\ace\Process.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_TIME_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Time_Value_Test.dsp b/tests/Time_Value_Test.dsp
index e13b99ba4a7..62e423d8dfb 100644
--- a/tests/Time_Value_Test.dsp
+++ b/tests/Time_Value_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Time_Value_Test - Win32 Release

+CFG=Time_Value_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Time_Value_Test - Win32 Release
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 Release"

+!MESSAGE NMAKE /f "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Time_Value_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Time_Value_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Time_Value_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Time_Value_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Value_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Time_Value_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Time_Value_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Time_Value_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Time_Value_Test\Debug"

+# PROP BASE Target_Dir ".\Time_Value_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Time_Value_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,86 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Time_Value_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Time_Value_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Time_Value_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Time_Value_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Time_Value_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Time_Value_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Time_Value_Test - Win32 Static Debug"

-# Name "Time_Value_Test - Win32 Static Release"

-# Name "Time_Value_Test - Win32 Release"

 # Name "Time_Value_Test - Win32 Debug"

+# Name "Time_Value_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Time_Value_Test.cpp

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 Alpha Debug"

+

+DEP_CPP_TIME_=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_TIME_=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Timeprobe_Test.dsp b/tests/Timeprobe_Test.dsp
index 775f54d8739..466d4f6b886 100644
--- a/tests/Timeprobe_Test.dsp
+++ b/tests/Timeprobe_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Timeprobe_Test - Win32 Release

+CFG=Timeprobe_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 

@@ -13,39 +14,37 @@ CFG=Timeprobe_Test - Win32 Release
 !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 "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 Release"

+!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Timeprobe_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Timeprobe_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Timeprobe_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Timeprobe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timeprobe_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Timeprobe_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Timeprobe_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Timeprobe_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Debug"

+# PROP BASE Target_Dir ".\Timeprobe_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Timeprobe_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Timeprobe_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Timeprobe_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Timeprobe_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Timeprobe_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Timeprobe_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Timeprobe_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Timeprobe_Test - Win32 Static Debug"

-# Name "Timeprobe_Test - Win32 Static Release"

-# Name "Timeprobe_Test - Win32 Release"

 # Name "Timeprobe_Test - Win32 Debug"

+# Name "Timeprobe_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Timeprobe_Test.cpp

+

+!IF  "$(CFG)" == "Timeprobe_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 Alpha Debug"

+

+DEP_CPP_TIMEP=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_TIMEP=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Timer_Queue_Test.dsp b/tests/Timer_Queue_Test.dsp
index 6317abc70d0..45de1133bf3 100644
--- a/tests/Timer_Queue_Test.dsp
+++ b/tests/Timer_Queue_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Timer_Queue_Test - Win32 Release

+CFG=Timer_Queue_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=Timer_Queue_Test - Win32 Release
 !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 "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 Release"

+!MESSAGE NMAKE /f "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Timer_Queue_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Timer_Queue_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Timer_Queue_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Timer_Queue_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timer_Queue_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Timer_Queue_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Timer_Queue_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\Debug"

+# PROP BASE Target_Dir ".\Timer_Queue_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Timer_Queue_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,138 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Timer_Queue_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Timer_Queue_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Timer_Queue_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Timer_Queue_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Timer_Queue_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Timer_Queue_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Timer_Queue_Test - Win32 Static Debug"

-# Name "Timer_Queue_Test - Win32 Static Release"

-# Name "Timer_Queue_Test - Win32 Release"

 # Name "Timer_Queue_Test - Win32 Debug"

+# Name "Timer_Queue_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Timer_Queue_Test.cpp

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 Alpha Debug"

+

+DEP_CPP_TIMER=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\High_Res_Timer.h"\

+	"..\ace\High_Res_Timer.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Profile_Timer.h"\

+	"..\ace\Profile_Timer.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Hash.h"\

+	"..\ace\Timer_Hash_T.cpp"\

+	"..\ace\Timer_Hash_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\Timer_Wheel.h"\

+	"..\ace\Timer_Wheel_T.cpp"\

+	"..\ace\Timer_Wheel_T.h"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_TIMER=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp
index 30826825859..30113586aac 100644
--- a/tests/Tokens_Test.cpp
+++ b/tests/Tokens_Test.cpp
@@ -36,7 +36,7 @@
 
 ACE_RCSID(tests, Tokens_Test, "$Id$")
 
-#if defined (ACE_HAS_THREADS) && defined (ACE_HAS_TOKENS_LIBRARY)
+#if defined (ACE_HAS_THREADS)
 
 typedef ACE_Token_Invariant_Manager TOKEN_INVARIANTS;
 
@@ -65,8 +65,7 @@ run_thread (void *vp)
   collection.insert (*(tp->token1_));
   collection.insert (*(tp->token2_));
 
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) new thread.\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) new thread.\n")));
   thread_start->wait ();
 
   int count = 50;
@@ -76,8 +75,7 @@ run_thread (void *vp)
         {
           if (ACE_OS::last_error () == EDEADLK)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("deadlock detected in acquire")));
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("deadlock detected in acquire")));
               continue;
             }
           ACE_ERROR ((LM_ERROR,
@@ -89,9 +87,7 @@ run_thread (void *vp)
       ACE_ASSERT ((TOKEN_INVARIANTS::instance ()->acquired (tp->token1_) == 1) ||
                   (TOKEN_INVARIANTS::instance ()->acquired (tp->token2_) == 1));
 
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) %s acquired.\n"),
-                  collection.name ()));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s acquired.\n"), collection.name ()));
 
       TOKEN_INVARIANTS::instance ()->releasing (tp->token1_);
       TOKEN_INVARIANTS::instance ()->releasing (tp->token2_);
@@ -100,12 +96,10 @@ run_thread (void *vp)
         {
           if (ACE_OS::last_error () == EDEADLK)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("deadlock detected")));
+              ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("deadlock detected")));
               goto deadlock;
             }
-          ACE_ERROR ((LM_E
-                      RROR, ACE_TEXT ("(%t) %p renew failed\n"),
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p renew failed\n"),
                       ACE_TEXT ("run_thread")));
           return (void *) -1;
         }
@@ -113,9 +107,7 @@ run_thread (void *vp)
       ACE_ASSERT (TOKEN_INVARIANTS::instance ()->acquired (tp->token1_) == 1 ||
                   TOKEN_INVARIANTS::instance ()->acquired (tp->token2_) == 1);
 
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) %s renewed.\n"),
-                  collection.name ()));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s renewed.\n"), collection.name ()));
 
     deadlock:
 
@@ -124,20 +116,15 @@ run_thread (void *vp)
 
       if (collection.release () == -1)
         {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%t) %p release failed\n"),
-                      ACE_TEXT ("run_thread")));
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p release failed\n"),ACE_TEXT ("run_thread")));
           return (void *) -1;
         }
 
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%t) %s released.\n"),
-                  collection.name ()));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s released.\n"), collection.name ()));
     }
 
 
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) thread finished.\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) thread finished.\n")));
 
   return 0;
 }
@@ -169,60 +156,37 @@ run_test (ACE_Token_Proxy *A,
   ACE_Thread_Manager *mgr = ACE_Thread_Manager::instance ();
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
-                 (void *) &tp1,
-                  THR_BOUND) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("spawn 1 failed")),
-                      -1);
+                 (void *) &tp1, THR_BOUND) == -1)
+    ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn 1 failed")), -1);
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
-                 (void *) &tp2,
-                  THR_BOUND) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("spawn 2 failed")),
-                      -1);
+                 (void *) &tp2, THR_BOUND) == -1)
+    ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn 2 failed")), -1);
 
   if (mgr->spawn (ACE_THR_FUNC (run_thread),
-                 (void *) &tp3,
-                  THR_BOUND) == -1)
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       ACE_TEXT ("%p\n"),
-                       ACE_TEXT ("spawn 3 failed")), -1);
+                 (void *) &tp3, THR_BOUND) == -1)
+    ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("spawn 3 failed")), -1);
 
   // Wait for all threads to exit.
   mgr->wait ();
 
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Test finished.\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test finished.\n")));
   return 0;
 }
-#endif /* ACE_HAS_THREADS && ACE_HAS_TOKENS_LIBRARY */
+#endif /* ACE_HAS_THREADS */
 
 int
 main (int, ACE_TCHAR *[])
 {
   ACE_START_TEST (ACE_TEXT ("Tokens_Test"));
 #if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_TOKENS_LIBRARY)
   ACE_Token_Proxy *A = 0, *B = 0, *R = 0, *W = 0;
 
-  ACE_NEW_RETURN (A,
-                  ACE_Local_Mutex (ACE_TEXT ("L Mutex A"), 0, 0),
-                  -1);
-  ACE_NEW_RETURN (B,
-                  ACE_Local_Mutex (ACE_TEXT ("L Mutex B"), 0, 0), 
-                  -1);
-  ACE_NEW_RETURN (R,
-                  ACE_Local_RLock (ACE_TEXT ("L Reader Lock"), 0, 0), 
-                  -1);
-  ACE_NEW_RETURN (W,
-                  ACE_Local_WLock (ACE_TEXT ("L Writer Lock"), 0, 0), 
-                  -1);
-  ACE_NEW_RETURN (thread_start,
-                  ACE_Barrier (3), 
-                  -1);
+  ACE_NEW_RETURN (A, ACE_Local_Mutex (ACE_TEXT ("L Mutex A"), 0, 0), -1);
+  ACE_NEW_RETURN (B, ACE_Local_Mutex (ACE_TEXT ("L Mutex B"), 0, 0), -1);
+  ACE_NEW_RETURN (R, ACE_Local_RLock (ACE_TEXT ("L Reader Lock"), 0, 0), -1);
+  ACE_NEW_RETURN (W, ACE_Local_WLock (ACE_TEXT ("L Writer Lock"), 0, 0), -1);
+  ACE_NEW_RETURN (thread_start, ACE_Barrier (3), -1);
 
   run_test (A, B, R, W);
 
@@ -237,20 +201,16 @@ main (int, ACE_TCHAR *[])
   ACE_Process_Options options;
   options.command_line (cl);
 
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Forking Token Service.\n")));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Forking Token Service.\n")));
 
   // Start up the token server for the remote test.
   ACE_Process new_process;
   if (new_process.spawn (options) == -1)
-    ACE_ERROR ((LM_DEBUG,
-                ACE_TEXT ("%n; %p (%s), will not run remote test.\n"),
-                ACE_TEXT ("Server fork failed"),
-                cl));
+    ACE_ERROR ((LM_DEBUG, ACE_TEXT ("%n; %p (%s), will not run remote test.\n"),
+               ACE_TEXT ("Server fork failed"), cl));
   else
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Server forked with pid = %d.\n"),
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Server forked with pid = %d.\n"),
                   new_process.getpid ()));
 
       // Wait for the server to start.
@@ -258,8 +218,7 @@ main (int, ACE_TCHAR *[])
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Using Token Server on %s at port %d.\n"),
-                  server_host,
-                  server_port));
+                  server_host, server_port));
       ACE_Remote_Mutex::set_server_address (ACE_INET_Addr (server_port,
                                                            server_host));
 
@@ -268,18 +227,10 @@ main (int, ACE_TCHAR *[])
       delete R;
       delete W;
 
-      ACE_NEW_RETURN (A,
-                      ACE_Remote_Mutex (ACE_TEXT ("R Mutex A"), 0, 1), 
-                      -1);
-      ACE_NEW_RETURN (B,
-                      ACE_Remote_Mutex (ACE_TEXT ("R Mutex B"), 0, 1),
-                      -1);
-      ACE_NEW_RETURN (R,
-                      ACE_Remote_RLock (ACE_TEXT ("R Reader Lock"), 0, 1), 
-                      -1);
-      ACE_NEW_RETURN (W,
-                      ACE_Remote_WLock (ACE_TEXT ("R Writer Lock"), 0, 1), 
-                      -1);
+      ACE_NEW_RETURN (A, ACE_Remote_Mutex (ACE_TEXT ("R Mutex A"), 0, 1), -1);
+      ACE_NEW_RETURN (B, ACE_Remote_Mutex (ACE_TEXT ("R Mutex B"), 0, 1), -1);
+      ACE_NEW_RETURN (R, ACE_Remote_RLock (ACE_TEXT ("R Reader Lock"), 0, 1), -1);
+      ACE_NEW_RETURN (W, ACE_Remote_WLock (ACE_TEXT ("R Writer Lock"), 0, 1), -1);
 
       run_test (A, B, R, W);
 
@@ -288,9 +239,7 @@ main (int, ACE_TCHAR *[])
 
       // Kill the token server.
       if (new_process.terminate () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Kill failed.\n")), 
-                          -1);
+        ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Kill failed.\n")), -1);
     }
 
   delete thread_start;
@@ -300,12 +249,7 @@ main (int, ACE_TCHAR *[])
   delete R;
   delete W;
 
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) main thread exiting.\n")));
-#else
-  ACE_ERROR ((LM_INFO,
-              ACE_TEXT ("ACE must be compiled with -DACE_HAS_TOKENS_LIBRARY to run this test\n")));
-#endif /* ACE_HAS_TOKENS_LIBRARY */
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) main thread exiting.\n")));
 #else
   ACE_ERROR ((LM_INFO,
               ACE_TEXT ("threads not supported on this platform\n")));
diff --git a/tests/Tokens_Test.dsp b/tests/Tokens_Test.dsp
index e52c7d759da..0747d5e13c9 100644
--- a/tests/Tokens_Test.dsp
+++ b/tests/Tokens_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Tokens_Test - Win32 Release

+CFG=Tokens_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,137 +14,206 @@ CFG=Tokens_Test - Win32 Release
 !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 "Tokens_Test.mak" CFG="Tokens_Test - Win32 Release"

+!MESSAGE NMAKE /f "Tokens_Test.mak" CFG="Tokens_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Tokens_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Tokens_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Tokens_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Tokens_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Tokens_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Tokens_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Tokens_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Tokens_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Tokens_Test\Debug"

+# PROP BASE Target_Dir ".\Tokens_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Tokens_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Tokens_Test - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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"

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Tokens_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Tokens_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Tokens_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Tokens_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Tokens_Test - Win32 Static Debug"

-# Name "Tokens_Test - Win32 Static Release"

-# Name "Tokens_Test - Win32 Release"

 # Name "Tokens_Test - Win32 Debug"

+# Name "Tokens_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Tokens_Test.cpp

+

+!IF  "$(CFG)" == "Tokens_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Tokens_Test - Win32 Alpha Debug"

+

+DEP_CPP_TOKEN=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\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\Get_Opt.h"\

+	"..\ace\Get_Opt.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\INET_Addr.h"\

+	"..\ace\INET_Addr.i"\

+	"..\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_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Map_Manager.cpp"\

+	"..\ace\Map_Manager.h"\

+	"..\ace\Map_Manager.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\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Remote_Tokens.h"\

+	"..\ace\Remote_Tokens.i"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SOCK.h"\

+	"..\ace\SOCK.i"\

+	"..\ace\SOCK_Connector.h"\

+	"..\ace\SOCK_Connector.i"\

+	"..\ace\SOCK_IO.h"\

+	"..\ace\SOCK_IO.i"\

+	"..\ace\SOCK_Stream.h"\

+	"..\ace\SOCK_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\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_Collection.h"\

+	"..\ace\Token_Collection.i"\

+	"..\ace\Token_Invariants.h"\

+	"..\ace\Token_Invariants.i"\

+	"..\ace\Token_Request_Reply.h"\

+	"..\ace\Token_Request_Reply.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_TOKEN=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/UPIPE_SAP_Test.dsp b/tests/UPIPE_SAP_Test.dsp
index b9a152d390b..f859ec17f3c 100644
--- a/tests/UPIPE_SAP_Test.dsp
+++ b/tests/UPIPE_SAP_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=UPIPE_SAP_Test - Win32 Release

+CFG=UPIPE_SAP_Test - Win32 PharLap ETS Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,39 +14,37 @@ CFG=UPIPE_SAP_Test - Win32 Release
 !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 "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Release"

+!MESSAGE NMAKE /f "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 PharLap ETS Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "UPIPE_SAP_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "UPIPE_SAP_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "UPIPE_SAP_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "UPIPE_SAP_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "UPIPE_SAP_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\UPIPE_SAP_Test\Debug"

+# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\Debug"

+# PROP BASE Target_Dir ".\UPIPE_SAP_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\UPIPE_SAP_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,184 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "UPIPE_SAP_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "UPIPE_SAP_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "UPIPE_SAP_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "UPIPE_SAP_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "UPIPE_SAP_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "UPIPE_SAP_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "UPIPE_SAP_Test - Win32 Static Debug"

-# Name "UPIPE_SAP_Test - Win32 Static Release"

-# Name "UPIPE_SAP_Test - Win32 Release"

 # Name "UPIPE_SAP_Test - Win32 Debug"

+# Name "UPIPE_SAP_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\UPIPE_SAP_Test.cpp

+

+!IF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 Alpha Debug"

+

+DEP_CPP_UPIPE=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Addr.h"\

+	"..\ace\Addr.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Handle_Set.h"\

+	"..\ace\Handle_Set.i"\

+	"..\ace\Hash_Map_Manager.cpp"\

+	"..\ace\Hash_Map_Manager.h"\

+	"..\ace\IO_Cntl_Msg.h"\

+	"..\ace\IPC_SAP.h"\

+	"..\ace\IPC_SAP.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Message_Block.h"\

+	"..\ace\Message_Block.i"\

+	"..\ace\Message_Queue.cpp"\

+	"..\ace\Message_Queue.h"\

+	"..\ace\Message_Queue.i"\

+	"..\ace\Module.cpp"\

+	"..\ace\Module.h"\

+	"..\ace\Module.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Reactor.h"\

+	"..\ace\Reactor.i"\

+	"..\ace\Reactor_Impl.h"\

+	"..\ace\Service_Config.h"\

+	"..\ace\Service_Config.i"\

+	"..\ace\Service_Object.h"\

+	"..\ace\Service_Object.i"\

+	"..\ace\Service_Types.h"\

+	"..\ace\Service_Types.i"\

+	"..\ace\Shared_Object.h"\

+	"..\ace\Shared_Object.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SPIPE.h"\

+	"..\ace\SPIPE.i"\

+	"..\ace\SPIPE_Acceptor.h"\

+	"..\ace\SPIPE_Addr.h"\

+	"..\ace\SPIPE_Addr.i"\

+	"..\ace\SPIPE_Stream.h"\

+	"..\ace\SPIPE_Stream.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\Strategies.h"\

+	"..\ace\Strategies_T.cpp"\

+	"..\ace\Strategies_T.h"\

+	"..\ace\Stream.cpp"\

+	"..\ace\Stream.h"\

+	"..\ace\Stream.i"\

+	"..\ace\Stream_Modules.cpp"\

+	"..\ace\Stream_Modules.h"\

+	"..\ace\Stream_Modules.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Svc_Conf_Tokens.h"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_Options.h"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Task.h"\

+	"..\ace\Task.i"\

+	"..\ace\Task_T.cpp"\

+	"..\ace\Task_T.h"\

+	"..\ace\Task_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Time_Value.h"\

+	"..\ace\Timer_Queue.h"\

+	"..\ace\Timer_Queue_T.cpp"\

+	"..\ace\Timer_Queue_T.h"\

+	"..\ace\Timer_Queue_T.i"\

+	"..\ace\Trace.h"\

+	"..\ace\UPIPE_Acceptor.h"\

+	"..\ace\UPIPE_Acceptor.i"\

+	"..\ace\UPIPE_Addr.h"\

+	"..\ace\UPIPE_Connector.h"\

+	"..\ace\UPIPE_Connector.i"\

+	"..\ace\UPIPE_Stream.h"\

+	"..\ace\UPIPE_Stream.i"\

+	"..\ace\Version.h"\

+	"..\ace\WFMO_Reactor.h"\

+	"..\ace\WFMO_Reactor.i"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_UPIPE=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/Upgradable_RW_Test.dsp b/tests/Upgradable_RW_Test.dsp
index 1bc0919a36e..169133134c4 100644
--- a/tests/Upgradable_RW_Test.dsp
+++ b/tests/Upgradable_RW_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Upgradable_RW_Test - Win32 Release

+CFG=Upgradable_RW_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 

@@ -13,39 +14,37 @@ CFG=Upgradable_RW_Test - Win32 Release
 !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 "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 Release"

+!MESSAGE NMAKE /f "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Upgradable_RW_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Upgradable_RW_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Upgradable_RW_Test - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Upgradable_RW_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Upgradable_RW_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

-!IF  "$(CFG)" == "Upgradable_RW_Test - Win32 Static Debug"

+!IF  "$(CFG)" == "Upgradable_RW_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Static_Debug"

-# PROP BASE Intermediate_Dir "Static_Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Upgradable_RW_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Debug"

+# PROP BASE Target_Dir ".\Upgradable_RW_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Static_Debug"

-# PROP Intermediate_Dir "Static_Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\DLL\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

+# PROP Target_Dir ".\Upgradable_RW_Test"

+CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -53,97 +52,119 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-

-!ELSEIF  "$(CFG)" == "Upgradable_RW_Test - Win32 Static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Static_Release"

-# PROP BASE Intermediate_Dir "Static_Release"

-# PROP BASE Target_Dir ""

-# 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 ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Upgradable_RW_Test - Win32 Release"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

 

-# 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" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# 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)" == "Upgradable_RW_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Upgradable_RW_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir "Upgradable_RW_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Upgradable_RW_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Upgradable_RW_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# 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

+# PROP Target_Dir "Upgradable_RW_Test"

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD BASE LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Upgradable_RW_Test - Win32 Static Debug"

-# Name "Upgradable_RW_Test - Win32 Static Release"

-# Name "Upgradable_RW_Test - Win32 Release"

 # Name "Upgradable_RW_Test - Win32 Debug"

+# Name "Upgradable_RW_Test - Win32 Alpha Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Upgradable_RW_Test.cpp

+

+!IF  "$(CFG)" == "Upgradable_RW_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Upgradable_RW_Test - Win32 Alpha Debug"

+

+DEP_CPP_UPGRA=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.i"\

+	"..\ace\Atomic_Op.i"\

+	"..\ace\Auto_Ptr.cpp"\

+	"..\ace\Auto_Ptr.h"\

+	"..\ace\Auto_Ptr.i"\

+	"..\ace\config-win32-common.h"\

+	"..\ace\config-win32.h"\

+	"..\ace\config.h"\

+	"..\ace\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.i"\

+	"..\ace\Log_Msg.h"\

+	"..\ace\Log_Priority.h"\

+	"..\ace\Log_Record.h"\

+	"..\ace\Log_Record.i"\

+	"..\ace\Malloc.h"\

+	"..\ace\Malloc.i"\

+	"..\ace\Malloc_T.cpp"\

+	"..\ace\Malloc_T.h"\

+	"..\ace\Malloc_T.i"\

+	"..\ace\Managed_Object.cpp"\

+	"..\ace\Managed_Object.h"\

+	"..\ace\Managed_Object.i"\

+	"..\ace\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_UPGRA=\

+	"..\ace\stdcpp.h"\

+	

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/tests/WinCE/Atomic_Op_Test.dsp b/tests/WinCE/Atomic_Op_Test.dsp
new file mode 100644
index 00000000000..cb15eb3779f
--- /dev/null
+++ b/tests/WinCE/Atomic_Op_Test.dsp
@@ -0,0 +1,974 @@
+# Microsoft Developer Studio Project File - Name="Atomic_Op_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Atomic_Op_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Atomic_Op_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 "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Atomic_Op_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Atomic_Op_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Atomic_Op_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+# Name "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+# Name "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Atomic_Op_Test.cpp

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ATOMI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\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\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\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"\

+	"..\test_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ATOMI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ATOMI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ATOMI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ATOMI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\res\WindozeCE.ico

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\ARGV.h"\

+	"..\..\ace\ARGV.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Based_Pointer_Repository.h"\

+	"..\..\ace\Based_Pointer_T.cpp"\

+	"..\..\ace\Based_Pointer_T.h"\

+	"..\..\ace\Based_Pointer_T.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.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\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Barrier_Test.dsp b/tests/WinCE/Barrier_Test.dsp
new file mode 100644
index 00000000000..913c704ee42
--- /dev/null
+++ b/tests/WinCE/Barrier_Test.dsp
@@ -0,0 +1,1074 @@
+# Microsoft Developer Studio Project File - Name="Barrier_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Barrier_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Barrier_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 "Barrier_Test.mak" CFG="Barrier_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Barrier_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Barrier_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Barrier_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Barrier_Test - Win32 (WCE x86em) Debug"

+# Name "Barrier_Test - Win32 (WCE MIPS) Debug"

+# Name "Barrier_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Barrier_Test.cpp

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_BARRI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_BARRI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_BARRI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Barrier_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Barrier_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Basic_Types_Test.dsp b/tests/WinCE/Basic_Types_Test.dsp
new file mode 100644
index 00000000000..cfe3ba19a4a
--- /dev/null
+++ b/tests/WinCE/Basic_Types_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="Basic_Types_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Basic_Types_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Basic_Types_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 "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Basic_Types_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Basic_Types_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Basic_Types_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Basic_Types_Test - Win32 (WCE x86em) Debug"

+# Name "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+# Name "Basic_Types_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Basic_Types_Test.cpp

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_BASIC=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BASIC=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_BASIC=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BASIC=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_BASIC=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BASIC=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Buffer_Stream_Test.dsp b/tests/WinCE/Buffer_Stream_Test.dsp
new file mode 100644
index 00000000000..b5c216bd135
--- /dev/null
+++ b/tests/WinCE/Buffer_Stream_Test.dsp
@@ -0,0 +1,1230 @@
+# Microsoft Developer Studio Project File - Name="Buffer_Stream_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Buffer_Stream_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Buffer_Stream_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 "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Buffer_Stream_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Buffer_Stream_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Buffer_Stream_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+# Name "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+# Name "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Buffer_Stream_Test.cpp

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_BUFFE=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream.cpp"\

+	"..\..\ace\Stream.h"\

+	"..\..\ace\Stream.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BUFFE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_BUFFE=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream.cpp"\

+	"..\..\ace\Stream.h"\

+	"..\..\ace\Stream.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BUFFE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_BUFFE=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream.cpp"\

+	"..\..\ace\Stream.h"\

+	"..\..\ace\Stream.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_BUFFE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Conn_Test.dsp b/tests/WinCE/Conn_Test.dsp
new file mode 100644
index 00000000000..c29d1050e60
--- /dev/null
+++ b/tests/WinCE/Conn_Test.dsp
@@ -0,0 +1,1335 @@
+# Microsoft Developer Studio Project File - Name="Conn_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Conn_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Conn_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Conn_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Conn_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Conn_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Conn_Test - Win32 (WCE x86em) Debug"

+# Name "Conn_Test - Win32 (WCE MIPS) Debug"

+# Name "Conn_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Conn_Test.cpp

+

+!IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_CONN_=\

+	"..\..\ace\Acceptor.cpp"\

+	"..\..\ace\Acceptor.h"\

+	"..\..\ace\Acceptor.i"\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-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\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\LOCK_SOCK_Acceptor.cpp"\

+	"..\..\ace\LOCK_SOCK_Acceptor.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Svc_Handler.cpp"\

+	"..\..\ace\Svc_Handler.h"\

+	"..\..\ace\Svc_Handler.i"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\Conn_Test.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_CONN_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_CONN_=\

+	"..\..\ace\Acceptor.cpp"\

+	"..\..\ace\Acceptor.h"\

+	"..\..\ace\Acceptor.i"\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-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\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\LOCK_SOCK_Acceptor.cpp"\

+	"..\..\ace\LOCK_SOCK_Acceptor.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Svc_Handler.cpp"\

+	"..\..\ace\Svc_Handler.h"\

+	"..\..\ace\Svc_Handler.i"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\Conn_Test.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_CONN_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_CONN_=\

+	"..\..\ace\Acceptor.cpp"\

+	"..\..\ace\Acceptor.h"\

+	"..\..\ace\Acceptor.i"\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-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\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\LOCK_SOCK_Acceptor.cpp"\

+	"..\..\ace\LOCK_SOCK_Acceptor.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Svc_Handler.cpp"\

+	"..\..\ace\Svc_Handler.h"\

+	"..\..\ace\Svc_Handler.i"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\Conn_Test.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_CONN_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Conn_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Conn_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/DLL_Test.dsp b/tests/WinCE/DLL_Test.dsp
new file mode 100644
index 00000000000..593dc9f707c
--- /dev/null
+++ b/tests/WinCE/DLL_Test.dsp
@@ -0,0 +1,974 @@
+# 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 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=DLL_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "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 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "DLL_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "DLL_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "DLL_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "DLL_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "DLL_Test - Win32 (WCE x86em) Debug"

+# Name "DLL_Test - Win32 (WCE MIPS) Debug"

+# Name "DLL_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "DLL_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\DLL_Test.cpp

+

+!IF  "$(CFG)" == "DLL_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ATOMI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\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\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\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"\

+	"..\test_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ATOMI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ATOMI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ATOMI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ATOMI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "DLL_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "DLL_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\res\WindozeCE.ico

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "DLL_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "DLL_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\ARGV.h"\

+	"..\..\ace\ARGV.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Based_Pointer_Repository.h"\

+	"..\..\ace\Based_Pointer_T.cpp"\

+	"..\..\ace\Based_Pointer_T.h"\

+	"..\..\ace\Based_Pointer_T.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.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\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "DLL_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Enum_Interfaces_Test.dsp b/tests/WinCE/Enum_Interfaces_Test.dsp
new file mode 100644
index 00000000000..15ca675839c
--- /dev/null
+++ b/tests/WinCE/Enum_Interfaces_Test.dsp
@@ -0,0 +1,1080 @@
+# Microsoft Developer Studio Project File - Name="Enum_Interfaces_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Enum_Interfaces_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Enum_Interfaces_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 "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Enum_Interfaces_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+# Name "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+# Name "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Enum_Interfaces_Test.cpp

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ENUM_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ENUM_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ENUM_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ENUM_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ENUM_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ENUM_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Future_Test.dsp b/tests/WinCE/Future_Test.dsp
new file mode 100644
index 00000000000..b2103db2dbc
--- /dev/null
+++ b/tests/WinCE/Future_Test.dsp
@@ -0,0 +1,1233 @@
+# Microsoft Developer Studio Project File - Name="Future_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Future_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Future_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 "Future_Test.mak" CFG="Future_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Future_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Future_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Future_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Future_Test - Win32 (WCE x86em) Debug"

+# Name "Future_Test - Win32 (WCE MIPS) Debug"

+# Name "Future_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Future_Test.cpp

+

+!IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_FUTUR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Activation_Queue.h"\

+	"..\..\ace\Activation_Queue.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Future.cpp"\

+	"..\..\ace\Future.h"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Method_Object.h"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_FUTUR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_FUTUR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Activation_Queue.h"\

+	"..\..\ace\Activation_Queue.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Future.cpp"\

+	"..\..\ace\Future.h"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Method_Object.h"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_FUTUR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_FUTUR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Activation_Queue.h"\

+	"..\..\ace\Activation_Queue.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Future.cpp"\

+	"..\..\ace\Future.h"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Method_Object.h"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_FUTUR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Future_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Future_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Handle_Set_Test.dsp b/tests/WinCE/Handle_Set_Test.dsp
new file mode 100644
index 00000000000..daecf0c9d83
--- /dev/null
+++ b/tests/WinCE/Handle_Set_Test.dsp
@@ -0,0 +1,1089 @@
+# Microsoft Developer Studio Project File - Name="Handle_Set_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Handle_Set_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Handle_Set_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 "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Handle_Set_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Handle_Set_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Handle_Set_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Handle_Set_Test - Win32 (WCE x86em) Debug"

+# Name "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+# Name "Handle_Set_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Handle_Set_Test.cpp

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_HANDL=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.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_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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_HANDL=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_HANDL=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.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_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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_HANDL=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_HANDL=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.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_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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_HANDL=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Hash_Map_Manager_Test.dsp b/tests/WinCE/Hash_Map_Manager_Test.dsp
new file mode 100644
index 00000000000..80f8e2d5b7c
--- /dev/null
+++ b/tests/WinCE/Hash_Map_Manager_Test.dsp
@@ -0,0 +1,1125 @@
+# Microsoft Developer Studio Project File - Name="Hash_Map_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Hash_Map_Manager_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+# Name "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+# Name "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Hash_Map_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_HASH_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.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.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_HASH_=\

+	"..\..\ace\sys_conf.h"\

+	"..\Hash_Map_Manager_Test.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_HASH_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.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.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_HASH_=\

+	"..\..\ace\sys_conf.h"\

+	"..\Hash_Map_Manager_Test.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_HASH_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.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.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_HASH_=\

+	"..\..\ace\sys_conf.h"\

+	"..\Hash_Map_Manager_Test.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/MT_Reactor_Timer_Test.dsp b/tests/WinCE/MT_Reactor_Timer_Test.dsp
new file mode 100644
index 00000000000..04bc2b6de44
--- /dev/null
+++ b/tests/WinCE/MT_Reactor_Timer_Test.dsp
@@ -0,0 +1,701 @@
+# 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 (WCE x86em) Application" 0x0b01

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

+# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+

+CFG=MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "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 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug" (based on\

+ "Win32 (WCE x86em) Application")

+!MESSAGE "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug" (based on\

+ "Win32 (WCE MIPS) Application")

+!MESSAGE "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug" (based on\

+ "Win32 (WCE SH) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+# PROP WCE_Configuration "H/PC Ver. 2.00"

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE -COPY

+# ADD EMPFILE -COPY

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /QMRWCE /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 commctrl.lib coredll.lib aced.lib /nologo /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ENDIF 

+

+# Begin Target

+

+# Name "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+# Name "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+# Name "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\MT_Reactor_Timer_Test.cpp

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MT_RE=\

+	"..\..\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-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\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\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_MT_RE=\

+	"..\..\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-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\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\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_Reactor_Timer_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/MT_SOCK_Test.dsp b/tests/WinCE/MT_SOCK_Test.dsp
new file mode 100644
index 00000000000..12918acb791
--- /dev/null
+++ b/tests/WinCE/MT_SOCK_Test.dsp
@@ -0,0 +1,1131 @@
+# Microsoft Developer Studio Project File - Name="MT_SOCK_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=MT_SOCK_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "MT_SOCK_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_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "MT_SOCK_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "MT_SOCK_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "MT_SOCK_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+# Name "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+# Name "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\MT_SOCK_Test.cpp

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MT_SO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MT_SO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_MT_SO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MT_SO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_MT_SO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MT_SO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Map_Manager_Test.dsp b/tests/WinCE/Map_Manager_Test.dsp
new file mode 100644
index 00000000000..53600b2ecfc
--- /dev/null
+++ b/tests/WinCE/Map_Manager_Test.dsp
@@ -0,0 +1,1146 @@
+# Microsoft Developer Studio Project File - Name="Map_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Map_Manager_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Map_Manager_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_Manager_Test.mak" CFG="Map_Manager_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Map_Manager_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Map_Manager_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Map_Manager_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Map_Manager_Test - Win32 (WCE x86em) Debug"

+# Name "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+# Name "Map_Manager_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Map_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MAP_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-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\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\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MAP_M=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_MAP_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-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\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\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MAP_M=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_MAP_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-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\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\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MAP_M=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Mem_Map_Test.dsp b/tests/WinCE/Mem_Map_Test.dsp
new file mode 100644
index 00000000000..fae67ef6789
--- /dev/null
+++ b/tests/WinCE/Mem_Map_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="Mem_Map_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Mem_Map_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Mem_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 "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Mem_Map_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Mem_Map_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Mem_Map_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Mem_Map_Test - Win32 (WCE x86em) Debug"

+# Name "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+# Name "Mem_Map_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Mem_Map_Test.cpp

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MEM_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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MEM_M=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_MEM_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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MEM_M=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_MEM_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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MEM_M=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Message_Block_Test.dsp b/tests/WinCE/Message_Block_Test.dsp
new file mode 100644
index 00000000000..54a09c41a12
--- /dev/null
+++ b/tests/WinCE/Message_Block_Test.dsp
@@ -0,0 +1,1233 @@
+# Microsoft Developer Studio Project File - Name="Message_Block_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Message_Block_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Block_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Message_Block_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Message_Block_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Message_Block_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Message_Block_Test - Win32 (WCE x86em) Debug"

+# Name "Message_Block_Test - Win32 (WCE MIPS) Debug"

+# Name "Message_Block_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Message_Block_Test.cpp

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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\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\IO_Cntl_Msg.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_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\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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\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\IO_Cntl_Msg.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_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\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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\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\IO_Cntl_Msg.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_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\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Message_Queue_Notifications_Test.dsp b/tests/WinCE/Message_Queue_Notifications_Test.dsp
new file mode 100644
index 00000000000..cfec1646807
--- /dev/null
+++ b/tests/WinCE/Message_Queue_Notifications_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="Message_Queue_Notifications_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+# Name "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+# Name "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Message_Queue_Notifications_Test.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Message_Queue_Test.dsp b/tests/WinCE/Message_Queue_Test.dsp
new file mode 100644
index 00000000000..9cea8d9574a
--- /dev/null
+++ b/tests/WinCE/Message_Queue_Test.dsp
@@ -0,0 +1,1185 @@
+# Microsoft Developer Studio Project File - Name="Message_Queue_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Message_Queue_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Queue_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Message_Queue_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Message_Queue_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Message_Queue_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Message_Queue_Test - Win32 (WCE x86em) Debug"

+# Name "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+# Name "Message_Queue_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Message_Queue_Test.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_MESSA=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_MESSA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Notify_Performance_Test.dsp b/tests/WinCE/Notify_Performance_Test.dsp
new file mode 100644
index 00000000000..bd67364c679
--- /dev/null
+++ b/tests/WinCE/Notify_Performance_Test.dsp
@@ -0,0 +1,1239 @@
+# Microsoft Developer Studio Project File - Name="Notify_Performance_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Notify_Performance_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Notify_Performance_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 "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Notify_Performance_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Notify_Performance_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Notify_Performance_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+# Name "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+# Name "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Notify_Performance_Test.cpp

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_NOTIF=\

+	"..\..\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-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\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\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Pipe.h"\

+	"..\..\ace\Pipe.i"\

+	"..\..\ace\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_NOTIF=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_NOTIF=\

+	"..\..\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-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\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\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Pipe.h"\

+	"..\..\ace\Pipe.i"\

+	"..\..\ace\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_NOTIF=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_NOTIF=\

+	"..\..\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-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\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\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Pipe.h"\

+	"..\..\ace\Pipe.i"\

+	"..\..\ace\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_NOTIF=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/OrdMultiSet_Test.dsp b/tests/WinCE/OrdMultiSet_Test.dsp
new file mode 100644
index 00000000000..44787688012
--- /dev/null
+++ b/tests/WinCE/OrdMultiSet_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="OrdMultiSet_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=OrdMultiSet_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "OrdMultiSet_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 "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "OrdMultiSet_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "OrdMultiSet_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "OrdMultiSet_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+# Name "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+# Name "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\OrdMultiSet_Test.cpp

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ORDMU=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ORDMU=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ORDMU=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ORDMU=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ORDMU=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_ORDMU=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "OrdMultiSet_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Priority_Buffer_Test.dsp b/tests/WinCE/Priority_Buffer_Test.dsp
new file mode 100644
index 00000000000..2a8c0df98e0
--- /dev/null
+++ b/tests/WinCE/Priority_Buffer_Test.dsp
@@ -0,0 +1,1185 @@
+# Microsoft Developer Studio Project File - Name="Priority_Buffer_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Priority_Buffer_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Priority_Buffer_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 "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Priority_Buffer_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Priority_Buffer_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Priority_Buffer_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+# Name "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+# Name "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Priority_Buffer_Test.cpp

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_PRIOR=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_PRIOR=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_PRIOR=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Priority_Task_Test.dsp b/tests/WinCE/Priority_Task_Test.dsp
new file mode 100644
index 00000000000..93699bd75cd
--- /dev/null
+++ b/tests/WinCE/Priority_Task_Test.dsp
@@ -0,0 +1,1224 @@
+# Microsoft Developer Studio Project File - Name="Priority_Task_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Priority_Task_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Priority_Task_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 "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Priority_Task_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Priority_Task_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Priority_Task_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Priority_Task_Test - Win32 (WCE x86em) Debug"

+# Name "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+# Name "Priority_Task_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Priority_Task_Test.cpp

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_PRIOR=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_PRIOR=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_PRIOR=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_PRIOR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Reactor_Exceptions_Test.dsp b/tests/WinCE/Reactor_Exceptions_Test.dsp
new file mode 100644
index 00000000000..d07c4b064a7
--- /dev/null
+++ b/tests/WinCE/Reactor_Exceptions_Test.dsp
@@ -0,0 +1,698 @@
+# Microsoft Developer Studio Project File - Name="Reactor_Exceptions_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x0b01

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

+# TARGTYPE "Win32 (WCE SH) Application" 0x0901

+

+CFG=Reactor_Exceptions_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Reactor_Exceptions_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 "Reactor_Exceptions_Test.mak"\

+ CFG="Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug" (based on\

+ "Win32 (WCE x86em) Application")

+!MESSAGE "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug" (based on\

+ "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactor_Exceptions_Test - Win32 (WCE SH) Debug" (based on\

+ "Win32 (WCE SH) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+# PROP WCE_Configuration "H/PC Ver. 2.00"

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /YX /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE -COPY

+# ADD EMPFILE -COPY

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /YX /QMRWCE /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 commctrl.lib coredll.lib aced.lib /nologo /debug /machine:MIPS /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /YX /c

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+# Name "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+# Name "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Reactor_Exceptions_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_MAP_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-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\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\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_MAP_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-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\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\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\sys_conf.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Exceptions_Test - Win32 (WCE SH) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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\sys_conf.h"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Reactor_Notify_Test.dsp b/tests/WinCE/Reactor_Notify_Test.dsp
new file mode 100644
index 00000000000..d722ed70d75
--- /dev/null
+++ b/tests/WinCE/Reactor_Notify_Test.dsp
@@ -0,0 +1,1251 @@
+# Microsoft Developer Studio Project File - Name="Reactor_Notify_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Reactor_Notify_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Reactor_Notify_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 "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Notify_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactor_Notify_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactor_Notify_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+# Name "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+# Name "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Reactor_Notify_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Token.h"\

+	"..\..\ace\Token.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Token.h"\

+	"..\..\ace\Token.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Map_Manager.cpp"\

+	"..\..\ace\Map_Manager.h"\

+	"..\..\ace\Map_Manager.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\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\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Token.h"\

+	"..\..\ace\Token.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Reactor_Performance_Test.dsp b/tests/WinCE/Reactor_Performance_Test.dsp
new file mode 100644
index 00000000000..719072a9d98
--- /dev/null
+++ b/tests/WinCE/Reactor_Performance_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="Reactor_Performance_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Reactor_Performance_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Reactor_Performance_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 "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Performance_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactor_Performance_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactor_Performance_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+# Name "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+# Name "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Reactor_Performance_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Reactor_Timer_Test.dsp b/tests/WinCE/Reactor_Timer_Test.dsp
new file mode 100644
index 00000000000..be3b028e5d2
--- /dev/null
+++ b/tests/WinCE/Reactor_Timer_Test.dsp
@@ -0,0 +1,1095 @@
+# Microsoft Developer Studio Project File - Name="Reactor_Timer_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Reactor_Timer_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "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 "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Timer_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactor_Timer_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactor_Timer_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+# Name "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+# Name "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Reactor_Timer_Test.cpp

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.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_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Reactors_Test.dsp b/tests/WinCE/Reactors_Test.dsp
new file mode 100644
index 00000000000..392c2f50fd3
--- /dev/null
+++ b/tests/WinCE/Reactors_Test.dsp
@@ -0,0 +1,1218 @@
+# Microsoft Developer Studio Project File - Name="Reactors_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Reactors_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Reactors_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 "Reactors_Test.mak" CFG="Reactors_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactors_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reactors_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reactors_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactors_Test - Win32 (WCE x86em) Debug"

+# Name "Reactors_Test - Win32 (WCE MIPS) Debug"

+# Name "Reactors_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Reactors_Test.cpp

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_REACT=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_REACT=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Reactors_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reactors_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Reader_Writer_Test.dsp b/tests/WinCE/Reader_Writer_Test.dsp
new file mode 100644
index 00000000000..e5675460b8a
--- /dev/null
+++ b/tests/WinCE/Reader_Writer_Test.dsp
@@ -0,0 +1,1080 @@
+# Microsoft Developer Studio Project File - Name="Reader_Writer_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Reader_Writer_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Reader_Writer_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 "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reader_Writer_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Reader_Writer_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Reader_Writer_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+# Name "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+# Name "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Reader_Writer_Test.cpp

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_READE=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_READE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_READE=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_READE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_READE=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_READE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Recursive_Mutex_Test.dsp b/tests/WinCE/Recursive_Mutex_Test.dsp
new file mode 100644
index 00000000000..6904ceb7cc5
--- /dev/null
+++ b/tests/WinCE/Recursive_Mutex_Test.dsp
@@ -0,0 +1,1080 @@
+# Microsoft Developer Studio Project File - Name="Recursive_Mutex_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Recursive_Mutex_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Recursive_Mutex_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 "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Recursive_Mutex_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+# Name "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+# Name "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Recursive_Mutex_Test.cpp

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_RECUR=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_RECUR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_RECUR=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_RECUR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_RECUR=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_RECUR=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/SOCK_Connector_Test.dsp b/tests/WinCE/SOCK_Connector_Test.dsp
new file mode 100644
index 00000000000..15159c5b51c
--- /dev/null
+++ b/tests/WinCE/SOCK_Connector_Test.dsp
@@ -0,0 +1,1113 @@
+# Microsoft Developer Studio Project File - Name="SOCK_Connector_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=SOCK_Connector_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "SOCK_Connector_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 "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SOCK_Connector_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "SOCK_Connector_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "SOCK_Connector_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+# Name "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+# Name "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\SOCK_Connector_Test.cpp

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_SOCK_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_SOCK_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_SOCK_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/SOCK_Test.dsp b/tests/WinCE/SOCK_Test.dsp
new file mode 100644
index 00000000000..b4d012abf6f
--- /dev/null
+++ b/tests/WinCE/SOCK_Test.dsp
@@ -0,0 +1,1131 @@
+# Microsoft Developer Studio Project File - Name="SOCK_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=SOCK_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "SOCK_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 "SOCK_Test.mak" CFG="SOCK_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SOCK_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "SOCK_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "SOCK_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SOCK_Test - Win32 (WCE x86em) Debug"

+# Name "SOCK_Test - Win32 (WCE MIPS) Debug"

+# Name "SOCK_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\SOCK_Test.cpp

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_SOCK_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_SOCK_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_SOCK_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_IO.h"\

+	"..\..\ace\SOCK_IO.i"\

+	"..\..\ace\SOCK_Stream.h"\

+	"..\..\ace\SOCK_Stream.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Time_Value.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SOCK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "SOCK_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/SString_Test.dsp b/tests/WinCE/SString_Test.dsp
new file mode 100644
index 00000000000..a6dc59239f1
--- /dev/null
+++ b/tests/WinCE/SString_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="SString_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=SString_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "SString_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 "SString_Test.mak" CFG="SString_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SString_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "SString_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "SString_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SString_Test - Win32 (WCE x86em) Debug"

+# Name "SString_Test - Win32 (WCE MIPS) Debug"

+# Name "SString_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\SString_Test.cpp

+

+!IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_SSTRI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SSTRI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_SSTRI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SSTRI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_SSTRI=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SSTRI=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "SString_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SString_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Semaphore_Test.dsp b/tests/WinCE/Semaphore_Test.dsp
new file mode 100644
index 00000000000..b16a0c665db
--- /dev/null
+++ b/tests/WinCE/Semaphore_Test.dsp
@@ -0,0 +1,1080 @@
+# Microsoft Developer Studio Project File - Name="Semaphore_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Semaphore_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Semaphore_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 "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Semaphore_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Semaphore_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Semaphore_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Semaphore_Test - Win32 (WCE x86em) Debug"

+# Name "Semaphore_Test - Win32 (WCE MIPS) Debug"

+# Name "Semaphore_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Semaphore_Test.cpp

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_SEMAP=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SEMAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_SEMAP=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SEMAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_SEMAP=\

+	"..\..\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-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\Get_Opt.h"\

+	"..\..\ace\Get_Opt.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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SEMAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Semaphore_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Sigset_Ops_Test.dsp b/tests/WinCE/Sigset_Ops_Test.dsp
new file mode 100644
index 00000000000..6b62347aef7
--- /dev/null
+++ b/tests/WinCE/Sigset_Ops_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="Sigset_Ops_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Sigset_Ops_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Sigset_Ops_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 "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Sigset_Ops_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Sigset_Ops_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Sigset_Ops_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+# Name "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+# Name "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Sigset_Ops_Test.cpp

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_SIGSE=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SIGSE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_SIGSE=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SIGSE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_SIGSE=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SIGSE=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Sigset_Ops_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Simple_Message_Block_Test.dsp b/tests/WinCE/Simple_Message_Block_Test.dsp
new file mode 100644
index 00000000000..3b1b58779f9
--- /dev/null
+++ b/tests/WinCE/Simple_Message_Block_Test.dsp
@@ -0,0 +1,1074 @@
+# Microsoft Developer Studio Project File - Name="Simple_Message_Block_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Simple_Message_Block_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Simple_Message_Block_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 "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Simple_Message_Block_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+# Name "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+# Name "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Simple_Message_Block_Test.cpp

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_SIMPL=\

+	"..\..\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-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_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\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SIMPL=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_SIMPL=\

+	"..\..\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-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_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\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SIMPL=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_SIMPL=\

+	"..\..\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-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_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\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_SIMPL=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/TSS_Test.dsp b/tests/WinCE/TSS_Test.dsp
new file mode 100644
index 00000000000..8bcc288dd67
--- /dev/null
+++ b/tests/WinCE/TSS_Test.dsp
@@ -0,0 +1,1077 @@
+# Microsoft Developer Studio Project File - Name="TSS_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=TSS_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "TSS_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 "TSS_Test.mak" CFG="TSS_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "TSS_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "TSS_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "TSS_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "TSS_Test - Win32 (WCE x86em) Debug"

+# Name "TSS_Test - Win32 (WCE MIPS) Debug"

+# Name "TSS_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\TSS_Test.cpp

+

+!IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_TSS_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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	"..\TSS_Test_Errno.h"\

+	

+NODEP_CPP_TSS_T=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_TSS_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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	"..\TSS_Test_Errno.h"\

+	

+NODEP_CPP_TSS_T=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_TSS_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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	"..\TSS_Test_Errno.h"\

+	

+NODEP_CPP_TSS_T=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "TSS_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "TSS_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Task_Test.dsp b/tests/WinCE/Task_Test.dsp
new file mode 100644
index 00000000000..87419d5a05b
--- /dev/null
+++ b/tests/WinCE/Task_Test.dsp
@@ -0,0 +1,1218 @@
+# Microsoft Developer Studio Project File - Name="Task_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Task_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Task_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 "Task_Test.mak" CFG="Task_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Task_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Task_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Task_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Task_Test - Win32 (WCE x86em) Debug"

+# Name "Task_Test - Win32 (WCE MIPS) Debug"

+# Name "Task_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Task_Test.cpp

+

+!IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_TASK_=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TASK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_TASK_=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TASK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_TASK_=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TASK_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Task_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Task_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Thread_Manager_Test.dsp b/tests/WinCE/Thread_Manager_Test.dsp
new file mode 100644
index 00000000000..26c7d1cafc6
--- /dev/null
+++ b/tests/WinCE/Thread_Manager_Test.dsp
@@ -0,0 +1,1077 @@
+# Microsoft Developer Studio Project File - Name="Thread_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Thread_Manager_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Thread_Manager_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 "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Manager_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Thread_Manager_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Thread_Manager_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+# Name "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+# Name "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Thread_Manager_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	"..\Thread_Manager_Test.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	"..\Thread_Manager_Test.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	"..\Thread_Manager_Test.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Thread_Mutex_Test.dsp b/tests/WinCE/Thread_Mutex_Test.dsp
new file mode 100644
index 00000000000..720fc2cb14e
--- /dev/null
+++ b/tests/WinCE/Thread_Mutex_Test.dsp
@@ -0,0 +1,1074 @@
+# Microsoft Developer Studio Project File - Name="Thread_Mutex_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Thread_Mutex_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Thread_Mutex_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 "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Mutex_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Thread_Mutex_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Thread_Mutex_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+# Name "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+# Name "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Thread_Mutex_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Thread_Pool_Test.dsp b/tests/WinCE/Thread_Pool_Test.dsp
new file mode 100644
index 00000000000..45a0b2167cc
--- /dev/null
+++ b/tests/WinCE/Thread_Pool_Test.dsp
@@ -0,0 +1,1218 @@
+# Microsoft Developer Studio Project File - Name="Thread_Pool_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Thread_Pool_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Thread_Pool_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 "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Pool_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Thread_Pool_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Thread_Pool_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+# Name "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+# Name "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Thread_Pool_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_THREA=\

+	"..\..\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-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\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.cpp"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc.h"\

+	"..\..\ace\Malloc.i"\

+	"..\..\ace\Malloc_T.cpp"\

+	"..\..\ace\Malloc_T.h"\

+	"..\..\ace\Malloc_T.i"\

+	"..\..\ace\Managed_Object.cpp"\

+	"..\..\ace\Managed_Object.h"\

+	"..\..\ace\Managed_Object.i"\

+	"..\..\ace\Mem_Map.h"\

+	"..\..\ace\Mem_Map.i"\

+	"..\..\ace\Memory_Pool.h"\

+	"..\..\ace\Memory_Pool.i"\

+	"..\..\ace\Message_Block.h"\

+	"..\..\ace\Message_Block.i"\

+	"..\..\ace\Message_Queue.cpp"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Module.cpp"\

+	"..\..\ace\Module.h"\

+	"..\..\ace\Module.i"\

+	"..\..\ace\Object_Manager.h"\

+	"..\..\ace\Object_Manager.i"\

+	"..\..\ace\OS.h"\

+	"..\..\ace\OS.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\ace\SV_Semaphore_Complex.h"\

+	"..\..\ace\SV_Semaphore_Complex.i"\

+	"..\..\ace\SV_Semaphore_Simple.h"\

+	"..\..\ace\SV_Semaphore_Simple.i"\

+	"..\..\ace\Svc_Conf_Tokens.h"\

+	"..\..\ace\Synch.h"\

+	"..\..\ace\Synch.i"\

+	"..\..\ace\Synch_Options.h"\

+	"..\..\ace\Synch_Options.i"\

+	"..\..\ace\Synch_T.cpp"\

+	"..\..\ace\Synch_T.h"\

+	"..\..\ace\Synch_T.i"\

+	"..\..\ace\Task.h"\

+	"..\..\ace\Task.i"\

+	"..\..\ace\Task_T.cpp"\

+	"..\..\ace\Task_T.h"\

+	"..\..\ace\Task_T.i"\

+	"..\..\ace\Thread.h"\

+	"..\..\ace\Thread.i"\

+	"..\..\ace\Thread_Manager.h"\

+	"..\..\ace\Thread_Manager.i"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_THREA=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Time_Value_Test.dsp b/tests/WinCE/Time_Value_Test.dsp
new file mode 100644
index 00000000000..0b9a164a93f
--- /dev/null
+++ b/tests/WinCE/Time_Value_Test.dsp
@@ -0,0 +1,1068 @@
+# Microsoft Developer Studio Project File - Name="Time_Value_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Time_Value_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Time_Value_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 "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Time_Value_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Time_Value_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Time_Value_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Time_Value_Test - Win32 (WCE x86em) Debug"

+# Name "Time_Value_Test - Win32 (WCE MIPS) Debug"

+# Name "Time_Value_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Time_Value_Test.cpp

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_TIME_=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TIME_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_TIME_=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TIME_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_TIME_=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TIME_=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Time_Value_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/Timer_Queue_Test.dsp b/tests/WinCE/Timer_Queue_Test.dsp
new file mode 100644
index 00000000000..5b7d418b9d6
--- /dev/null
+++ b/tests/WinCE/Timer_Queue_Test.dsp
@@ -0,0 +1,1131 @@
+# Microsoft Developer Studio Project File - Name="Timer_Queue_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01

+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101

+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201

+

+CFG=Timer_Queue_Test - Win32 (WCE x86em) Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Timer_Queue_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 "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 (WCE x86em) Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Timer_Queue_Test - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")

+!MESSAGE "Timer_Queue_Test - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")

+!MESSAGE "Timer_Queue_Test - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "x86emDbg"

+# PROP BASE Intermediate_Dir "x86emDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "x86emDbg"

+# PROP Intermediate_Dir "x86emDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

+CPP=cl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

+# ADD CPP /nologo /MTd /W3 /Gm /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /debug /machine:I386 /windowsce:emulation

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\x86em" /windowsce:emulation

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WMIPSDbg"

+# PROP BASE Intermediate_Dir "WMIPSDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WMIPSDbg"

+# PROP Intermediate_Dir "WMIPSDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=clmips.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /QMRWCE  /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\MIPS" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "WCESHDbg"

+# PROP BASE Intermediate_Dir "WCESHDbg"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 2

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "WCESHDbg"

+# PROP Intermediate_Dir "WCESHDbg"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

+CPP=shcl.exe

+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\WindozeCE" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "ACE_HAS_WINCE" /D ACE_HAS_DLL=1 /D "_AFXDLL" /c

+# SUBTRACT CPP /YX

+RSC=rc.exe

+# ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"

+# ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG" /d "_AFXDLL"

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /subsystem:$(CESubsystem)

+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

+# ADD LINK32 aced.lib  /nologo /entry:"wWinMainCRTStartup" /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /libpath:"..\..\ace\WCE\SH" /subsystem:$(CESubsystem)

+# SUBTRACT LINK32 /pdb:none /nodefaultlib

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+# Name "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+# Name "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\ACEApp.cpp

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_ACEAP=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	

+NODEP_CPP_ACEAP=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\StdAfx.cpp

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_STDAF=\

+	"..\..\WindozeCE\stdafx.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\Timer_Queue_Test.cpp

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_TIMER=\

+	"..\..\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-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\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.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_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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Time_Value.h"\

+	"..\..\ace\Timer_Hash.h"\

+	"..\..\ace\Timer_Hash_T.cpp"\

+	"..\..\ace\Timer_Hash_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\Timer_Wheel.h"\

+	"..\..\ace\Timer_Wheel_T.cpp"\

+	"..\..\ace\Timer_Wheel_T.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TIMER=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_TIMER=\

+	"..\..\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-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\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.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_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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Time_Value.h"\

+	"..\..\ace\Timer_Hash.h"\

+	"..\..\ace\Timer_Hash_T.cpp"\

+	"..\..\ace\Timer_Hash_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\Timer_Wheel.h"\

+	"..\..\ace\Timer_Wheel_T.cpp"\

+	"..\..\ace\Timer_Wheel_T.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TIMER=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_TIMER=\

+	"..\..\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-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\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.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_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\Profile_Timer.h"\

+	"..\..\ace\Profile_Timer.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.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\Time_Value.h"\

+	"..\..\ace\Timer_Hash.h"\

+	"..\..\ace\Timer_Hash_T.cpp"\

+	"..\..\ace\Timer_Hash_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\Timer_Wheel.h"\

+	"..\..\ace\Timer_Wheel_T.cpp"\

+	"..\..\ace\Timer_Wheel_T.h"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\ws2tcpip.h"\

+	"..\test_config.h"\

+	

+NODEP_CPP_TIMER=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.cpp

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDO=\

+	"..\..\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-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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDO=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCE.rc

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

+

+!IF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE x86em) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE MIPS) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 (WCE SH3) Debug"

+

+DEP_CPP_WINDOZ=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.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\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_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\Signal.h"\

+	"..\..\ace\Signal.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"\

+	"..\..\WindozeCE\ACEApp.h"\

+	"..\..\WindozeCE\resource.h"\

+	"..\..\WindozeCE\stdafx.h"\

+	"..\..\WindozeCE\WindozeCE.h"\

+	"..\..\WindozeCE\WindozeCEDlg.h"\

+	

+NODEP_CPP_WINDOZ=\

+	"..\..\ace\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# End Target

+# End Project

diff --git a/tests/WinCE/ce_tests.dsw b/tests/WinCE/ce_tests.dsw
new file mode 100644
index 00000000000..970b88f40a0
--- /dev/null
+++ b/tests/WinCE/ce_tests.dsw
@@ -0,0 +1,485 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Barrier_Test"=.\Barrier_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Basic_Types_Test"=.\Basic_Types_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Buffer_Stream_Test"=.\Buffer_Stream_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Enum_Interfaces_Test"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Future_Test"=.\Future_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Handle_Set_Test"=.\Handle_Set_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "MT_SOCK_Test"=.\MT_SOCK_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Map_Manager_Test"=.\Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Message_Block_Test"=.\Message_Block_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Message_Queue_Test"=.\Message_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Priority_Buffer_Test"=.\Priority_Buffer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactor_Notify_Test"=.\Reactor_Notify_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactor_Performance_Test"=.\Reactor_Performance_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactor_Timer_Test"=.\Reactor_Timer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactors_Test"=.\Reactors_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reader_Writer_Test"=.\Reader_Writer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Recursive_Mutex_Test"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SString_Test"=.\SString_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Semaphore_Test"=.\Semaphore_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Sigset_Ops_Test"=.\Sigset_Ops_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Simple_Message_Block_Test"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "TSS_Test"=.\TSS_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Task_Test"=.\Task_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Thread_Manager_Test"=.\Thread_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Thread_Mutex_Test"=.\Thread_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Thread_Pool_Test"=.\Thread_Pool_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Time_Value_Test"=.\Time_Value_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Timer_Queue_Test"=.\Timer_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/tests/run_test.lst b/tests/run_test.lst
index 473dca7ef1d..0939ec06e91 100644
--- a/tests/run_test.lst
+++ b/tests/run_test.lst
@@ -31,7 +31,7 @@ CDR_Array_Test
 Collection_Test
 Conn_Test: !chorus
 Dirent_Test
-DLL_Test: !Unicos !STATIC !KCC_Linux
+DLL_Test: !Unicos !STATIC
 DLList_Test
 Dynamic_Priority_Test
 Enum_Interfaces_Test
@@ -72,7 +72,7 @@ Process_Strategy_Test: !chorus !LynxOS
 RB_Tree_Test
 Reactors_Test
 Reactor_Exceptions_Test
-Reactor_Notify_Test: !ST
+Reactor_Notify_Test
 Reactor_Performance_Test: !chorus
 Reactor_Timer_Test
 Reader_Writer_Test
diff --git a/tests/run_test.pl b/tests/run_test.pl
index 72d4b5bc4a6..8410dfbc9d1 100755
--- a/tests/run_test.pl
+++ b/tests/run_test.pl
@@ -166,7 +166,6 @@ sub check_log ($$)
             print STDERR "Error: Cannot open log file $log\n";
         } 
         else {
-            my $print_log = 0;
             my $starting_matched = 0;
             my $ending_matched = 0;
             
@@ -183,37 +182,17 @@ sub check_log ($$)
                 
                 if (/LM\_ERROR\@(.*)$/) {
                     print STDERR "Error: ($log): $1\n";
-                    $print_log = 1;
                 } 
-                if (/LM\_WARNING\@(.*)$/) {
-                    print STDERR "Warning: ($log): $1\n";
-                    $print_log = 1;
-                }
             }
 
             close (LOG); # ignore errors
 
             if ($starting_matched == 0) {
                 print STDERR "Error ($log): no line with 'starting'\n";
-                $print_log = 1;
             }
             
             if ($ending_matched == 0) {
                 print STDERR "Error ($log): no line with 'Ending'\n";
-                $print_log = 1;
-            }
-
-            if ($print_log == 1) {
-                print STDERR "======= Begin Log File \n";
-                if (open (LOG, "<".$log) == 0) {
-                    print STDERR "Error: Cannot open log file $log\n";
-                } 
-                else {
-                    my @log = <LOG>;
-                    print STDERR @log;
-                    close (LOG);
-                }
-                print STDERR "======= End Log File \n";
             }
         }
     }
diff --git a/tests/run_tests.bat b/tests/run_tests.bat
index e01efdbef6b..eddb884ec08 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -100,7 +100,7 @@ call %run_cmd% %dopure% %platform% CDR_File_Test
 call %run_cmd% %dopure% %platform% CDR_Array_Test
 call %run_cmd% %dopure% %platform% Collection_Test
 call %run_cmd% %dopure% %platform% Conn_Test
-call %run_cmd% %dopure% %platform% Dirent_Test
+call %run_cmd% 5dopure% %platform% Dirent_Test
 call %run_cmd% %dopure% %platform% DLL_Test
 call %run_cmd% %dopure% %platform% DLList_Test
 call %run_cmd% %dopure% %platform% Dynamic_Priority_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.pl b/tests/run_tests.pl
new file mode 100755
index 00000000000..69fc2df3e65
--- /dev/null
+++ b/tests/run_tests.pl
@@ -0,0 +1,193 @@
+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;
+
+use English;
+
+$tmp="/tmp";
+$compilation_log="log/compilations.log";
+
+$ACE_ROOT = $ENV{'ACE_ROOT'}  ||  '..';
+$LD_VAR = 'LD_LIBRARY_PATH';
+
+if ($OSNAME eq "HP-UX") {
+  $LD_VAR = 'SHLIB_PATH';
+} elsif ($OSNAME eq 'AIX') {
+  $LD_VAR = 'LIBPATH';
+}
+
+local $path = $ENV{$LD_VAR};
+if ($path eq '') {
+  $path = '/usr/lib';
+}
+$ENV{$LD_VAR} = $ACE_ROOT."/ace:".$path;
+
+####
+#### Run each process
+####
+sub run
+{
+  local $program = shift;
+
+  unlink "core";
+  local $log = "log/".$program.".log";
+  unlink $log;
+
+  local $remove_exe_after_test = 0;
+  if ( ! -x $program) {
+    print STDERR "Making $program . . .\n";
+    $remove_exe_after_test = 1;
+    system ("make BIN=$program >>$compilation_log 2>&1");
+  }
+
+  print STDERR "Running $program\n";
+  $P = Process::Create ($EXEPREFIX.$program.$EXE_EXT, "");
+  $status = $P->TimedWait (300);
+
+  if ($status == -1) {
+    print STDERR "$program FAILED (time out)\n";
+    $P->Kill (); $P->TimedWait (1);
+  } elsif ($status != 0) {
+    print STDERR "$program FAILED with exit status $status!!!!\n";
+  }
+
+  if ( -e "core" ) {
+    print STDERR "$program dumped core!!!!\n";
+  }
+  if ( ! -e $log ) {
+    print STDERR "No log file (log/$program.log) is present\n";
+  } else {
+    if (open (LOG, "<". $log) == 0) {
+      print STDERR "Cannot open log file $log\n";
+    } else {
+      $starting_matched = 0;
+      $ending_matched = 0;
+      $bad_matched = 0;
+      while (<LOG>) {
+        chop;
+        if (m/Starting/) {
+          $starting_matched = 1;
+        }
+        if (m/Ending/) {
+          $ending_matched = 1;
+        }
+        if (m/assertion failed|timeout|Bad file number/) {
+          $bad_matched = 1;
+        }
+        # On Linux the /etc/hosts files contains IPV6 addresses that
+        # tend to confuse the heck out of this test
+        if (($program ne "SOCK_Connector_Test"
+             || $^O ne "linux")
+            && m/Invalid argument/) {
+          $bad_matched = 1;
+        }
+        if ($program ne "Cached_Accept_Conn_Test"
+            && m/No such file or directory/) {
+          $bad_matched = 1;
+        }
+        if (m/not supported/) {
+          print STDERR $_, "\n";
+        }
+      }
+      if ($starting_matched == 0) {
+        print STDERR "Error in $program log: no line with 'starting'\n";
+      }
+      if ($ending_matched == 0) {
+        print STDERR "Error in $program log: no line with 'Ending'\n";
+      }
+      if ($bad_matched == 1) {
+        print STDERR "Error in $program log: unexpected output\n";
+      }
+      close (LOG); # ignore errors
+    }
+  }
+
+  if ($remove_exe_after_test == 1) {
+    unlink $program;
+  }
+}
+
+$ACE_BUILD_COMPONENTS=`$ACE_ROOT/bin/ace_components --ace`;
+$OTHER = 1;
+if (grep {/ Other /} $ACE_BUILD_COMPONENTS) {
+  $OTHER = 0;
+}
+$TOKEN = 1;
+if (grep {/ Token /} $ACE_BUILD_COMPONENTS) {
+  $TOKEN = 0;
+}
+$netsvcs_main = 1;
+if (-f "../netsvcs/servers/main" ) {
+  $netsvcs_main = 0;
+}
+$libDLL_Test = 1;
+if (-f "libDLL_Test.so" ) {
+  $libDLL_Test = 0;
+}
+
+# Testing for this flag always disables the test.
+$DISABLED = 1;
+
+# @@ Can we obtain reasonable values for this features?
+$chorus = 0;
+$LynxOS = 0;
+$Unicos = 0;
+
+if ($chorus eq "" || $chorus == 0) {
+  if (!defined $ENV{'LOGNAME'}) {
+    $user=`whoami`;
+  } else {
+    $user = $ENV{'LOGNAME'};
+  }
+  $start_test_resources=`ipcs | egrep $user`;
+}
+
+$ace_version=`head -1 ../VERSION | sed -e 's/.*version \\([0-9.]*\\).*\$/\\1/'`;
+chop $ace_version;
+
+print STDERR "Starting ACE version $ace_version tests . . .\n";
+open (LIST, '<run_tests.lst')
+  || die "Can't read program list\n";
+PROGRAM: while (<LIST>) {
+  chop;
+  local @fields = split (/\//, $_);
+  local $program = $fields[$#fields];
+
+
+  for ($i = 0; $i < $#fields; $i++) {
+    $var = $fields[$i];
+####    print "var = $var -> $program\n";
+    local $e = $$var;
+    if ($e == 1) {
+      print STDERR "Skipping $program on this platform\n"
+        unless $var = 'DISABLED';
+      next PROGRAM;
+    }
+  }
+  run $program;
+}
+close (LIST)
+  || die "Can't close program list\n";
+print STDERR "Finished ACE version $ace_version tests.\n";
+
+unlink "ace_pipe_name";
+unlink "pattern";
+unlink "$tmp/ace_temp_file";
+# unlink "$tmp/ace_temp_file*"; # How to make this work?
+# unlink "$tmp/Naming_Test*";
+
+if ($chorus eq "" || $chorus == 0) {
+  $end_test_resources=`ipcs | egrep $user`;
+  if ("$start_test_resources" ne "$end_test_resources") {
+    print STDERR "WARNING: the ACE tests _may_ have leaked OS resources!\n";
+    print STDERR "$end_test_resources";
+  }
+}
+
+exit 0;
diff --git a/tests/tests.dsw b/tests/tests.dsw
index f85602b41b8..cb29d6798e6 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "ACE_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>

+Project: "ACE_Init_Test"=".\ACE_Init_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>

+Project: "Atomic_Op_Test"=".\Atomic_Op_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -27,7 +27,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Auto_IncDec_Test"=.\Auto_IncDec_Test.dsp - Package Owner=<4>

+Project: "Auto_IncDec_Test"=".\Auto_IncDec_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -39,7 +39,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Barrier_Test"=.\Barrier_Test.dsp - Package Owner=<4>

+Project: "Barrier_Test"=".\Barrier_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -51,7 +51,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Basic_Types_Test"=.\Basic_Types_Test.dsp - Package Owner=<4>

+Project: "Basic_Types_Test"=".\Basic_Types_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -63,7 +63,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Buffer_Stream_Test"=.\Buffer_Stream_Test.dsp - Package Owner=<4>

+Project: "Buffer_Stream_Test"=".\Buffer_Stream_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -75,7 +75,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_Array_Test"=.\CDR_Array_Test.dsp - Package Owner=<4>

+Project: "CDR_Array_Test"=".\CDR_Array_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -87,7 +87,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_File_Test"=.\CDR_File_Test.dsp - Package Owner=<4>

+Project: "CDR_File_Test"=".\CDR_File_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -99,7 +99,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

+Project: "CDR_Test"=".\CDR_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -111,7 +111,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cache_Map_Manager_Test"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Cache_Map_Manager_Test"=".\Cache_Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -123,7 +123,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cached_Accept_Conn_Test"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

+Project: "Cached_Accept_Conn_Test"=".\Cached_Accept_Conn_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -135,7 +135,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Cached_Conn_Test"=.\Cached_Conn_Test.dsp - Package Owner=<4>

+Project: "Cached_Conn_Test"=".\Cached_Conn_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -147,7 +147,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Capabilities_Test"=.\Capabilities_Test.dsp - Package Owner=<4>

+Project: "Capabilities_Test"=".\Capabilities_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -159,7 +159,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>

+Project: "Collection_Test"=".\Collection_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -171,7 +171,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Config_Test"=.\Config_Test.dsp - Package Owner=<4>

+Project: "Config_Test"=".\Config_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -183,7 +183,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>

+Project: "Conn_Test"=".\Conn_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -195,7 +195,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>

+Project: "DLL_Test"=".\DLL_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -207,7 +207,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLL_Test_Impl"=.\DLL_Test_Impl.dsp - Package Owner=<4>

+Project: "DLList_Test"=".\DLList_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -219,7 +219,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLList_Test"=.\DLList_Test.dsp - Package Owner=<4>

+Project: "Dirent_Test"=".\Dirent_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -231,7 +231,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Dirent_Test"=.\Dirent_Test.dsp - Package Owner=<4>

+Project: "Dynamic_Priority_Test"=".\Dynamic_Priority_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -243,7 +243,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Dynamic_Priority_Test"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>

+Project: "Enum_Interfaces_Test"=".\Enum_Interfaces_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -255,7 +255,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Enum_Interfaces_Test"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>

+Project: "Env_Value_Test"=".\Env_Value_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -267,7 +267,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Env_Value_Test"=.\Env_Value_Test.dsp - Package Owner=<4>

+Project: "Future_Set_Test"=".\Future_Set_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -279,7 +279,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Future_Set_Test"=.\Future_Set_Test.dsp - Package Owner=<4>

+Project: "Future_Test"=".\Future_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -291,7 +291,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Future_Test"=.\Future_Test.dsp - Package Owner=<4>

+Project: "Handle_Set_Test"=".\Handle_Set_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -303,7 +303,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Handle_Set_Test"=.\Handle_Set_Test.dsp - Package Owner=<4>

+Project: "Hash_Map_Bucket_Iterator_Test"=".\Hash_Map_Bucket_Iterator_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -315,7 +315,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Bucket_Iterator_Test"=.\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>

+Project: "Hash_Map_Manager_Test"=".\Hash_Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -327,7 +327,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Hash_Map_Manager_Test"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "High_Res_Timer_Test"=".\High_Res_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -339,7 +339,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "High_Res_Timer_Test"=.\High_Res_Timer_Test.dsp - Package Owner=<4>

+Project: "IOStream_Test"=".\IOStream_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -351,7 +351,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "IOStream_Test"=.\IOStream_Test.dsp - Package Owner=<4>

+Project: "Lazy_Map_Manager_Test"=".\Lazy_Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -363,7 +363,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Lazy_Map_Manager_Test"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Log_Msg_Test"=".\Log_Msg_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -375,7 +375,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Log_Msg_Test"=.\Log_Msg_Test.dsp - Package Owner=<4>

+Project: "MEM_Stream_Test"=".\MEM_Stream_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -387,7 +387,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MEM_Stream_Test"=.\MEM_Stream_Test.dsp - Package Owner=<4>

+Project: "MM_Shared_Memory_Test"=".\MM_Shared_Memory_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -399,7 +399,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MM_Shared_Memory_Test"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>

+Project: "MT_Reactor_Timer_Test"=".\MT_Reactor_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -411,7 +411,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_Reactor_Timer_Test"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>

+Project: "MT_SOCK_Test"=".\MT_SOCK_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -423,7 +423,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "MT_SOCK_Test"=.\MT_SOCK_Test.dsp - Package Owner=<4>

+Project: "Malloc_Test"=".\Malloc_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -435,7 +435,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Malloc_Test"=.\Malloc_Test.dsp - Package Owner=<4>

+Project: "Map_Manager_Test"=".\Map_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -447,7 +447,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Map_Manager_Test"=.\Map_Manager_Test.dsp - Package Owner=<4>

+Project: "Map_Test"=".\Map_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -459,7 +459,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Map_Test"=.\Map_Test.dsp - Package Owner=<4>

+Project: "Mem_Map_Test"=".\Mem_Map_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -471,7 +471,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>

+Project: "Message_Block_Test"=".\Message_Block_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -483,7 +483,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Block_Test"=.\Message_Block_Test.dsp - Package Owner=<4>

+Project: "Message_Queue_Notifications_Test"=".\Message_Queue_Notifications_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -495,7 +495,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

+Project: "Message_Queue_Test"=".\Message_Queue_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -507,7 +507,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Test"=.\Message_Queue_Test.dsp - Package Owner=<4>

+Project: "Message_Queue_Test_Ex"=".\Message_Queue_Test_Ex.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -519,7 +519,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Test_Ex"=.\Message_Queue_Test_Ex.dsp - Package Owner=<4>

+Project: "Naming_Test"=".\Naming_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -531,7 +531,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Naming_Test"=.\Naming_Test.dsp - Package Owner=<4>

+Project: "New_Fail_Test"=".\New_Fail_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -543,7 +543,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>

+Project: "Notify_Performance_Test"=".\Notify_Performance_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -555,7 +555,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>

+Project: "OS_Test"=".\OS_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -567,7 +567,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "OS_Test"=.\OS_Test.dsp - Package Owner=<4>

+Project: "Object_Manager_Test"=".\Object_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -579,7 +579,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Object_Manager_Test"=.\Object_Manager_Test.dsp - Package Owner=<4>

+Project: "OrdMultiSet_Test"=".\OrdMultiSet_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -591,7 +591,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "OrdMultiSet_Test"=.\OrdMultiSet_Test.dsp - Package Owner=<4>

+Project: "Pipe_Test"=".\Pipe_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -603,7 +603,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Pipe_Test"=.\Pipe_Test.dsp - Package Owner=<4>

+Project: "Priority_Buffer_Test"=".\Priority_Buffer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -615,7 +615,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Buffer_Test"=.\Priority_Buffer_Test.dsp - Package Owner=<4>

+Project: "Priority_Reactor_Test"=".\Priority_Reactor_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -627,7 +627,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Reactor_Test"=.\Priority_Reactor_Test.dsp - Package Owner=<4>

+Project: "Priority_Task_Test"=".\Priority_Task_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -639,7 +639,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Priority_Task_Test"=.\Priority_Task_Test.dsp - Package Owner=<4>

+Project: "Process_Manager_Test"=".\Process_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -651,7 +651,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Process_Manager_Test"=.\Process_Manager_Test.dsp - Package Owner=<4>

+Project: "Process_Mutex_Test"=".\Process_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -663,7 +663,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Process_Mutex_Test"=.\Process_Mutex_Test.dsp - Package Owner=<4>

+Project: "Process_Strategy_Test"=".\Process_Strategy_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -675,7 +675,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Process_Strategy_Test"=.\Process_Strategy_Test.dsp - Package Owner=<4>

+Project: "RB_Tree_Test"=".\RB_Tree_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -687,7 +687,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "RB_Tree_Test"=.\RB_Tree_Test.dsp - Package Owner=<4>

+Project: "Reactor_Exceptions_Test"=".\Reactor_Exceptions_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -699,7 +699,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Exceptions_Test"=.\Reactor_Exceptions_Test.dsp - Package Owner=<4>

+Project: "Reactor_Notify_Test"=".\Reactor_Notify_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -711,7 +711,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Notify_Test"=.\Reactor_Notify_Test.dsp - Package Owner=<4>

+Project: "Reactor_Performance_Test"=".\Reactor_Performance_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -723,7 +723,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Performance_Test"=.\Reactor_Performance_Test.dsp - Package Owner=<4>

+Project: "Reactor_Timer_Test"=".\Reactor_Timer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -735,7 +735,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactor_Timer_Test"=.\Reactor_Timer_Test.dsp - Package Owner=<4>

+Project: "Reactors_Test"=".\Reactors_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -747,7 +747,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reactors_Test"=.\Reactors_Test.dsp - Package Owner=<4>

+Project: "Reader_Writer_Test"=".\Reader_Writer_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -759,7 +759,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reader_Writer_Test"=.\Reader_Writer_Test.dsp - Package Owner=<4>

+Project: "Recursive_Mutex_Test"=".\Recursive_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -771,7 +771,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Recursive_Mutex_Test"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>

+Project: "Refcounted_Auto_Ptr_Test"=".\Refcounted_Auto_Ptr_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -783,7 +783,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Refcounted_Auto_Ptr_Test"=.\Refcounted_Auto_Ptr_Test.dsp - Package Owner=<4>

+Project: "Reverse_Lock_Test"=".\Reverse_Lock_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -795,7 +795,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>

+Project: "SOCK_Connector_Test"=".\SOCK_Connector_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -807,7 +807,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>

+Project: "SOCK_Send_Recv_Test"=".\SOCK_Send_Recv_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -819,7 +819,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Send_Recv_Test"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>

+Project: "SOCK_Test"=".\SOCK_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -831,7 +831,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SOCK_Test"=.\SOCK_Test.dsp - Package Owner=<4>

+Project: "SPIPE_Test"=".\SPIPE_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -843,7 +843,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SPIPE_Test"=.\SPIPE_Test.dsp - Package Owner=<4>

+Project: "SString_Test"=".\SString_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -855,7 +855,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SString_Test"=.\SString_Test.dsp - Package Owner=<4>

+Project: "SV_Shared_Memory_Test"=".\SV_Shared_Memory_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -867,7 +867,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "SV_Shared_Memory_Test"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>

+Project: "Semaphore_Test"=".\Semaphore_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -879,7 +879,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Semaphore_Test"=.\Semaphore_Test.dsp - Package Owner=<4>

+Project: "Service_Config_Test"=".\Service_Config_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -891,7 +891,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Service_Config_Test"=.\Service_Config_Test.dsp - Package Owner=<4>

+Project: "Sigset_Ops_Test"=".\Sigset_Ops_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -903,7 +903,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Sigset_Ops_Test"=.\Sigset_Ops_Test.dsp - Package Owner=<4>

+Project: "Simple_Message_Block_Test"=".\Simple_Message_Block_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -915,7 +915,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Simple_Message_Block_Test"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>

+Project: "Svc_Handler_Test"=".\Svc_Handler_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -927,7 +927,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Svc_Handler_Test"=.\Svc_Handler_Test.dsp - Package Owner=<4>

+Project: "TSS_Test"=".\TSS_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -939,7 +939,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "TSS_Test"=.\TSS_Test.dsp - Package Owner=<4>

+Project: "Task_Test"=".\Task_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -951,7 +951,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Task_Test"=.\Task_Test.dsp - Package Owner=<4>

+Project: "Thread_Manager_Test"=".\Thread_Manager_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -963,7 +963,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Manager_Test"=.\Thread_Manager_Test.dsp - Package Owner=<4>

+Project: "Thread_Mutex_Test"=".\Thread_Mutex_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -975,7 +975,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Mutex_Test"=.\Thread_Mutex_Test.dsp - Package Owner=<4>

+Project: "Thread_Pool_Reactor_Test"=".\Thread_Pool_Reactor_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -987,7 +987,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Pool_Reactor_Test"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>

+Project: "Thread_Pool_Test"=".\Thread_Pool_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -999,7 +999,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Thread_Pool_Test"=.\Thread_Pool_Test.dsp - Package Owner=<4>

+Project: "Time_Service_Test"=".\Time_Service_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1011,7 +1011,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Time_Service_Test"=.\Time_Service_Test.dsp - Package Owner=<4>

+Project: "Time_Value_Test"=".\Time_Value_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1023,7 +1023,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Time_Value_Test"=.\Time_Value_Test.dsp - Package Owner=<4>

+Project: "Timeprobe_Test"=".\Timeprobe_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1035,7 +1035,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Timeprobe_Test"=.\Timeprobe_Test.dsp - Package Owner=<4>

+Project: "Timer_Queue_Test"=".\Timer_Queue_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1047,7 +1047,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Timer_Queue_Test"=.\Timer_Queue_Test.dsp - Package Owner=<4>

+Project: "Tokens_Test"=".\Tokens_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1059,7 +1059,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Tokens_Test"=.\Tokens_Test.dsp - Package Owner=<4>

+Project: "UPIPE_SAP_Test"=".\UPIPE_SAP_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -1071,19 +1071,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "UPIPE_SAP_Test"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Upgradable_RW_Test"=.\Upgradable_RW_Test.dsp - Package Owner=<4>

+Project: "Upgradable_RW_Test"=".\Upgradable_RW_Test.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/tests/version_tests/Atomic_Op_Test.dsp b/tests/version_tests/Atomic_Op_Test.dsp
new file mode 100644
index 00000000000..b82668cf35a
--- /dev/null
+++ b/tests/version_tests/Atomic_Op_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Atomic_Op_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Atomic_Op_Test - Win32 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 "Atomic_Op_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 "Atomic_Op_Test.mak" CFG="Atomic_Op_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Atomic_Op_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Atomic_Op_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Atomic_Op_Test - Win32 Release" (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)" == "Atomic_Op_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Atomic_Op_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\Static Debug"

+# PROP BASE Target_Dir ".\Atomic_Op_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Atomic_Op_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Atomic_Op_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\Static Release"

+# PROP BASE Target_Dir ".\Atomic_Op_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Atomic_Op_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Atomic_Op_Test\Release"

+# PROP BASE Intermediate_Dir ".\Atomic_Op_Test\Release"

+# PROP BASE Target_Dir ".\Atomic_Op_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Atomic_Op_Test - Win32 Static Debug"

+# Name "Atomic_Op_Test - Win32 Static Release"

+# Name "Atomic_Op_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=..\Atomic_Op_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Auto_IncDec_Test.dsp b/tests/version_tests/Auto_IncDec_Test.dsp
new file mode 100644
index 00000000000..35c48638513
--- /dev/null
+++ b/tests/version_tests/Auto_IncDec_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Auto_IncDec_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Auto_IncDec_Test - Win32 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 "Auto_IncDec_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 "Auto_IncDec_Test.mak" CFG="Auto_IncDec_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Auto_IncDec_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Auto_IncDec_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Auto_IncDec_Test - Win32 Release" (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)" == "Auto_IncDec_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Auto_IncDec_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\Static Debug"

+# PROP BASE Target_Dir ".\Auto_IncDec_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Auto_IncDec_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Auto_IncDec_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Auto_IncDec_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\Static Release"

+# PROP BASE Target_Dir ".\Auto_IncDec_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Auto_IncDec_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Auto_IncDec_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Auto_IncDec_Test\Release"

+# PROP BASE Intermediate_Dir ".\Auto_IncDec_Test\Release"

+# PROP BASE Target_Dir ".\Auto_IncDec_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 ".\Auto_IncDec_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Auto_IncDec_Test - Win32 Static Debug"

+# Name "Auto_IncDec_Test - Win32 Static Release"

+# Name "Auto_IncDec_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=..\Auto_IncDec_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Barrier_Test.dsp b/tests/version_tests/Barrier_Test.dsp
new file mode 100644
index 00000000000..1ed6a086110
--- /dev/null
+++ b/tests/version_tests/Barrier_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Barrier_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Barrier_Test - Win32 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 "Barrier_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 "Barrier_Test.mak" CFG="Barrier_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Barrier_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Barrier_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Barrier_Test - Win32 Release" (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)" == "Barrier_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Barrier_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Barrier_Test\Static Debug"

+# PROP BASE Target_Dir ".\Barrier_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Barrier_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Barrier_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Barrier_Test\Static Release"

+# PROP BASE Target_Dir ".\Barrier_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Barrier_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Barrier_Test\Release"

+# PROP BASE Intermediate_Dir ".\Barrier_Test\Release"

+# PROP BASE Target_Dir ".\Barrier_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Barrier_Test - Win32 Static Debug"

+# Name "Barrier_Test - Win32 Static Release"

+# Name "Barrier_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Barrier_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/Basic_Types_Test.dsp b/tests/version_tests/Basic_Types_Test.dsp
new file mode 100644
index 00000000000..78ae5323681
--- /dev/null
+++ b/tests/version_tests/Basic_Types_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Basic_Types_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Basic_Types_Test - Win32 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 "Basic_Types_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 "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Basic_Types_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Basic_Types_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Basic_Types_Test - Win32 Release" (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)" == "Basic_Types_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Basic_Types_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Static Debug"

+# PROP BASE Target_Dir ".\Basic_Types_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Basic_Types_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Basic_Types_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Basic_Types_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Static Release"

+# PROP BASE Target_Dir ".\Basic_Types_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Basic_Types_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Basic_Types_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Basic_Types_Test\Release"

+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Release"

+# PROP BASE Target_Dir ".\Basic_Types_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 ".\Basic_Types_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Basic_Types_Test - Win32 Static Debug"

+# Name "Basic_Types_Test - Win32 Static Release"

+# Name "Basic_Types_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Basic_Types_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/Buffer_Stream_Test.dsp b/tests/version_tests/Buffer_Stream_Test.dsp
new file mode 100644
index 00000000000..72b9e969a83
--- /dev/null
+++ b/tests/version_tests/Buffer_Stream_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Buffer_Stream_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Buffer_Stream_Test - Win32 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 "Buffer_Stream_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 "Buffer_Stream_Test.mak" CFG="Buffer_Stream_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Buffer_Stream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Buffer_Stream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Buffer_Stream_Test - Win32 Release" (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)" == "Buffer_Stream_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Buffer_Stream_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\Static Debug"

+# PROP BASE Target_Dir ".\Buffer_Stream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Buffer_Stream_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Buffer_Stream_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\Static Release"

+# PROP BASE Target_Dir ".\Buffer_Stream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Buffer_Stream_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Buffer_Stream_Test\Release"

+# PROP BASE Intermediate_Dir ".\Buffer_Stream_Test\Release"

+# PROP BASE Target_Dir ".\Buffer_Stream_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Buffer_Stream_Test - Win32 Static Debug"

+# Name "Buffer_Stream_Test - Win32 Static Release"

+# Name "Buffer_Stream_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Buffer_Stream_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/CDR_Array_Test.dsp b/tests/version_tests/CDR_Array_Test.dsp
new file mode 100644
index 00000000000..fb8933b1841
--- /dev/null
+++ b/tests/version_tests/CDR_Array_Test.dsp
@@ -0,0 +1,123 @@
+# Microsoft Developer Studio Project File - Name="CDR_Array_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=CDR_Array_Test - Win32 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 "CDR_Array_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 "CDR_Array_Test.mak" CFG="CDR_Array_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "CDR_Array_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_Array_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_Array_Test - Win32 Release" (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)" == "CDR_Array_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\CDR_Array_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\CDR_Array_Test\Static Debug"

+# PROP BASE Target_Dir ".\CDR_Array_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\CDR_Array_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "CDR_Array_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\CDR_Array_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\CDR_Array_Test\Static Release"

+# PROP BASE Target_Dir ".\CDR_Array_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\CDR_Array_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "CDR_Array_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\CDR_Array_Test\Release"

+# PROP BASE Intermediate_Dir ".\CDR_Array_Test\Release"

+# PROP BASE Target_Dir ".\CDR_Array_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 ".\CDR_Array_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "CDR_Array_Test - Win32 Static Debug"

+# Name "CDR_Array_Test - Win32 Static Release"

+# Name "CDR_Array_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\CDR_Array_Test.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/CDR_File_Test.dsp b/tests/version_tests/CDR_File_Test.dsp
new file mode 100644
index 00000000000..147057a4ef4
--- /dev/null
+++ b/tests/version_tests/CDR_File_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="CDR_File_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=CDR_File_Test - Win32 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 "CDR_File_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 "CDR_File_Test.mak" CFG="CDR_File_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "CDR_File_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_File_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_File_Test - Win32 Release" (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)" == "CDR_File_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\CDR_File_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\CDR_File_Test\Static Debug"

+# PROP BASE Target_Dir ".\CDR_File_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\CDR_File_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "CDR_File_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\CDR_File_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\CDR_File_Test\Static Release"

+# PROP BASE Target_Dir ".\CDR_File_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\CDR_File_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "CDR_File_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\CDR_File_Test\Release"

+# PROP BASE Intermediate_Dir ".\CDR_File_Test\Release"

+# PROP BASE Target_Dir ".\CDR_File_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 ".\CDR_File_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "CDR_File_Test - Win32 Static Debug"

+# Name "CDR_File_Test - Win32 Static Release"

+# Name "CDR_File_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\CDR_File_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/CDR_Test.dsp b/tests/version_tests/CDR_Test.dsp
new file mode 100644
index 00000000000..ce5fc9a7fcc
--- /dev/null
+++ b/tests/version_tests/CDR_Test.dsp
@@ -0,0 +1,123 @@
+# Microsoft Developer Studio Project File - Name="CDR_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=CDR_Test - Win32 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 "CDR_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 "CDR_Test.mak" CFG="CDR_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "CDR_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "CDR_Test - Win32 Release" (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)" == "CDR_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\CDR_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\CDR_Test\Static Debug"

+# PROP BASE Target_Dir ".\CDR_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "CDR_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\CDR_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\CDR_Test\Static Release"

+# PROP BASE Target_Dir ".\CDR_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "CDR_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\CDR_Test\Release"

+# PROP BASE Intermediate_Dir ".\CDR_Test\Release"

+# PROP BASE Target_Dir ".\CDR_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "CDR_Test - Win32 Static Debug"

+# Name "CDR_Test - Win32 Static Release"

+# Name "CDR_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\CDR_Test.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Cache_Map_Manager_Test.dsp b/tests/version_tests/Cache_Map_Manager_Test.dsp
new file mode 100644
index 00000000000..2262dbd730a
--- /dev/null
+++ b/tests/version_tests/Cache_Map_Manager_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Cache_Map_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Cache_Map_Manager_Test - Win32 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 "Cache_Map_Manager_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 "Cache_Map_Manager_Test.mak" CFG="Cache_Map_Manager_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Cache_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cache_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cache_Map_Manager_Test - Win32 Release" (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)" == "Cache_Map_Manager_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\Static Debug"

+# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Cache_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_AS_STATIC_LIBS /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)" == "Cache_Map_Manager_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\Static Release"

+# PROP BASE Target_Dir ".\Cache_Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Cache_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_AS_STATIC_LIBS /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)" == "Cache_Map_Manager_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Cache_Map_Manager_Test\Release"

+# PROP BASE Intermediate_Dir ".\Cache_Map_Manager_Test\Release"

+# PROP BASE Target_Dir ".\Cache_Map_Manager_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 ".\Cache_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Cache_Map_Manager_Test - Win32 Static Debug"

+# Name "Cache_Map_Manager_Test - Win32 Static Release"

+# Name "Cache_Map_Manager_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=..\Cache_Map_Manager_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Cached_Accept_Conn_Test.dsp b/tests/version_tests/Cached_Accept_Conn_Test.dsp
new file mode 100644
index 00000000000..d8ae98cb512
--- /dev/null
+++ b/tests/version_tests/Cached_Accept_Conn_Test.dsp
@@ -0,0 +1,139 @@
+# Microsoft Developer Studio Project File - Name="Cached_Accept_Conn_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Cached_Accept_Conn_Test - Win32 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 "Cached_Accept_Conn_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Cached_Accept_Conn_Test.mak" CFG="Cached_Accept_Conn_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Cached_Accept_Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cached_Accept_Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cached_Accept_Conn_Test - Win32 Release" (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)" == "Cached_Accept_Conn_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Static Debug"

+# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Cached_Accept_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_AS_STATIC_LIBS /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)" == "Cached_Accept_Conn_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Static Release"

+# PROP BASE Target_Dir ".\Cached_Accept_Conn_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Cached_Accept_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_AS_STATIC_LIBS /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)" == "Cached_Accept_Conn_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Cached_Accept_Conn_Test\Release"

+# PROP BASE Intermediate_Dir ".\Cached_Accept_Conn_Test\Release"

+# PROP BASE Target_Dir ".\Cached_Accept_Conn_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 ".\Cached_Accept_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Cached_Accept_Conn_Test - Win32 Static Debug"

+# Name "Cached_Accept_Conn_Test - Win32 Static Release"

+# Name "Cached_Accept_Conn_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Cached_Accept_Conn_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# Begin Source File

+

+SOURCE=..\Cached_Accept_Conn_Test.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Cached_Conn_Test.dsp b/tests/version_tests/Cached_Conn_Test.dsp
new file mode 100644
index 00000000000..c4b71cacd49
--- /dev/null
+++ b/tests/version_tests/Cached_Conn_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Cached_Conn_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Cached_Conn_Test - Win32 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 "Cached_Conn_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Cached_Conn_Test.mak" CFG="Cached_Conn_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Cached_Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cached_Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Cached_Conn_Test - Win32 Release" (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)" == "Cached_Conn_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Cached_Conn_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\Static Debug"

+# PROP BASE Target_Dir ".\Cached_Conn_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Cached_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_AS_STATIC_LIBS /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)" == "Cached_Conn_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Cached_Conn_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\Static Release"

+# PROP BASE Target_Dir ".\Cached_Conn_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Cached_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_AS_STATIC_LIBS /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)" == "Cached_Conn_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Cached_Conn_Test\Release"

+# PROP BASE Intermediate_Dir ".\Cached_Conn_Test\Release"

+# PROP BASE Target_Dir ".\Cached_Conn_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 ".\Cached_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Cached_Conn_Test - Win32 Static Debug"

+# Name "Cached_Conn_Test - Win32 Static Release"

+# Name "Cached_Conn_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=..\Cached_Conn_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Capabilities_Test.dsp b/tests/version_tests/Capabilities_Test.dsp
new file mode 100644
index 00000000000..931f9aa1157
--- /dev/null
+++ b/tests/version_tests/Capabilities_Test.dsp
@@ -0,0 +1,139 @@
+# Microsoft Developer Studio Project File - Name="Capabilities_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Capabilities_Test - Win32 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 "Capabilities_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 "Capabilities_Test.mak" CFG="Capabilities_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Capabilities_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Capabilities_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Capabilities_Test - Win32 Release" (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)" == "Capabilities_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Capabilities_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Capabilities_Test\Static Debug"

+# PROP BASE Target_Dir ".\Capabilities_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Capabilities_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Capabilities_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Capabilities_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Capabilities_Test\Static Release"

+# PROP BASE Target_Dir ".\Capabilities_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Capabilities_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Capabilities_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Capabilities_Test\Release"

+# PROP BASE Intermediate_Dir ".\Capabilities_Test\Release"

+# PROP BASE Target_Dir ".\Capabilities_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 ".\Capabilities_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Capabilities_Test - Win32 Static Debug"

+# Name "Capabilities_Test - Win32 Static Release"

+# Name "Capabilities_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Capabilities_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=..\Capabilities_Test.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Collection_Test.dsp b/tests/version_tests/Collection_Test.dsp
new file mode 100644
index 00000000000..84caebfd6d0
--- /dev/null
+++ b/tests/version_tests/Collection_Test.dsp
@@ -0,0 +1,135 @@
+# 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 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 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Collection_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Collection_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Collection_Test - Win32 Release" (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 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 ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 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 ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Collection_Test\Release"

+# PROP BASE Intermediate_Dir ".\Collection_Test\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Collection_Test - Win32 Static Debug"

+# Name "Collection_Test - Win32 Static Release"

+# Name "Collection_Test - Win32 Release"

+# 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
new file mode 100644
index 00000000000..b95b71f9df9
--- /dev/null
+++ b/tests/version_tests/Conn_Test.dsp
@@ -0,0 +1,139 @@
+# Microsoft Developer Studio Project File - Name="Conn_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Conn_Test - Win32 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 "Conn_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Conn_Test.mak" CFG="Conn_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Conn_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Conn_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Conn_Test - Win32 Release" (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)" == "Conn_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Conn_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Conn_Test\Static Debug"

+# PROP BASE Target_Dir ".\Conn_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Conn_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Conn_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Conn_Test\Static Release"

+# PROP BASE Target_Dir ".\Conn_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Conn_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Conn_Test\Release"

+# PROP BASE Intermediate_Dir ".\Conn_Test\Release"

+# PROP BASE Target_Dir ".\Conn_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Conn_Test - Win32 Static Debug"

+# Name "Conn_Test - Win32 Static Release"

+# Name "Conn_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Conn_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=..\Conn_Test.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/DLL_Test.dsp b/tests/version_tests/DLL_Test.dsp
new file mode 100644
index 00000000000..d1630ae072e
--- /dev/null
+++ b/tests/version_tests/DLL_Test.dsp
@@ -0,0 +1,135 @@
+# 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 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 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "DLL_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLL_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLL_Test - Win32 Release" (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 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 ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 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 ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\DLL_Test\Release"

+# PROP BASE Intermediate_Dir ".\DLL_Test\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "DLL_Test - Win32 Static Debug"

+# Name "DLL_Test - Win32 Static Release"

+# Name "DLL_Test - Win32 Release"

+# 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
new file mode 100644
index 00000000000..9c374354151
--- /dev/null
+++ b/tests/version_tests/DLList_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="DLList_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=DLList_Test - Win32 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 "DLList_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 "DLList_Test.mak" CFG="DLList_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "DLList_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLList_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLList_Test - Win32 Release" (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)" == "DLList_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\DLList_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\DLList_Test\Static Debug"

+# PROP BASE Target_Dir ".\DLList_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "DLList_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\DLList_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\DLList_Test\Static Release"

+# PROP BASE Target_Dir ".\DLList_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "DLList_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\DLList_Test\Release"

+# PROP BASE Intermediate_Dir ".\DLList_Test\Release"

+# PROP BASE Target_Dir ".\DLList_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "DLList_Test - Win32 Static Debug"

+# Name "DLList_Test - Win32 Static Release"

+# Name "DLList_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\DLList_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/Dirent_Test.dsp b/tests/version_tests/Dirent_Test.dsp
new file mode 100644
index 00000000000..8aa7f6e2abe
--- /dev/null
+++ b/tests/version_tests/Dirent_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Dirent_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Dirent_Test - Win32 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 "Dirent_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 "Dirent_Test.mak" CFG="Dirent_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Dirent_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Dirent_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Dirent_Test - Win32 Release" (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)" == "Dirent_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Dirent_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Dirent_Test\Static Debug"

+# PROP BASE Target_Dir ".\Dirent_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Dirent_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Dirent_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Dirent_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Dirent_Test\Static Release"

+# PROP BASE Target_Dir ".\Dirent_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Dirent_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Dirent_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Dirent_Test\Release"

+# PROP BASE Intermediate_Dir ".\Dirent_Test\Release"

+# PROP BASE Target_Dir ".\Dirent_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 ".\Dirent_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Dirent_Test - Win32 Static Debug"

+# Name "Dirent_Test - Win32 Static Release"

+# Name "Dirent_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=..\Dirent_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Dynamic_Priority_Test.dsp b/tests/version_tests/Dynamic_Priority_Test.dsp
new file mode 100644
index 00000000000..6bd94e8c7a1
--- /dev/null
+++ b/tests/version_tests/Dynamic_Priority_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Dynamic_Priority_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Dynamic_Priority_Test - Win32 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 "Dynamic_Priority_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 "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Dynamic_Priority_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Dynamic_Priority_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Dynamic_Priority_Test - Win32 Release" (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)" == "Dynamic_Priority_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Dynamic_Priority_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Static Debug"

+# PROP BASE Target_Dir ".\Dynamic_Priority_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Dynamic_Priority_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Dynamic_Priority_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Static Release"

+# PROP BASE Target_Dir ".\Dynamic_Priority_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Dynamic_Priority_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Dynamic_Priority_Test\Release"

+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Release"

+# PROP BASE Target_Dir ".\Dynamic_Priority_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Dynamic_Priority_Test - Win32 Static Debug"

+# Name "Dynamic_Priority_Test - Win32 Static Release"

+# Name "Dynamic_Priority_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Dynamic_Priority_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/Enum_Interfaces_Test.dsp b/tests/version_tests/Enum_Interfaces_Test.dsp
new file mode 100644
index 00000000000..b9a53639134
--- /dev/null
+++ b/tests/version_tests/Enum_Interfaces_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Enum_Interfaces_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Enum_Interfaces_Test - Win32 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 "Enum_Interfaces_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 "Enum_Interfaces_Test.mak" CFG="Enum_Interfaces_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Enum_Interfaces_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Enum_Interfaces_Test - Win32 Release" (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)" == "Enum_Interfaces_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Enum_Interfaces_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\Static Debug"

+# PROP BASE Target_Dir ".\Enum_Interfaces_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Enum_Interfaces_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Enum_Interfaces_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\Static Release"

+# PROP BASE Target_Dir ".\Enum_Interfaces_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Enum_Interfaces_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Enum_Interfaces_Test\Release"

+# PROP BASE Intermediate_Dir ".\Enum_Interfaces_Test\Release"

+# PROP BASE Target_Dir ".\Enum_Interfaces_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Enum_Interfaces_Test - Win32 Static Debug"

+# Name "Enum_Interfaces_Test - Win32 Static Release"

+# Name "Enum_Interfaces_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Enum_Interfaces_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/Env_Value_Test.dsp b/tests/version_tests/Env_Value_Test.dsp
new file mode 100644
index 00000000000..de07f0debbd
--- /dev/null
+++ b/tests/version_tests/Env_Value_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Env_Value_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Env_Value_Test - Win32 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 "Env_Value_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 "Env_Value_Test.mak" CFG="Env_Value_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Env_Value_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Env_Value_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Env_Value_Test - Win32 Release" (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)" == "Env_Value_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Env_Value_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Env_Value_Test\Static Debug"

+# PROP BASE Target_Dir ".\Env_Value_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Env_Value_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Env_Value_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Env_Value_Test\Static Release"

+# PROP BASE Target_Dir ".\Env_Value_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Env_Value_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Env_Value_Test\Release"

+# PROP BASE Intermediate_Dir ".\Env_Value_Test\Release"

+# PROP BASE Target_Dir ".\Env_Value_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Env_Value_Test - Win32 Static Debug"

+# Name "Env_Value_Test - Win32 Static Release"

+# Name "Env_Value_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Env_Value_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/Future_Set_Test.dsp b/tests/version_tests/Future_Set_Test.dsp
new file mode 100644
index 00000000000..458e053cfc7
--- /dev/null
+++ b/tests/version_tests/Future_Set_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Future_Set_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Future_Set_Test - Win32 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 "Future_Set_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 "Future_Set_Test.mak" CFG="Future_Set_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Future_Set_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Future_Set_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Future_Set_Test - Win32 Release" (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)" == "Future_Set_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Future_Set_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Future_Set_Test\Static Debug"

+# PROP BASE Target_Dir ".\Future_Set_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Future_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_AS_STATIC_LIBS /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)" == "Future_Set_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Future_Set_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Future_Set_Test\Static Release"

+# PROP BASE Target_Dir ".\Future_Set_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Future_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_AS_STATIC_LIBS /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)" == "Future_Set_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Future_Set_Test\Release"

+# PROP BASE Intermediate_Dir ".\Future_Set_Test\Release"

+# PROP BASE Target_Dir ".\Future_Set_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 ".\Future_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Future_Set_Test - Win32 Static Debug"

+# Name "Future_Set_Test - Win32 Static Release"

+# Name "Future_Set_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Future_Set_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/Future_Test.dsp b/tests/version_tests/Future_Test.dsp
new file mode 100644
index 00000000000..28d3dcde5a3
--- /dev/null
+++ b/tests/version_tests/Future_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Future_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Future_Test - Win32 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 "Future_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 "Future_Test.mak" CFG="Future_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Future_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Future_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Future_Test - Win32 Release" (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)" == "Future_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Future_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Future_Test\Static Debug"

+# PROP BASE Target_Dir ".\Future_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Future_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Future_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Future_Test\Static Release"

+# PROP BASE Target_Dir ".\Future_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Future_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Future_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Future_Test\Release"

+# PROP BASE Intermediate_Dir ".\Future_Test\Release"

+# PROP BASE Target_Dir ".\Future_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 ".\Future_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Future_Test - Win32 Static Debug"

+# Name "Future_Test - Win32 Static Release"

+# Name "Future_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Future_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/Handle_Set_Test.dsp b/tests/version_tests/Handle_Set_Test.dsp
new file mode 100644
index 00000000000..22cc38bf886
--- /dev/null
+++ b/tests/version_tests/Handle_Set_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Handle_Set_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Handle_Set_Test - Win32 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 "Handle_Set_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 "Handle_Set_Test.mak" CFG="Handle_Set_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Handle_Set_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Handle_Set_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Handle_Set_Test - Win32 Release" (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)" == "Handle_Set_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Handle_Set_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Handle_Set_Test\Static Debug"

+# PROP BASE Target_Dir ".\Handle_Set_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Handle_Set_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Handle_Set_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Handle_Set_Test\Static Release"

+# PROP BASE Target_Dir ".\Handle_Set_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Handle_Set_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Handle_Set_Test\Release"

+# PROP BASE Intermediate_Dir ".\Handle_Set_Test\Release"

+# PROP BASE Target_Dir ".\Handle_Set_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Handle_Set_Test - Win32 Static Debug"

+# Name "Handle_Set_Test - Win32 Static Release"

+# Name "Handle_Set_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Handle_Set_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/Hash_Map_Bucket_Iterator_Test.dsp b/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp
new file mode 100644
index 00000000000..f79780574d0
--- /dev/null
+++ b/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Hash_Map_Bucket_Iterator_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Hash_Map_Bucket_Iterator_Test - Win32 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 "Hash_Map_Bucket_Iterator_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Hash_Map_Bucket_Iterator_Test.mak" CFG="Hash_Map_Bucket_Iterator_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Bucket_Iterator_Test - Win32 Release" (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)" == "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Debug"

+# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Hash_Map_Bucket_Iterator_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\Static Release"

+# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Hash_Map_Bucket_Iterator_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Hash_Map_Bucket_Iterator_Test\Release"

+# PROP BASE Intermediate_Dir ".\Hash_Map_Bucket_Iterator_Test\Release"

+# PROP BASE Target_Dir ".\Hash_Map_Bucket_Iterator_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 ".\Hash_Map_Bucket_Iterator_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug"

+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Release"

+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Hash_Map_Bucket_Iterator_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Hash_Map_Manager_Test.dsp b/tests/version_tests/Hash_Map_Manager_Test.dsp
new file mode 100644
index 00000000000..2f23b25579d
--- /dev/null
+++ b/tests/version_tests/Hash_Map_Manager_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Hash_Map_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Hash_Map_Manager_Test - Win32 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 "Hash_Map_Manager_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Hash_Map_Manager_Test.mak" CFG="Hash_Map_Manager_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Hash_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Hash_Map_Manager_Test - Win32 Release" (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)" == "Hash_Map_Manager_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\Static Debug"

+# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Hash_Map_Manager_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\Static Release"

+# PROP BASE Target_Dir ".\Hash_Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Hash_Map_Manager_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Hash_Map_Manager_Test\Release"

+# PROP BASE Intermediate_Dir ".\Hash_Map_Manager_Test\Release"

+# PROP BASE Target_Dir ".\Hash_Map_Manager_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Hash_Map_Manager_Test - Win32 Static Debug"

+# Name "Hash_Map_Manager_Test - Win32 Static Release"

+# Name "Hash_Map_Manager_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Hash_Map_Manager_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/High_Res_Timer_Test.dsp b/tests/version_tests/High_Res_Timer_Test.dsp
new file mode 100644
index 00000000000..d917ea93caa
--- /dev/null
+++ b/tests/version_tests/High_Res_Timer_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="High_Res_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=High_Res_Timer_Test - Win32 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 "High_Res_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 "High_Res_Timer_Test.mak" CFG="High_Res_Timer_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "High_Res_Timer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "High_Res_Timer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "High_Res_Timer_Test - Win32 Release" (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)" == "High_Res_Timer_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\High_Res_Timer_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\Static Debug"

+# PROP BASE Target_Dir ".\High_Res_Timer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "High_Res_Timer_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\High_Res_Timer_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\Static Release"

+# PROP BASE Target_Dir ".\High_Res_Timer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "High_Res_Timer_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\High_Res_Timer_Test\Release"

+# PROP BASE Intermediate_Dir ".\High_Res_Timer_Test\Release"

+# PROP BASE Target_Dir ".\High_Res_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "High_Res_Timer_Test - Win32 Static Debug"

+# Name "High_Res_Timer_Test - Win32 Static Release"

+# Name "High_Res_Timer_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\High_Res_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/IOStream_Test.dsp b/tests/version_tests/IOStream_Test.dsp
new file mode 100644
index 00000000000..04fe3eb2a8b
--- /dev/null
+++ b/tests/version_tests/IOStream_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="IOStream_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=IOStream_Test - Win32 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 "IOStream_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 "IOStream_Test.mak" CFG="IOStream_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "IOStream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "IOStream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "IOStream_Test - Win32 Release" (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)" == "IOStream_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\IOStream_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\IOStream_Test\Static Debug"

+# PROP BASE Target_Dir ".\IOStream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "IOStream_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\IOStream_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\IOStream_Test\Static Release"

+# PROP BASE Target_Dir ".\IOStream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "IOStream_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\IOStream_Test\Release"

+# PROP BASE Intermediate_Dir ".\IOStream_Test\Release"

+# PROP BASE Target_Dir ".\IOStream_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "IOStream_Test - Win32 Static Debug"

+# Name "IOStream_Test - Win32 Static Release"

+# Name "IOStream_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\IOStream_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/Lazy_Map_Manager_Test.dsp b/tests/version_tests/Lazy_Map_Manager_Test.dsp
new file mode 100644
index 00000000000..10509221e36
--- /dev/null
+++ b/tests/version_tests/Lazy_Map_Manager_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Lazy_Map_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Lazy_Map_Manager_Test - Win32 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 "Lazy_Map_Manager_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 "Lazy_Map_Manager_Test.mak" CFG="Lazy_Map_Manager_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Lazy_Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Lazy_Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Lazy_Map_Manager_Test - Win32 Release" (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)" == "Lazy_Map_Manager_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\Static Debug"

+# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Lazy_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_AS_STATIC_LIBS /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)" == "Lazy_Map_Manager_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\Static Release"

+# PROP BASE Target_Dir ".\Lazy_Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Lazy_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_AS_STATIC_LIBS /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)" == "Lazy_Map_Manager_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Lazy_Map_Manager_Test\Release"

+# PROP BASE Intermediate_Dir ".\Lazy_Map_Manager_Test\Release"

+# PROP BASE Target_Dir ".\Lazy_Map_Manager_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 ".\Lazy_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Lazy_Map_Manager_Test - Win32 Static Debug"

+# Name "Lazy_Map_Manager_Test - Win32 Static Release"

+# Name "Lazy_Map_Manager_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=..\Lazy_Map_Manager_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/MEM_Stream_Test.dsp b/tests/version_tests/MEM_Stream_Test.dsp
new file mode 100644
index 00000000000..b08757b7bdc
--- /dev/null
+++ b/tests/version_tests/MEM_Stream_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="MEM_Stream_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=MEM_Stream_Test - Win32 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 "MEM_Stream_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 "MEM_Stream_Test.mak" CFG="MEM_Stream_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "MEM_Stream_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MEM_Stream_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "MEM_Stream_Test - Win32 Release" (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)" == "MEM_Stream_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\MEM_Stream_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\MEM_Stream_Test\Static Debug"

+# PROP BASE Target_Dir ".\MEM_Stream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\MEM_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_AS_STATIC_LIBS /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)" == "MEM_Stream_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\MEM_Stream_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\MEM_Stream_Test\Static Release"

+# PROP BASE Target_Dir ".\MEM_Stream_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\MEM_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_AS_STATIC_LIBS /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)" == "MEM_Stream_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\MEM_Stream_Test\Release"

+# PROP BASE Intermediate_Dir ".\MEM_Stream_Test\Release"

+# PROP BASE Target_Dir ".\MEM_Stream_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 ".\MEM_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "MEM_Stream_Test - Win32 Static Debug"

+# Name "MEM_Stream_Test - Win32 Static Release"

+# Name "MEM_Stream_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\MEM_Stream_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/MM_Shared_Memory_Test.dsp b/tests/version_tests/MM_Shared_Memory_Test.dsp
new file mode 100644
index 00000000000..a3a596877e4
--- /dev/null
+++ b/tests/version_tests/MM_Shared_Memory_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="MM_Shared_Memory_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=MM_Shared_Memory_Test - Win32 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 "MM_Shared_Memory_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 "MM_Shared_Memory_Test.mak" CFG="MM_Shared_Memory_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "MM_Shared_Memory_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MM_Shared_Memory_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "MM_Shared_Memory_Test - Win32 Release" (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)" == "MM_Shared_Memory_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\Static Debug"

+# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "MM_Shared_Memory_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\Static Release"

+# PROP BASE Target_Dir ".\MM_Shared_Memory_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "MM_Shared_Memory_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\MM_Shared_Memory_Test\Release"

+# PROP BASE Intermediate_Dir ".\MM_Shared_Memory_Test\Release"

+# PROP BASE Target_Dir ".\MM_Shared_Memory_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "MM_Shared_Memory_Test - Win32 Static Debug"

+# Name "MM_Shared_Memory_Test - Win32 Static Release"

+# Name "MM_Shared_Memory_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\MM_Shared_Memory_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_Reactor_Timer_Test.dsp b/tests/version_tests/MT_Reactor_Timer_Test.dsp
new file mode 100644
index 00000000000..4946b4ffa24
--- /dev/null
+++ b/tests/version_tests/MT_Reactor_Timer_Test.dsp
@@ -0,0 +1,135 @@
+# 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 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 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "MT_Reactor_Timer_Test - Win32 Static Debug" (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 Release" (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 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 ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 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 ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\MT_Reactor_Timer_Test\Release"

+# PROP BASE Intermediate_Dir ".\MT_Reactor_Timer_Test\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "MT_Reactor_Timer_Test - Win32 Static Debug"

+# Name "MT_Reactor_Timer_Test - Win32 Static Release"

+# Name "MT_Reactor_Timer_Test - Win32 Release"

+# 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
new file mode 100644
index 00000000000..9d6319980e7
--- /dev/null
+++ b/tests/version_tests/MT_SOCK_Test.dsp
@@ -0,0 +1,119 @@
+# Microsoft Developer Studio Project File - Name="MT_SOCK_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_SOCK_Test - Win32 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_SOCK_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_SOCK_Test.mak" CFG="MT_SOCK_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "MT_SOCK_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_SOCK_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "MT_SOCK_Test - Win32 Release" (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_SOCK_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\MT_SOCK_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\Static Debug"

+# PROP BASE Target_Dir ".\MT_SOCK_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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_SOCK_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\MT_SOCK_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\Static Release"

+# PROP BASE Target_Dir ".\MT_SOCK_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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_SOCK_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\MT_SOCK_Test\Release"

+# PROP BASE Intermediate_Dir ".\MT_SOCK_Test\Release"

+# PROP BASE Target_Dir ".\MT_SOCK_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_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "MT_SOCK_Test - Win32 Static Debug"

+# Name "MT_SOCK_Test - Win32 Static Release"

+# Name "MT_SOCK_Test - Win32 Release"

+# Begin Source File

+

+SOURCE=..\MT_SOCK_Test.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/tests/version_tests/Malloc_Test.dsp b/tests/version_tests/Malloc_Test.dsp
new file mode 100644
index 00000000000..688234aaa22
--- /dev/null
+++ b/tests/version_tests/Malloc_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Malloc_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Malloc_Test - Win32 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 "Malloc_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 "Malloc_Test.mak" CFG="Malloc_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Malloc_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Malloc_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Malloc_Test - Win32 Release" (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)" == "Malloc_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Malloc_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Malloc_Test\Static Debug"

+# PROP BASE Target_Dir ".\Malloc_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Malloc_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Malloc_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Malloc_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Malloc_Test\Static Release"

+# PROP BASE Target_Dir ".\Malloc_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Malloc_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Malloc_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Malloc_Test\Release"

+# PROP BASE Intermediate_Dir ".\Malloc_Test\Release"

+# PROP BASE Target_Dir ".\Malloc_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 ".\Malloc_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Malloc_Test - Win32 Static Debug"

+# Name "Malloc_Test - Win32 Static Release"

+# Name "Malloc_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Malloc_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/Map_Manager_Test.dsp b/tests/version_tests/Map_Manager_Test.dsp
new file mode 100644
index 00000000000..b4351b1ef09
--- /dev/null
+++ b/tests/version_tests/Map_Manager_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Map_Manager_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_Manager_Test - Win32 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_Manager_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_Manager_Test.mak" CFG="Map_Manager_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Map_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Manager_Test - Win32 Release" (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_Manager_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Map_Manager_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Map_Manager_Test\Static Debug"

+# PROP BASE Target_Dir ".\Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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_Manager_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Map_Manager_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Map_Manager_Test\Static Release"

+# PROP BASE Target_Dir ".\Map_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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_Manager_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Map_Manager_Test\Release"

+# PROP BASE Intermediate_Dir ".\Map_Manager_Test\Release"

+# PROP BASE Target_Dir ".\Map_Manager_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_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Map_Manager_Test - Win32 Static Debug"

+# Name "Map_Manager_Test - Win32 Static Release"

+# Name "Map_Manager_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Map_Manager_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/Map_Test.dsp b/tests/version_tests/Map_Test.dsp
new file mode 100644
index 00000000000..5d92eed366e
--- /dev/null
+++ b/tests/version_tests/Map_Test.dsp
@@ -0,0 +1,135 @@
+# 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 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 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Map_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Map_Test - Win32 Release" (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 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 ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 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 ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Map_Test\Release"

+# PROP BASE Intermediate_Dir ".\Map_Test\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Map_Test - Win32 Static Debug"

+# Name "Map_Test - Win32 Static Release"

+# Name "Map_Test - Win32 Release"

+# 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
new file mode 100644
index 00000000000..cf42305e708
--- /dev/null
+++ b/tests/version_tests/Mem_Map_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Mem_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=Mem_Map_Test - Win32 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 "Mem_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 "Mem_Map_Test.mak" CFG="Mem_Map_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Mem_Map_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Mem_Map_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Mem_Map_Test - Win32 Release" (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)" == "Mem_Map_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Mem_Map_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Mem_Map_Test\Static Debug"

+# PROP BASE Target_Dir ".\Mem_Map_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Mem_Map_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Mem_Map_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Mem_Map_Test\Static Release"

+# PROP BASE Target_Dir ".\Mem_Map_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Mem_Map_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Mem_Map_Test\Release"

+# PROP BASE Intermediate_Dir ".\Mem_Map_Test\Release"

+# PROP BASE Target_Dir ".\Mem_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Mem_Map_Test - Win32 Static Debug"

+# Name "Mem_Map_Test - Win32 Static Release"

+# Name "Mem_Map_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Mem_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/Message_Block_Test.dsp b/tests/version_tests/Message_Block_Test.dsp
new file mode 100644
index 00000000000..21e8b9e2283
--- /dev/null
+++ b/tests/version_tests/Message_Block_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Message_Block_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Message_Block_Test - Win32 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 "Message_Block_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Block_Test.mak" CFG="Message_Block_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Message_Block_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Block_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Block_Test - Win32 Release" (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)" == "Message_Block_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Message_Block_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Message_Block_Test\Static Debug"

+# PROP BASE Target_Dir ".\Message_Block_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Message_Block_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Message_Block_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Message_Block_Test\Static Release"

+# PROP BASE Target_Dir ".\Message_Block_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Message_Block_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Message_Block_Test\Release"

+# PROP BASE Intermediate_Dir ".\Message_Block_Test\Release"

+# PROP BASE Target_Dir ".\Message_Block_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Message_Block_Test - Win32 Static Debug"

+# Name "Message_Block_Test - Win32 Static Release"

+# Name "Message_Block_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Message_Block_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/Message_Queue_Notifications_Test.dsp b/tests/version_tests/Message_Queue_Notifications_Test.dsp
new file mode 100644
index 00000000000..c67577a8a6c
--- /dev/null
+++ b/tests/version_tests/Message_Queue_Notifications_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Message_Queue_Notifications_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Message_Queue_Notifications_Test - Win32 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 "Message_Queue_Notifications_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Queue_Notifications_Test.mak" CFG="Message_Queue_Notifications_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Message_Queue_Notifications_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Notifications_Test - Win32 Release" (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)" == "Message_Queue_Notifications_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\Static Debug"

+# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Message_Queue_Notifications_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\Static Release"

+# PROP BASE Target_Dir ".\Message_Queue_Notifications_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Message_Queue_Notifications_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Message_Queue_Notifications_Test\Release"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Notifications_Test\Release"

+# PROP BASE Target_Dir ".\Message_Queue_Notifications_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Message_Queue_Notifications_Test - Win32 Static Debug"

+# Name "Message_Queue_Notifications_Test - Win32 Static Release"

+# Name "Message_Queue_Notifications_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Message_Queue_Notifications_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/Message_Queue_Test.dsp b/tests/version_tests/Message_Queue_Test.dsp
new file mode 100644
index 00000000000..618ff47d6e0
--- /dev/null
+++ b/tests/version_tests/Message_Queue_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Message_Queue_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Message_Queue_Test - Win32 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 "Message_Queue_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Message_Queue_Test.mak" CFG="Message_Queue_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Message_Queue_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Message_Queue_Test - Win32 Release" (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)" == "Message_Queue_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Message_Queue_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Test\Static Debug"

+# PROP BASE Target_Dir ".\Message_Queue_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Message_Queue_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Message_Queue_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Test\Static Release"

+# PROP BASE Target_Dir ".\Message_Queue_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Message_Queue_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Message_Queue_Test\Release"

+# PROP BASE Intermediate_Dir ".\Message_Queue_Test\Release"

+# PROP BASE Target_Dir ".\Message_Queue_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Message_Queue_Test - Win32 Static Debug"

+# Name "Message_Queue_Test - Win32 Static Release"

+# Name "Message_Queue_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Message_Queue_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/Naming_Test.dsp b/tests/version_tests/Naming_Test.dsp
new file mode 100644
index 00000000000..b24b88a30ae
--- /dev/null
+++ b/tests/version_tests/Naming_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Naming_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Naming_Test - Win32 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 "Naming_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 "Naming_Test.mak" CFG="Naming_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Naming_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Naming_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Naming_Test - Win32 Release" (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)" == "Naming_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Naming_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Naming_Test\Static Debug"

+# PROP BASE Target_Dir ".\Naming_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Naming_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Naming_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Naming_Test\Static Release"

+# PROP BASE Target_Dir ".\Naming_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Naming_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Naming_Test\Release"

+# PROP BASE Intermediate_Dir ".\Naming_Test\Release"

+# PROP BASE Target_Dir ".\Naming_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Naming_Test - Win32 Static Debug"

+# Name "Naming_Test - Win32 Static Release"

+# Name "Naming_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Naming_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/New_Fail_Test.dsp b/tests/version_tests/New_Fail_Test.dsp
new file mode 100644
index 00000000000..8d3e75ae48b
--- /dev/null
+++ b/tests/version_tests/New_Fail_Test.dsp
@@ -0,0 +1,135 @@
+# 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 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 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "New_Fail_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "New_Fail_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "New_Fail_Test - Win32 Release" (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 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 ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 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 ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\New_Fail_Test\Release"

+# PROP BASE Intermediate_Dir ".\New_Fail_Test\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "New_Fail_Test - Win32 Static Debug"

+# Name "New_Fail_Test - Win32 Static Release"

+# Name "New_Fail_Test - Win32 Release"

+# 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
new file mode 100644
index 00000000000..ff0ee82b11a
--- /dev/null
+++ b/tests/version_tests/Notify_Performance_Test.dsp
@@ -0,0 +1,119 @@
+# Microsoft Developer Studio Project File - Name="Notify_Performance_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Notify_Performance_Test - Win32 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 "Notify_Performance_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 "Notify_Performance_Test.mak" CFG="Notify_Performance_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Notify_Performance_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Notify_Performance_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Notify_Performance_Test - Win32 Release" (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)" == "Notify_Performance_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Notify_Performance_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\Static Debug"

+# PROP BASE Target_Dir ".\Notify_Performance_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Notify_Performance_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Notify_Performance_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\Static Release"

+# PROP BASE Target_Dir ".\Notify_Performance_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Notify_Performance_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Notify_Performance_Test\Release"

+# PROP BASE Intermediate_Dir ".\Notify_Performance_Test\Release"

+# PROP BASE Target_Dir ".\Notify_Performance_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Notify_Performance_Test - Win32 Static Debug"

+# Name "Notify_Performance_Test - Win32 Static Release"

+# Name "Notify_Performance_Test - Win32 Release"

+# Begin Source File

+

+SOURCE=..\Notify_Performance_Test.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/tests/version_tests/OS_Test.dsp b/tests/version_tests/OS_Test.dsp
new file mode 100644
index 00000000000..df5c383f179
--- /dev/null
+++ b/tests/version_tests/OS_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="OS_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=OS_Test - Win32 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 "OS_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 "OS_Test.mak" CFG="OS_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "OS_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "OS_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "OS_Test - Win32 Release" (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)" == "OS_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\OS_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\OS_Test\Static Debug"

+# PROP BASE Target_Dir ".\OS_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\OS_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "OS_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\OS_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\OS_Test\Static Release"

+# PROP BASE Target_Dir ".\OS_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\OS_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "OS_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\OS_Test\Release"

+# PROP BASE Intermediate_Dir ".\OS_Test\Release"

+# PROP BASE Target_Dir ".\OS_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 ".\OS_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "OS_Test - Win32 Static Debug"

+# Name "OS_Test - Win32 Static Release"

+# Name "OS_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\OS_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/Object_Manager_Test.dsp b/tests/version_tests/Object_Manager_Test.dsp
new file mode 100644
index 00000000000..3f39ab56c5b
--- /dev/null
+++ b/tests/version_tests/Object_Manager_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Object_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Object_Manager_Test - Win32 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 "Object_Manager_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 "Object_Manager_Test.mak" CFG="Object_Manager_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Object_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Object_Manager_Test - Win32 Release" (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)" == "Object_Manager_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Object_Manager_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Static Debug"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_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_AS_STATIC_LIBS /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)" == "Object_Manager_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Object_Manager_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Static Release"

+# PROP BASE Target_Dir ".\Object_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Object_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_AS_STATIC_LIBS /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)" == "Object_Manager_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Object_Manager_Test\Release"

+# PROP BASE Intermediate_Dir ".\Object_Manager_Test\Release"

+# PROP BASE Target_Dir ".\Object_Manager_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 ".\Object_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Object_Manager_Test - Win32 Static Debug"

+# Name "Object_Manager_Test - Win32 Static Release"

+# Name "Object_Manager_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Object_Manager_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/OrdMultiSet_Test.dsp b/tests/version_tests/OrdMultiSet_Test.dsp
new file mode 100644
index 00000000000..a697dce43f1
--- /dev/null
+++ b/tests/version_tests/OrdMultiSet_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="OrdMultiSet_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=OrdMultiSet_Test - Win32 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 "OrdMultiSet_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 "OrdMultiSet_Test.mak" CFG="OrdMultiSet_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "OrdMultiSet_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "OrdMultiSet_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "OrdMultiSet_Test - Win32 Release" (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)" == "OrdMultiSet_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\OrdMultiSet_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\Static Debug"

+# PROP BASE Target_Dir ".\OrdMultiSet_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "OrdMultiSet_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\OrdMultiSet_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\Static Release"

+# PROP BASE Target_Dir ".\OrdMultiSet_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "OrdMultiSet_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\OrdMultiSet_Test\Release"

+# PROP BASE Intermediate_Dir ".\OrdMultiSet_Test\Release"

+# PROP BASE Target_Dir ".\OrdMultiSet_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "OrdMultiSet_Test - Win32 Static Debug"

+# Name "OrdMultiSet_Test - Win32 Static Release"

+# Name "OrdMultiSet_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\OrdMultiSet_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/Pipe_Test.dsp b/tests/version_tests/Pipe_Test.dsp
new file mode 100644
index 00000000000..d4db09049dc
--- /dev/null
+++ b/tests/version_tests/Pipe_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Pipe_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Pipe_Test - Win32 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 "Pipe_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 "Pipe_Test.mak" CFG="Pipe_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Pipe_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Pipe_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Pipe_Test - Win32 Release" (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)" == "Pipe_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Pipe_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Pipe_Test\Static Debug"

+# PROP BASE Target_Dir ".\Pipe_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Pipe_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Pipe_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Pipe_Test\Static Release"

+# PROP BASE Target_Dir ".\Pipe_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Pipe_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Pipe_Test\Release"

+# PROP BASE Intermediate_Dir ".\Pipe_Test\Release"

+# PROP BASE Target_Dir ".\Pipe_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Pipe_Test - Win32 Static Debug"

+# Name "Pipe_Test - Win32 Static Release"

+# Name "Pipe_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Pipe_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/Priority_Buffer_Test.dsp b/tests/version_tests/Priority_Buffer_Test.dsp
new file mode 100644
index 00000000000..744c0fbc2b6
--- /dev/null
+++ b/tests/version_tests/Priority_Buffer_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Priority_Buffer_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Priority_Buffer_Test - Win32 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 "Priority_Buffer_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 "Priority_Buffer_Test.mak" CFG="Priority_Buffer_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Priority_Buffer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Buffer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Buffer_Test - Win32 Release" (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)" == "Priority_Buffer_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Priority_Buffer_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\Static Debug"

+# PROP BASE Target_Dir ".\Priority_Buffer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Priority_Buffer_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Priority_Buffer_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\Static Release"

+# PROP BASE Target_Dir ".\Priority_Buffer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Priority_Buffer_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Priority_Buffer_Test\Release"

+# PROP BASE Intermediate_Dir ".\Priority_Buffer_Test\Release"

+# PROP BASE Target_Dir ".\Priority_Buffer_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Priority_Buffer_Test - Win32 Static Debug"

+# Name "Priority_Buffer_Test - Win32 Static Release"

+# Name "Priority_Buffer_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Priority_Buffer_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/Priority_Reactor_Test.dsp b/tests/version_tests/Priority_Reactor_Test.dsp
new file mode 100644
index 00000000000..c473e606d93
--- /dev/null
+++ b/tests/version_tests/Priority_Reactor_Test.dsp
@@ -0,0 +1,119 @@
+# Microsoft Developer Studio Project File - Name="Priority_Reactor_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Priority_Reactor_Test - Win32 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 "Priority_Reactor_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 "Priority_Reactor_Test.mak" CFG="Priority_Reactor_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Priority_Reactor_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Reactor_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Reactor_Test - Win32 Release" (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)" == "Priority_Reactor_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Priority_Reactor_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\Static Debug"

+# PROP BASE Target_Dir ".\Priority_Reactor_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Priority_Reactor_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Priority_Reactor_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\Static Release"

+# PROP BASE Target_Dir ".\Priority_Reactor_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Priority_Reactor_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Priority_Reactor_Test\Release"

+# PROP BASE Intermediate_Dir ".\Priority_Reactor_Test\Release"

+# PROP BASE Target_Dir ".\Priority_Reactor_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Priority_Reactor_Test - Win32 Static Debug"

+# Name "Priority_Reactor_Test - Win32 Static Release"

+# Name "Priority_Reactor_Test - Win32 Release"

+# Begin Source File

+

+SOURCE=..\Priority_Reactor_Test.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/tests/version_tests/Priority_Task_Test.dsp b/tests/version_tests/Priority_Task_Test.dsp
new file mode 100644
index 00000000000..74f65b34fd5
--- /dev/null
+++ b/tests/version_tests/Priority_Task_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Priority_Task_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Priority_Task_Test - Win32 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 "Priority_Task_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 "Priority_Task_Test.mak" CFG="Priority_Task_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Priority_Task_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Task_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Priority_Task_Test - Win32 Release" (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)" == "Priority_Task_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Priority_Task_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Priority_Task_Test\Static Debug"

+# PROP BASE Target_Dir ".\Priority_Task_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Priority_Task_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Priority_Task_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Priority_Task_Test\Static Release"

+# PROP BASE Target_Dir ".\Priority_Task_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Priority_Task_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Priority_Task_Test\Release"

+# PROP BASE Intermediate_Dir ".\Priority_Task_Test\Release"

+# PROP BASE Target_Dir ".\Priority_Task_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Priority_Task_Test - Win32 Static Debug"

+# Name "Priority_Task_Test - Win32 Static Release"

+# Name "Priority_Task_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Priority_Task_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/Process_Manager_Test.dsp b/tests/version_tests/Process_Manager_Test.dsp
new file mode 100644
index 00000000000..c5f2979bcae
--- /dev/null
+++ b/tests/version_tests/Process_Manager_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Process_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Process_Manager_Test - Win32 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 "Process_Manager_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 "Process_Manager_Test.mak" CFG="Process_Manager_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Process_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Manager_Test - Win32 Release" (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)" == "Process_Manager_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Process_Manager_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Process_Manager_Test\Static Debug"

+# PROP BASE Target_Dir ".\Process_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Process_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_AS_STATIC_LIBS /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)" == "Process_Manager_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Process_Manager_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Process_Manager_Test\Static Release"

+# PROP BASE Target_Dir ".\Process_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Process_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_AS_STATIC_LIBS /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)" == "Process_Manager_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Process_Manager_Test\Release"

+# PROP BASE Intermediate_Dir ".\Process_Manager_Test\Release"

+# PROP BASE Target_Dir ".\Process_Manager_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 ".\Process_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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Process_Manager_Test - Win32 Static Debug"

+# Name "Process_Manager_Test - Win32 Static Release"

+# Name "Process_Manager_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Process_Manager_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/Process_Mutex_Test.dsp b/tests/version_tests/Process_Mutex_Test.dsp
new file mode 100644
index 00000000000..d439454db5c
--- /dev/null
+++ b/tests/version_tests/Process_Mutex_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Process_Mutex_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Process_Mutex_Test - Win32 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 "Process_Mutex_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 "Process_Mutex_Test.mak" CFG="Process_Mutex_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Process_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Mutex_Test - Win32 Release" (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)" == "Process_Mutex_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Process_Mutex_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\Static Debug"

+# PROP BASE Target_Dir ".\Process_Mutex_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Process_Mutex_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Process_Mutex_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\Static Release"

+# PROP BASE Target_Dir ".\Process_Mutex_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Process_Mutex_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Process_Mutex_Test\Release"

+# PROP BASE Intermediate_Dir ".\Process_Mutex_Test\Release"

+# PROP BASE Target_Dir ".\Process_Mutex_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Process_Mutex_Test - Win32 Static Debug"

+# Name "Process_Mutex_Test - Win32 Static Release"

+# Name "Process_Mutex_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Process_Mutex_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/Process_Strategy_Test.dsp b/tests/version_tests/Process_Strategy_Test.dsp
new file mode 100644
index 00000000000..c52fd07d51e
--- /dev/null
+++ b/tests/version_tests/Process_Strategy_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Process_Strategy_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Process_Strategy_Test - Win32 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 "Process_Strategy_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 "Process_Strategy_Test.mak" CFG="Process_Strategy_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Process_Strategy_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Strategy_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Process_Strategy_Test - Win32 Release" (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)" == "Process_Strategy_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Process_Strategy_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\Static Debug"

+# PROP BASE Target_Dir ".\Process_Strategy_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Process_Strategy_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Process_Strategy_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\Static Release"

+# PROP BASE Target_Dir ".\Process_Strategy_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Process_Strategy_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Process_Strategy_Test\Release"

+# PROP BASE Intermediate_Dir ".\Process_Strategy_Test\Release"

+# PROP BASE Target_Dir ".\Process_Strategy_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Process_Strategy_Test - Win32 Static Debug"

+# Name "Process_Strategy_Test - Win32 Static Release"

+# Name "Process_Strategy_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Process_Strategy_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/RB_Tree_Test.dsp b/tests/version_tests/RB_Tree_Test.dsp
new file mode 100644
index 00000000000..36cbff44243
--- /dev/null
+++ b/tests/version_tests/RB_Tree_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="RB_Tree_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=RB_Tree_Test - Win32 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 "RB_Tree_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 "RB_Tree_Test.mak" CFG="RB_Tree_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "RB_Tree_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "RB_Tree_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "RB_Tree_Test - Win32 Release" (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)" == "RB_Tree_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\RB_Tree_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\RB_Tree_Test\Static Debug"

+# PROP BASE Target_Dir ".\RB_Tree_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "RB_Tree_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\RB_Tree_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\RB_Tree_Test\Static Release"

+# PROP BASE Target_Dir ".\RB_Tree_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "RB_Tree_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\RB_Tree_Test\Release"

+# PROP BASE Intermediate_Dir ".\RB_Tree_Test\Release"

+# PROP BASE Target_Dir ".\RB_Tree_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "RB_Tree_Test - Win32 Static Debug"

+# Name "RB_Tree_Test - Win32 Static Release"

+# Name "RB_Tree_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=..\RB_Tree_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Reactor_Exceptions_Test.dsp b/tests/version_tests/Reactor_Exceptions_Test.dsp
new file mode 100644
index 00000000000..a7e3bbd4b39
--- /dev/null
+++ b/tests/version_tests/Reactor_Exceptions_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Reactor_Exceptions_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Reactor_Exceptions_Test - Win32 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 "Reactor_Exceptions_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 "Reactor_Exceptions_Test.mak" CFG="Reactor_Exceptions_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Exceptions_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Exceptions_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Exceptions_Test - Win32 Release" (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)" == "Reactor_Exceptions_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Reactor_Exceptions_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Reactor_Exceptions_Test\Static Debug"

+# PROP BASE Target_Dir ".\Reactor_Exceptions_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Reactor_Exceptions_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reactor_Exceptions_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Exceptions_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Exceptions_Test\Static Release"

+# PROP BASE Target_Dir ".\Reactor_Exceptions_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Reactor_Exceptions_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Reactor_Exceptions_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Exceptions_Test\Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Exceptions_Test\Release"

+# PROP BASE Target_Dir ".\Reactor_Exceptions_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 ".\Reactor_Exceptions_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Exceptions_Test - Win32 Static Debug"

+# Name "Reactor_Exceptions_Test - Win32 Static Release"

+# Name "Reactor_Exceptions_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Reactor_Exceptions_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/Reactor_Notify_Test.dsp b/tests/version_tests/Reactor_Notify_Test.dsp
new file mode 100644
index 00000000000..49526fb470c
--- /dev/null
+++ b/tests/version_tests/Reactor_Notify_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Reactor_Notify_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Reactor_Notify_Test - Win32 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 "Reactor_Notify_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 "Reactor_Notify_Test.mak" CFG="Reactor_Notify_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Notify_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Notify_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Notify_Test - Win32 Release" (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)" == "Reactor_Notify_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Reactor_Notify_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\Static Debug"

+# PROP BASE Target_Dir ".\Reactor_Notify_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Reactor_Notify_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Notify_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\Static Release"

+# PROP BASE Target_Dir ".\Reactor_Notify_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Reactor_Notify_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Notify_Test\Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Notify_Test\Release"

+# PROP BASE Target_Dir ".\Reactor_Notify_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Notify_Test - Win32 Static Debug"

+# Name "Reactor_Notify_Test - Win32 Static Release"

+# Name "Reactor_Notify_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Reactor_Notify_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/Reactor_Performance_Test.dsp b/tests/version_tests/Reactor_Performance_Test.dsp
new file mode 100644
index 00000000000..40ae42a0734
--- /dev/null
+++ b/tests/version_tests/Reactor_Performance_Test.dsp
@@ -0,0 +1,119 @@
+# Microsoft Developer Studio Project File - Name="Reactor_Performance_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Reactor_Performance_Test - Win32 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 "Reactor_Performance_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 "Reactor_Performance_Test.mak" CFG="Reactor_Performance_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Performance_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Performance_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Performance_Test - Win32 Release" (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)" == "Reactor_Performance_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Reactor_Performance_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\Static Debug"

+# PROP BASE Target_Dir ".\Reactor_Performance_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Reactor_Performance_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Performance_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\Static Release"

+# PROP BASE Target_Dir ".\Reactor_Performance_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Reactor_Performance_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Performance_Test\Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Performance_Test\Release"

+# PROP BASE Target_Dir ".\Reactor_Performance_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Performance_Test - Win32 Static Debug"

+# Name "Reactor_Performance_Test - Win32 Static Release"

+# Name "Reactor_Performance_Test - Win32 Release"

+# Begin Source File

+

+SOURCE=..\Reactor_Performance_Test.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/tests/version_tests/Reactor_Timer_Test.dsp b/tests/version_tests/Reactor_Timer_Test.dsp
new file mode 100644
index 00000000000..07b6fdb92c8
--- /dev/null
+++ b/tests/version_tests/Reactor_Timer_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="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=Reactor_Timer_Test - Win32 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 "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 "Reactor_Timer_Test.mak" CFG="Reactor_Timer_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactor_Timer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Timer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactor_Timer_Test - Win32 Release" (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)" == "Reactor_Timer_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Reactor_Timer_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\Static Debug"

+# PROP BASE Target_Dir ".\Reactor_Timer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Reactor_Timer_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Timer_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\Static Release"

+# PROP BASE Target_Dir ".\Reactor_Timer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Reactor_Timer_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactor_Timer_Test\Release"

+# PROP BASE Intermediate_Dir ".\Reactor_Timer_Test\Release"

+# PROP BASE Target_Dir ".\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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactor_Timer_Test - Win32 Static Debug"

+# Name "Reactor_Timer_Test - Win32 Static Release"

+# Name "Reactor_Timer_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\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/Reactors_Test.dsp b/tests/version_tests/Reactors_Test.dsp
new file mode 100644
index 00000000000..25bc9c93d79
--- /dev/null
+++ b/tests/version_tests/Reactors_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Reactors_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Reactors_Test - Win32 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 "Reactors_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 "Reactors_Test.mak" CFG="Reactors_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reactors_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactors_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reactors_Test - Win32 Release" (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)" == "Reactors_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Reactors_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Reactors_Test\Static Debug"

+# PROP BASE Target_Dir ".\Reactors_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Reactors_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactors_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Reactors_Test\Static Release"

+# PROP BASE Target_Dir ".\Reactors_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Reactors_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reactors_Test\Release"

+# PROP BASE Intermediate_Dir ".\Reactors_Test\Release"

+# PROP BASE Target_Dir ".\Reactors_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reactors_Test - Win32 Static Debug"

+# Name "Reactors_Test - Win32 Static Release"

+# Name "Reactors_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Reactors_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/Reader_Writer_Test.dsp b/tests/version_tests/Reader_Writer_Test.dsp
new file mode 100644
index 00000000000..2569cc457f8
--- /dev/null
+++ b/tests/version_tests/Reader_Writer_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Reader_Writer_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Reader_Writer_Test - Win32 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 "Reader_Writer_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 "Reader_Writer_Test.mak" CFG="Reader_Writer_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reader_Writer_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reader_Writer_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reader_Writer_Test - Win32 Release" (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)" == "Reader_Writer_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Reader_Writer_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\Static Debug"

+# PROP BASE Target_Dir ".\Reader_Writer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Reader_Writer_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reader_Writer_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\Static Release"

+# PROP BASE Target_Dir ".\Reader_Writer_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Reader_Writer_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reader_Writer_Test\Release"

+# PROP BASE Intermediate_Dir ".\Reader_Writer_Test\Release"

+# PROP BASE Target_Dir ".\Reader_Writer_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reader_Writer_Test - Win32 Static Debug"

+# Name "Reader_Writer_Test - Win32 Static Release"

+# Name "Reader_Writer_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Reader_Writer_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/Recursive_Mutex_Test.dsp b/tests/version_tests/Recursive_Mutex_Test.dsp
new file mode 100644
index 00000000000..c141e44ef65
--- /dev/null
+++ b/tests/version_tests/Recursive_Mutex_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Recursive_Mutex_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Recursive_Mutex_Test - Win32 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 "Recursive_Mutex_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 "Recursive_Mutex_Test.mak" CFG="Recursive_Mutex_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Recursive_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Recursive_Mutex_Test - Win32 Release" (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)" == "Recursive_Mutex_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Recursive_Mutex_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\Static Debug"

+# PROP BASE Target_Dir ".\Recursive_Mutex_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Recursive_Mutex_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Recursive_Mutex_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\Static Release"

+# PROP BASE Target_Dir ".\Recursive_Mutex_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Recursive_Mutex_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Recursive_Mutex_Test\Release"

+# PROP BASE Intermediate_Dir ".\Recursive_Mutex_Test\Release"

+# PROP BASE Target_Dir ".\Recursive_Mutex_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Recursive_Mutex_Test - Win32 Static Debug"

+# Name "Recursive_Mutex_Test - Win32 Static Release"

+# Name "Recursive_Mutex_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Recursive_Mutex_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/Refcounted_Auto_Ptr_Test.dsp b/tests/version_tests/Refcounted_Auto_Ptr_Test.dsp
new file mode 100644
index 00000000000..0c0c3e396f5
--- /dev/null
+++ b/tests/version_tests/Refcounted_Auto_Ptr_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Refcounted_Auto_Ptr_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Refcounted_Auto_Ptr_Test - Win32 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 "Refcounted_Auto_Ptr_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 "Refcounted_Auto_Ptr_Test.mak" CFG="Refcounted_Auto_Ptr_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Refcounted_Auto_Ptr_Test - Win32 Release" (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)" == "Refcounted_Auto_Ptr_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Refcounted_Auto_Ptr_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Refcounted_Auto_Ptr_Test\Static Debug"

+# PROP BASE Target_Dir ".\Refcounted_Auto_Ptr_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Refcounted_Auto_Ptr_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Refcounted_Auto_Ptr_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Refcounted_Auto_Ptr_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Refcounted_Auto_Ptr_Test\Static Release"

+# PROP BASE Target_Dir ".\Refcounted_Auto_Ptr_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Refcounted_Auto_Ptr_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Refcounted_Auto_Ptr_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Refcounted_Auto_Ptr_Test\Release"

+# PROP BASE Intermediate_Dir ".\Refcounted_Auto_Ptr_Test\Release"

+# PROP BASE Target_Dir ".\Refcounted_Auto_Ptr_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 ".\Refcounted_Auto_Ptr_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Refcounted_Auto_Ptr_Test - Win32 Static Debug"

+# Name "Refcounted_Auto_Ptr_Test - Win32 Static Release"

+# Name "Refcounted_Auto_Ptr_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Refcounted_Auto_Ptr_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/Reverse_Lock_Test.dsp b/tests/version_tests/Reverse_Lock_Test.dsp
new file mode 100644
index 00000000000..e07636edce8
--- /dev/null
+++ b/tests/version_tests/Reverse_Lock_Test.dsp
@@ -0,0 +1,135 @@
+# 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 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 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Reverse_Lock_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reverse_Lock_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reverse_Lock_Test - Win32 Release" (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 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 ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 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 ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\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_AS_STATIC_LIBS /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 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Reverse_Lock_Test\Release"

+# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Reverse_Lock_Test - Win32 Static Debug"

+# Name "Reverse_Lock_Test - Win32 Static Release"

+# Name "Reverse_Lock_Test - Win32 Release"

+# 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
new file mode 100644
index 00000000000..ecb656bac85
--- /dev/null
+++ b/tests/version_tests/SOCK_Connector_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="SOCK_Connector_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=SOCK_Connector_Test - Win32 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 "SOCK_Connector_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 "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SOCK_Connector_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Connector_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Connector_Test - Win32 Release" (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)" == "SOCK_Connector_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Static Debug"

+# PROP BASE Target_Dir ".\SOCK_Connector_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "SOCK_Connector_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Static Release"

+# PROP BASE Target_Dir ".\SOCK_Connector_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "SOCK_Connector_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Release"

+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Release"

+# PROP BASE Target_Dir ".\SOCK_Connector_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SOCK_Connector_Test - Win32 Static Debug"

+# Name "SOCK_Connector_Test - Win32 Static Release"

+# Name "SOCK_Connector_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\SOCK_Connector_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_Send_Recv_Test.dsp b/tests/version_tests/SOCK_Send_Recv_Test.dsp
new file mode 100644
index 00000000000..45064f9ada0
--- /dev/null
+++ b/tests/version_tests/SOCK_Send_Recv_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="SOCK_Send_Recv_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=SOCK_Send_Recv_Test - Win32 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 "SOCK_Send_Recv_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 "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SOCK_Send_Recv_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Send_Recv_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Send_Recv_Test - Win32 Release" (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)" == "SOCK_Send_Recv_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Static Debug"

+# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\SOCK_Send_Recv_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SOCK_Send_Recv_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Static Release"

+# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\SOCK_Send_Recv_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "SOCK_Send_Recv_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SOCK_Send_Recv_Test\Release"

+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Release"

+# PROP BASE Target_Dir ".\SOCK_Send_Recv_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 ".\SOCK_Send_Recv_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SOCK_Send_Recv_Test - Win32 Static Debug"

+# Name "SOCK_Send_Recv_Test - Win32 Static Release"

+# Name "SOCK_Send_Recv_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\SOCK_Send_Recv_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_Test.dsp b/tests/version_tests/SOCK_Test.dsp
new file mode 100644
index 00000000000..8a0d469ede8
--- /dev/null
+++ b/tests/version_tests/SOCK_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="SOCK_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=SOCK_Test - Win32 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 "SOCK_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 "SOCK_Test.mak" CFG="SOCK_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SOCK_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Test - Win32 Release" (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)" == "SOCK_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\SOCK_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Test\Static Debug"

+# PROP BASE Target_Dir ".\SOCK_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "SOCK_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SOCK_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\SOCK_Test\Static Release"

+# PROP BASE Target_Dir ".\SOCK_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "SOCK_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SOCK_Test\Release"

+# PROP BASE Intermediate_Dir ".\SOCK_Test\Release"

+# PROP BASE Target_Dir ".\SOCK_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SOCK_Test - Win32 Static Debug"

+# Name "SOCK_Test - Win32 Static Release"

+# Name "SOCK_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\SOCK_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/SPIPE_Test.dsp b/tests/version_tests/SPIPE_Test.dsp
new file mode 100644
index 00000000000..fdec2b608b2
--- /dev/null
+++ b/tests/version_tests/SPIPE_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="SPIPE_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=SPIPE_Test - Win32 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 "SPIPE_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 "SPIPE_Test.mak" CFG="SPIPE_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SPIPE_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SPIPE_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "SPIPE_Test - Win32 Release" (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)" == "SPIPE_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\SPIPE_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\SPIPE_Test\Static Debug"

+# PROP BASE Target_Dir ".\SPIPE_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "SPIPE_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SPIPE_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\SPIPE_Test\Static Release"

+# PROP BASE Target_Dir ".\SPIPE_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "SPIPE_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SPIPE_Test\Release"

+# PROP BASE Intermediate_Dir ".\SPIPE_Test\Release"

+# PROP BASE Target_Dir ".\SPIPE_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SPIPE_Test - Win32 Static Debug"

+# Name "SPIPE_Test - Win32 Static Release"

+# Name "SPIPE_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\SPIPE_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/SString_Test.dsp b/tests/version_tests/SString_Test.dsp
new file mode 100644
index 00000000000..7b4579974dc
--- /dev/null
+++ b/tests/version_tests/SString_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="SString_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=SString_Test - Win32 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 "SString_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 "SString_Test.mak" CFG="SString_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SString_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SString_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "SString_Test - Win32 Release" (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)" == "SString_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\SString_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\SString_Test\Static Debug"

+# PROP BASE Target_Dir ".\SString_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "SString_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SString_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\SString_Test\Static Release"

+# PROP BASE Target_Dir ".\SString_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "SString_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SString_Test\Release"

+# PROP BASE Intermediate_Dir ".\SString_Test\Release"

+# PROP BASE Target_Dir ".\SString_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SString_Test - Win32 Static Debug"

+# Name "SString_Test - Win32 Static Release"

+# Name "SString_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\SString_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/SV_Shared_Memory_Test.dsp b/tests/version_tests/SV_Shared_Memory_Test.dsp
new file mode 100644
index 00000000000..cc057a02566
--- /dev/null
+++ b/tests/version_tests/SV_Shared_Memory_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="SV_Shared_Memory_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=SV_Shared_Memory_Test - Win32 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 "SV_Shared_Memory_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 "SV_Shared_Memory_Test.mak" CFG="SV_Shared_Memory_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "SV_Shared_Memory_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SV_Shared_Memory_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "SV_Shared_Memory_Test - Win32 Release" (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)" == "SV_Shared_Memory_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\Static Debug"

+# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "SV_Shared_Memory_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\Static Release"

+# PROP BASE Target_Dir ".\SV_Shared_Memory_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "SV_Shared_Memory_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\SV_Shared_Memory_Test\Release"

+# PROP BASE Intermediate_Dir ".\SV_Shared_Memory_Test\Release"

+# PROP BASE Target_Dir ".\SV_Shared_Memory_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "SV_Shared_Memory_Test - Win32 Static Debug"

+# Name "SV_Shared_Memory_Test - Win32 Static Release"

+# Name "SV_Shared_Memory_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\SV_Shared_Memory_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/Semaphore_Test.dsp b/tests/version_tests/Semaphore_Test.dsp
new file mode 100644
index 00000000000..f30da22edaa
--- /dev/null
+++ b/tests/version_tests/Semaphore_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Semaphore_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Semaphore_Test - Win32 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 "Semaphore_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 "Semaphore_Test.mak" CFG="Semaphore_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Semaphore_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Semaphore_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Semaphore_Test - Win32 Release" (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)" == "Semaphore_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Semaphore_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Semaphore_Test\Static Debug"

+# PROP BASE Target_Dir ".\Semaphore_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Semaphore_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Semaphore_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Semaphore_Test\Static Release"

+# PROP BASE Target_Dir ".\Semaphore_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Semaphore_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Semaphore_Test\Release"

+# PROP BASE Intermediate_Dir ".\Semaphore_Test\Release"

+# PROP BASE Target_Dir ".\Semaphore_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Semaphore_Test - Win32 Static Debug"

+# Name "Semaphore_Test - Win32 Static Release"

+# Name "Semaphore_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp"

+# Begin Source File

+

+SOURCE=..\Semaphore_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Service_Config_Test.dsp b/tests/version_tests/Service_Config_Test.dsp
new file mode 100644
index 00000000000..66189501e14
--- /dev/null
+++ b/tests/version_tests/Service_Config_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Service_Config_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Service_Config_Test - Win32 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 "Service_Config_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 "Service_Config_Test.mak" CFG="Service_Config_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Service_Config_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Service_Config_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Service_Config_Test - Win32 Release" (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)" == "Service_Config_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Service_Config_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Service_Config_Test\Static Debug"

+# PROP BASE Target_Dir ".\Service_Config_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Service_Config_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Service_Config_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Service_Config_Test\Static Release"

+# PROP BASE Target_Dir ".\Service_Config_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Service_Config_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Service_Config_Test\Release"

+# PROP BASE Intermediate_Dir ".\Service_Config_Test\Release"

+# PROP BASE Target_Dir ".\Service_Config_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Service_Config_Test - Win32 Static Debug"

+# Name "Service_Config_Test - Win32 Static Release"

+# Name "Service_Config_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Service_Config_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/Sigset_Ops_Test.dsp b/tests/version_tests/Sigset_Ops_Test.dsp
new file mode 100644
index 00000000000..f74333fc615
--- /dev/null
+++ b/tests/version_tests/Sigset_Ops_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Sigset_Ops_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Sigset_Ops_Test - Win32 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 "Sigset_Ops_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 "Sigset_Ops_Test.mak" CFG="Sigset_Ops_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Sigset_Ops_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Sigset_Ops_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Sigset_Ops_Test - Win32 Release" (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)" == "Sigset_Ops_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Sigset_Ops_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Sigset_Ops_Test\Static Debug"

+# PROP BASE Target_Dir ".\Sigset_Ops_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Sigset_Ops_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Sigset_Ops_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Sigset_Ops_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Sigset_Ops_Test\Static Release"

+# PROP BASE Target_Dir ".\Sigset_Ops_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Sigset_Ops_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Sigset_Ops_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Sigset_Ops_Test\Release"

+# PROP BASE Intermediate_Dir ".\Sigset_Ops_Test\Release"

+# PROP BASE Target_Dir ".\Sigset_Ops_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 ".\Sigset_Ops_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Sigset_Ops_Test - Win32 Static Debug"

+# Name "Sigset_Ops_Test - Win32 Static Release"

+# Name "Sigset_Ops_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Sigset_Ops_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/Simple_Message_Block_Test.dsp b/tests/version_tests/Simple_Message_Block_Test.dsp
new file mode 100644
index 00000000000..da6f0e4908d
--- /dev/null
+++ b/tests/version_tests/Simple_Message_Block_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Simple_Message_Block_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Simple_Message_Block_Test - Win32 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 "Simple_Message_Block_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 "Simple_Message_Block_Test.mak" CFG="Simple_Message_Block_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Simple_Message_Block_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple_Message_Block_Test - Win32 Release" (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)" == "Simple_Message_Block_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Simple_Message_Block_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\Static Debug"

+# PROP BASE Target_Dir ".\Simple_Message_Block_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Simple_Message_Block_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Simple_Message_Block_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\Static Release"

+# PROP BASE Target_Dir ".\Simple_Message_Block_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Simple_Message_Block_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Simple_Message_Block_Test\Release"

+# PROP BASE Intermediate_Dir ".\Simple_Message_Block_Test\Release"

+# PROP BASE Target_Dir ".\Simple_Message_Block_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Simple_Message_Block_Test - Win32 Static Debug"

+# Name "Simple_Message_Block_Test - Win32 Static Release"

+# Name "Simple_Message_Block_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Simple_Message_Block_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/Svc_Handler_Test.dsp b/tests/version_tests/Svc_Handler_Test.dsp
new file mode 100644
index 00000000000..b866cefc0bf
--- /dev/null
+++ b/tests/version_tests/Svc_Handler_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Svc_Handler_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Svc_Handler_Test - Win32 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 "Svc_Handler_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 "Svc_Handler_Test.mak" CFG="Svc_Handler_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Svc_Handler_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Svc_Handler_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Svc_Handler_Test - Win32 Release" (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)" == "Svc_Handler_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Svc_Handler_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Static Debug"

+# PROP BASE Target_Dir ".\Svc_Handler_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Svc_Handler_Test"

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Svc_Handler_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Svc_Handler_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Static Release"

+# PROP BASE Target_Dir ".\Svc_Handler_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ".\Svc_Handler_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /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)" == "Svc_Handler_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Svc_Handler_Test\Release"

+# PROP BASE Intermediate_Dir ".\Svc_Handler_Test\Release"

+# PROP BASE Target_Dir ".\Svc_Handler_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 ".\Svc_Handler_Test"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# 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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Svc_Handler_Test - Win32 Static Debug"

+# Name "Svc_Handler_Test - Win32 Static Release"

+# Name "Svc_Handler_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Svc_Handler_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/TSS_Test.dsp b/tests/version_tests/TSS_Test.dsp
new file mode 100644
index 00000000000..3dfbbf258c6
--- /dev/null
+++ b/tests/version_tests/TSS_Test.dsp
@@ -0,0 +1,139 @@
+# Microsoft Developer Studio Project File - Name="TSS_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=TSS_Test - Win32 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 "TSS_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 "TSS_Test.mak" CFG="TSS_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "TSS_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "TSS_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "TSS_Test - Win32 Release" (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)" == "TSS_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\TSS_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\TSS_Test\Static Debug"

+# PROP BASE Target_Dir ".\TSS_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "TSS_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\TSS_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\TSS_Test\Static Release"

+# PROP BASE Target_Dir ".\TSS_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "TSS_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\TSS_Test\Release"

+# PROP BASE Intermediate_Dir ".\TSS_Test\Release"

+# PROP BASE Target_Dir ".\TSS_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "TSS_Test - Win32 Static Debug"

+# Name "TSS_Test - Win32 Static Release"

+# Name "TSS_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\TSS_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

+# Begin Source File

+

+SOURCE=..\TSS_Test_Errno.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/Task_Test.dsp b/tests/version_tests/Task_Test.dsp
new file mode 100644
index 00000000000..4b4f92917e9
--- /dev/null
+++ b/tests/version_tests/Task_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Task_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Task_Test - Win32 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 "Task_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 "Task_Test.mak" CFG="Task_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Task_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Task_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Task_Test - Win32 Release" (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)" == "Task_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Task_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Task_Test\Static Debug"

+# PROP BASE Target_Dir ".\Task_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Task_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Task_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Task_Test\Static Release"

+# PROP BASE Target_Dir ".\Task_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Task_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Task_Test\Release"

+# PROP BASE Intermediate_Dir ".\Task_Test\Release"

+# PROP BASE Target_Dir ".\Task_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Task_Test - Win32 Static Debug"

+# Name "Task_Test - Win32 Static Release"

+# Name "Task_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Task_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/Thread_Manager_Test.dsp b/tests/version_tests/Thread_Manager_Test.dsp
new file mode 100644
index 00000000000..738608deb4c
--- /dev/null
+++ b/tests/version_tests/Thread_Manager_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Thread_Manager_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Thread_Manager_Test - Win32 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 "Thread_Manager_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 "Thread_Manager_Test.mak" CFG="Thread_Manager_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Manager_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Manager_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Manager_Test - Win32 Release" (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)" == "Thread_Manager_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Thread_Manager_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\Static Debug"

+# PROP BASE Target_Dir ".\Thread_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Manager_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Manager_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\Static Release"

+# PROP BASE Target_Dir ".\Thread_Manager_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Manager_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Manager_Test\Release"

+# PROP BASE Intermediate_Dir ".\Thread_Manager_Test\Release"

+# PROP BASE Target_Dir ".\Thread_Manager_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Manager_Test - Win32 Static Debug"

+# Name "Thread_Manager_Test - Win32 Static Release"

+# Name "Thread_Manager_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Thread_Manager_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/Thread_Mutex_Test.dsp b/tests/version_tests/Thread_Mutex_Test.dsp
new file mode 100644
index 00000000000..cdb465a0df3
--- /dev/null
+++ b/tests/version_tests/Thread_Mutex_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Thread_Mutex_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Thread_Mutex_Test - Win32 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 "Thread_Mutex_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 "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Mutex_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Mutex_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Mutex_Test - Win32 Release" (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)" == "Thread_Mutex_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Static Debug"

+# PROP BASE Target_Dir ".\Thread_Mutex_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Mutex_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Static Release"

+# PROP BASE Target_Dir ".\Thread_Mutex_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Mutex_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Release"

+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Release"

+# PROP BASE Target_Dir ".\Thread_Mutex_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Mutex_Test - Win32 Static Debug"

+# Name "Thread_Mutex_Test - Win32 Static Release"

+# Name "Thread_Mutex_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Thread_Mutex_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/Thread_Pool_Reactor_Test.dsp b/tests/version_tests/Thread_Pool_Reactor_Test.dsp
new file mode 100644
index 00000000000..27bf635b4e0
--- /dev/null
+++ b/tests/version_tests/Thread_Pool_Reactor_Test.dsp
@@ -0,0 +1,131 @@
+# Microsoft Developer Studio Project File - Name="Thread_Pool_Reactor_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Thread_Pool_Reactor_Test - Win32 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 "Thread_Pool_Reactor_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 "Thread_Pool_Reactor_Test.mak" CFG="Thread_Pool_Reactor_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Reactor_Test - Win32 Release" (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)" == "Thread_Pool_Reactor_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\Static Debug"

+# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Pool_Reactor_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\Static Release"

+# PROP BASE Target_Dir ".\Thread_Pool_Reactor_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Pool_Reactor_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Pool_Reactor_Test\Release"

+# PROP BASE Intermediate_Dir ".\Thread_Pool_Reactor_Test\Release"

+# PROP BASE Target_Dir ".\Thread_Pool_Reactor_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Pool_Reactor_Test - Win32 Static Debug"

+# Name "Thread_Pool_Reactor_Test - Win32 Static Release"

+# Name "Thread_Pool_Reactor_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter ".cpp"

+# Begin Source File

+

+SOURCE=..\Thread_Pool_Reactor_Test.cpp

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter ".h"

+# Begin Source File

+

+SOURCE=..\test_config.h

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/tests/version_tests/Thread_Pool_Test.dsp b/tests/version_tests/Thread_Pool_Test.dsp
new file mode 100644
index 00000000000..dfb4daa33bc
--- /dev/null
+++ b/tests/version_tests/Thread_Pool_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Thread_Pool_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Thread_Pool_Test - Win32 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 "Thread_Pool_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 "Thread_Pool_Test.mak" CFG="Thread_Pool_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Thread_Pool_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Pool_Test - Win32 Release" (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)" == "Thread_Pool_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Thread_Pool_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\Static Debug"

+# PROP BASE Target_Dir ".\Thread_Pool_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Pool_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Pool_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\Static Release"

+# PROP BASE Target_Dir ".\Thread_Pool_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Thread_Pool_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Thread_Pool_Test\Release"

+# PROP BASE Intermediate_Dir ".\Thread_Pool_Test\Release"

+# PROP BASE Target_Dir ".\Thread_Pool_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Thread_Pool_Test - Win32 Static Debug"

+# Name "Thread_Pool_Test - Win32 Static Release"

+# Name "Thread_Pool_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Thread_Pool_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/Time_Service_Test.dsp b/tests/version_tests/Time_Service_Test.dsp
new file mode 100644
index 00000000000..c5c08be4b77
--- /dev/null
+++ b/tests/version_tests/Time_Service_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Time_Service_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Time_Service_Test - Win32 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 "Time_Service_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 "Time_Service_Test.mak" CFG="Time_Service_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Time_Service_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Service_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Service_Test - Win32 Release" (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)" == "Time_Service_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Time_Service_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Time_Service_Test\Static Debug"

+# PROP BASE Target_Dir ".\Time_Service_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Time_Service_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Time_Service_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Time_Service_Test\Static Release"

+# PROP BASE Target_Dir ".\Time_Service_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Time_Service_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Time_Service_Test\Release"

+# PROP BASE Intermediate_Dir ".\Time_Service_Test\Release"

+# PROP BASE Target_Dir ".\Time_Service_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Time_Service_Test - Win32 Static Debug"

+# Name "Time_Service_Test - Win32 Static Release"

+# Name "Time_Service_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Time_Service_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/Time_Value_Test.dsp b/tests/version_tests/Time_Value_Test.dsp
new file mode 100644
index 00000000000..b79bfd1753a
--- /dev/null
+++ b/tests/version_tests/Time_Value_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Time_Value_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Time_Value_Test - Win32 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 "Time_Value_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 "Time_Value_Test.mak" CFG="Time_Value_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Time_Value_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Value_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Time_Value_Test - Win32 Release" (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)" == "Time_Value_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Time_Value_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Time_Value_Test\Static Debug"

+# PROP BASE Target_Dir ".\Time_Value_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Time_Value_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Time_Value_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Time_Value_Test\Static Release"

+# PROP BASE Target_Dir ".\Time_Value_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Time_Value_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Time_Value_Test\Release"

+# PROP BASE Intermediate_Dir ".\Time_Value_Test\Release"

+# PROP BASE Target_Dir ".\Time_Value_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Time_Value_Test - Win32 Static Debug"

+# Name "Time_Value_Test - Win32 Static Release"

+# Name "Time_Value_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Time_Value_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/Timeprobe_Test.dsp b/tests/version_tests/Timeprobe_Test.dsp
new file mode 100644
index 00000000000..bef414f2caa
--- /dev/null
+++ b/tests/version_tests/Timeprobe_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Timeprobe_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Timeprobe_Test - Win32 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 "Timeprobe_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 "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Timeprobe_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timeprobe_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timeprobe_Test - Win32 Release" (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)" == "Timeprobe_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Timeprobe_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Static Debug"

+# PROP BASE Target_Dir ".\Timeprobe_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Timeprobe_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Timeprobe_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Static Release"

+# PROP BASE Target_Dir ".\Timeprobe_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Timeprobe_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Timeprobe_Test\Release"

+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Release"

+# PROP BASE Target_Dir ".\Timeprobe_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Timeprobe_Test - Win32 Static Debug"

+# Name "Timeprobe_Test - Win32 Static Release"

+# Name "Timeprobe_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Timeprobe_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/Timer_Queue_Test.dsp b/tests/version_tests/Timer_Queue_Test.dsp
new file mode 100644
index 00000000000..c4bba54e01b
--- /dev/null
+++ b/tests/version_tests/Timer_Queue_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Timer_Queue_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Timer_Queue_Test - Win32 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 "Timer_Queue_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 "Timer_Queue_Test.mak" CFG="Timer_Queue_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Timer_Queue_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timer_Queue_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timer_Queue_Test - Win32 Release" (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)" == "Timer_Queue_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Timer_Queue_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\Static Debug"

+# PROP BASE Target_Dir ".\Timer_Queue_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Timer_Queue_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Timer_Queue_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\Static Release"

+# PROP BASE Target_Dir ".\Timer_Queue_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Timer_Queue_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Timer_Queue_Test\Release"

+# PROP BASE Intermediate_Dir ".\Timer_Queue_Test\Release"

+# PROP BASE Target_Dir ".\Timer_Queue_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Timer_Queue_Test - Win32 Static Debug"

+# Name "Timer_Queue_Test - Win32 Static Release"

+# Name "Timer_Queue_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Timer_Queue_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/Tokens_Test.dsp b/tests/version_tests/Tokens_Test.dsp
new file mode 100644
index 00000000000..021728e6c16
--- /dev/null
+++ b/tests/version_tests/Tokens_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Tokens_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Tokens_Test - Win32 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 "Tokens_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 "Tokens_Test.mak" CFG="Tokens_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Tokens_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Tokens_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Tokens_Test - Win32 Release" (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)" == "Tokens_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Tokens_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Tokens_Test\Static Debug"

+# PROP BASE Target_Dir ".\Tokens_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Tokens_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Tokens_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Tokens_Test\Static Release"

+# PROP BASE Target_Dir ".\Tokens_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Tokens_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Tokens_Test\Release"

+# PROP BASE Intermediate_Dir ".\Tokens_Test\Release"

+# PROP BASE Target_Dir ".\Tokens_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Tokens_Test - Win32 Static Debug"

+# Name "Tokens_Test - Win32 Static Release"

+# Name "Tokens_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Tokens_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/UPIPE_SAP_Test.dsp b/tests/version_tests/UPIPE_SAP_Test.dsp
new file mode 100644
index 00000000000..8e03dba66e4
--- /dev/null
+++ b/tests/version_tests/UPIPE_SAP_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="UPIPE_SAP_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=UPIPE_SAP_Test - Win32 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 "UPIPE_SAP_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 "UPIPE_SAP_Test.mak" CFG="UPIPE_SAP_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "UPIPE_SAP_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "UPIPE_SAP_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "UPIPE_SAP_Test - Win32 Release" (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)" == "UPIPE_SAP_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\UPIPE_SAP_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\Static Debug"

+# PROP BASE Target_Dir ".\UPIPE_SAP_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "UPIPE_SAP_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\UPIPE_SAP_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\Static Release"

+# PROP BASE Target_Dir ".\UPIPE_SAP_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "UPIPE_SAP_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\UPIPE_SAP_Test\Release"

+# PROP BASE Intermediate_Dir ".\UPIPE_SAP_Test\Release"

+# PROP BASE Target_Dir ".\UPIPE_SAP_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "UPIPE_SAP_Test - Win32 Static Debug"

+# Name "UPIPE_SAP_Test - Win32 Static Release"

+# Name "UPIPE_SAP_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\UPIPE_SAP_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/Upgradable_RW_Test.dsp b/tests/version_tests/Upgradable_RW_Test.dsp
new file mode 100644
index 00000000000..924289741a1
--- /dev/null
+++ b/tests/version_tests/Upgradable_RW_Test.dsp
@@ -0,0 +1,135 @@
+# Microsoft Developer Studio Project File - Name="Upgradable_RW_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Upgradable_RW_Test - Win32 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 "Upgradable_RW_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 "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 Release"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Upgradable_RW_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Upgradable_RW_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Upgradable_RW_Test - Win32 Release" (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)" == "Upgradable_RW_Test - Win32 Static Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir ".\Upgradable_RW_Test\Static Debug"

+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Static Debug"

+# PROP BASE Target_Dir ".\Upgradable_RW_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ".\LIB\Debug"

+# PROP Intermediate_Dir ".\LIB\Debug"

+# 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_AS_STATIC_LIBS /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)" == "Upgradable_RW_Test - Win32 Static Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Upgradable_RW_Test\Static Release"

+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Static Release"

+# PROP BASE Target_Dir ".\Upgradable_RW_Test"

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir ".\LIB\Release"

+# PROP Intermediate_Dir ".\LIB\Release"

+# 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_AS_STATIC_LIBS /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)" == "Upgradable_RW_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir ".\Upgradable_RW_Test\Release"

+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Release"

+# PROP BASE Target_Dir ".\Upgradable_RW_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 ".\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 "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"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Upgradable_RW_Test - Win32 Static Debug"

+# Name "Upgradable_RW_Test - Win32 Static Release"

+# Name "Upgradable_RW_Test - Win32 Release"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

+# Begin Source File

+

+SOURCE=..\Upgradable_RW_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/run_all_tests.bat b/tests/version_tests/run_all_tests.bat
new file mode 100755
index 00000000000..f322e7973d3
--- /dev/null
+++ b/tests/version_tests/run_all_tests.bat
@@ -0,0 +1,75 @@
+@echo off
+
+:dd
+if not exist "DLL Debug" goto dr
+echo.
+echo ** DLL Debug **
+echo.
+cd "DLL Debug"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:dr
+if not exist "DLL Release" goto dud
+echo.
+echo ** DLL Release **
+echo.
+cd "DLL Release"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:dud
+if not exist "DLL Unicode Debug" goto dur
+echo.
+echo ** DLL Unicode Debug **
+echo.
+cd "DLL Unicode Debug"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:dur
+if not exist "DLL Unicode Release" goto sd
+echo.
+echo ** DLL Unicode Release **
+echo.
+cd "DLL Unicode Release"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:sd
+if not exist "static Debug" goto sr
+echo.
+echo ** static Debug **
+echo.
+cd "static Debug"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:sr
+if not exist "static Release" goto sud
+echo.
+echo ** static Release **
+echo.
+cd "static Release"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:sud
+if not exist "static Unicode Debug" goto sur
+echo.
+echo ** static Unicode Debug **
+echo.
+cd "static Unicode Debug"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:sur
+if not exist "static Unicode Release" goto done
+echo.
+echo ** static Unicode Release **
+echo.
+cd "static Unicode Release"
+call ..\..\run_tests.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+cd ..
+
+:done
\ No newline at end of file
diff --git a/tests/version_tests/version_tests.dsw b/tests/version_tests/version_tests.dsw
new file mode 100644
index 00000000000..0076e68e532
--- /dev/null
+++ b/tests/version_tests/version_tests.dsw
@@ -0,0 +1,1036 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "Atomic_Op_Test.dsp"=.\Atomic_Op_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Auto_IncDec_Test.dsp"=.\Auto_IncDec_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Barrier_Test.dsp"=.\Barrier_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Basic_Types_Test.dsp"=.\Basic_Types_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Buffer_Stream_Test.dsp"=.\Buffer_Stream_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Cached_Accept_Conn_Test.dsp"=.\Cached_Accept_Conn_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Cached_Conn_Test.dsp"=.\Cached_Conn_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Cache_Map_Manager_Test.dsp"=.\Cache_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Capabilities_Test.dsp"=.\Capabilities_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "CDR_Array_Test.dsp"=.\CDR_Array_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "CDR_File_Test.dsp"=.\CDR_File_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "CDR_Test.dsp"=.\CDR_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Collection_Test.dsp"=.\Collection_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Conn_Test.dsp"=.\Conn_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Dirent_Test.dsp"=.\Dirent_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "DLList_Test.dsp"=.\DLList_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "DLL_Test.dsp"=.\DLL_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Dynamic_Priority_Test.dsp"=.\Dynamic_Priority_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Enum_Interfaces_Test.dsp"=.\Enum_Interfaces_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Env_Value_Test.dsp"=.\Env_Value_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Future_Set_Test.dsp"=.\Future_Set_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Future_Test.dsp"=.\Future_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Handle_Set_Test.dsp"=.\Handle_Set_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Hash_Map_Bucket_Iterator_Test.dsp"=.\Hash_Map_Bucket_Iterator_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Hash_Map_Manager_Test.dsp"=.\Hash_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "High_Res_Timer_Test.dsp"=.\High_Res_Timer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "IOStream_Test.dsp"=.\IOStream_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Lazy_Map_Manager_Test.dsp"=.\Lazy_Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Malloc_Test.dsp"=.\Malloc_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Map_Manager_Test.dsp"=.\Map_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Map_Test.dsp"=.\Map_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Mem_Map_Test.dsp"=.\Mem_Map_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "MEM_Stream_Test.dsp"=.\MEM_Stream_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Message_Block_Test.dsp"=.\Message_Block_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Message_Queue_Notifications_Test.dsp"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Message_Queue_Test.dsp"=.\Message_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "MM_Shared_Memory_Test.dsp"=.\MM_Shared_Memory_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "MT_Reactor_Timer_Test.dsp"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "MT_SOCK_Test.dsp"=.\MT_SOCK_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Naming_Test.dsp"=.\Naming_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "New_Fail_Test.dsp"=.\New_Fail_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Notify_Performance_Test.dsp"=.\Notify_Performance_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Object_Manager_Test.dsp"=.\Object_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "OrdMultiSet_Test.dsp"=.\OrdMultiSet_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "OS_Test.dsp"=.\OS_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Pipe_Test.dsp"=.\Pipe_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Priority_Buffer_Test.dsp"=.\Priority_Buffer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Priority_Reactor_Test.dsp"=.\Priority_Reactor_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Priority_Task_Test.dsp"=.\Priority_Task_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Process_Manager_Test.dsp"=.\Process_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Process_Mutex_Test.dsp"=.\Process_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Process_Strategy_Test.dsp"=.\Process_Strategy_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "RB_Tree_Test.dsp"=.\RB_Tree_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactors_Test.dsp"=.\Reactors_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactor_Exceptions_Test.dsp"=.\Reactor_Exceptions_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactor_Notify_Test.dsp"=.\Reactor_Notify_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactor_Performance_Test.dsp"=.\Reactor_Performance_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reactor_Timer_Test.dsp"=.\Reactor_Timer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reader_Writer_Test.dsp"=.\Reader_Writer_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Recursive_Mutex_Test.dsp"=.\Recursive_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Refcounted_Auto_Ptr_Test.dsp"=.\Refcounted_Auto_Ptr_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Reverse_Lock_Test.dsp"=.\Reverse_Lock_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Semaphore_Test.dsp"=.\Semaphore_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Service_Config_Test.dsp"=.\Service_Config_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Sigset_Ops_Test.dsp"=.\Sigset_Ops_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Simple_Message_Block_Test.dsp"=.\Simple_Message_Block_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SOCK_Connector_Test.dsp"=.\SOCK_Connector_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SOCK_Send_Recv_Test.dsp"=.\SOCK_Send_Recv_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SOCK_Test.dsp"=.\SOCK_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SPIPE_Test.dsp"=.\SPIPE_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SString_Test.dsp"=.\SString_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Svc_Handler_Test.dsp"=.\Svc_Handler_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "SV_Shared_Memory_Test.dsp"=.\SV_Shared_Memory_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Task_Test.dsp"=.\Task_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Thread_Manager_Test.dsp"=.\Thread_Manager_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Thread_Mutex_Test.dsp"=.\Thread_Mutex_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Thread_Pool_Reactor_Test.dsp"=.\Thread_Pool_Reactor_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Thread_Pool_Test.dsp"=.\Thread_Pool_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Timeprobe_Test.dsp"=.\Timeprobe_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Timer_Queue_Test.dsp"=.\Timer_Queue_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Time_Service_Test.dsp"=.\Time_Service_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Time_Value_Test.dsp"=.\Time_Value_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Tokens_Test.dsp"=.\Tokens_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "TSS_Test.dsp"=.\TSS_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "Upgradable_RW_Test.dsp"=.\Upgradable_RW_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "UPIPE_SAP_Test.dsp"=.\UPIPE_SAP_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

diff --git a/websvcs/lib/websvcs_export.h b/websvcs/lib/websvcs_export.h
index 5fe3d7652d5..0f8a8b3f76f 100644
--- a/websvcs/lib/websvcs_export.h
+++ b/websvcs/lib/websvcs_export.h
@@ -9,10 +9,6 @@
 
 #include "ace/config-all.h"
 
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_WEBSVCS_HAS_DLL)
-#  define ACE_WEBSVCS_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_WEBSVCS_HAS_DLL */
-
 #if !defined (ACE_WEBSVCS_HAS_DLL)
 #define ACE_WEBSVCS_HAS_DLL 1
 #endif /* ! ACE_WEBSVCS_HAS_DLL */